jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,043 Commits 134 Branches 0 Tags
826119aea6c23aab78f819541072cec62c8de03c
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
禹翔辉 826119aea6 Accept Merge Request #384: (feature/刀具优化 -> develop) 
Merge Request: 解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/384?initial=true
2023-09-14 09:45:22 +08:00
.idea
修改.gitignore文件，注释忽略lib文件夹部分
2023-07-14 12:26:21 +08:00
code_backend_theme
0626提交
2023-06-26 17:35:55 +08:00
fixed_header_list
Merge branch 'develop' into feature/修改看板样式
2023-07-06 14:41:17 +08:00
jikimo_frontend
优化现有逻辑
2023-09-13 15:40:36 +08:00
mrp_mps
新增主生产计划模块
2023-08-15 10:36:04 +08:00
mrp_workorder
消息发送界面的样式bug修改
2023-08-18 11:01:30 +08:00
password_security
维保计划视图优化
2023-07-14 17:27:11 +08:00
quality
新增翻译问题解决
2023-08-03 11:55:46 +08:00
quality_control
质量模块和库存扫码
2023-07-24 11:42:15 +08:00
sf_base
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
2023-09-08 17:05:44 +08:00
sf_bf_connect
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
2023-08-24 17:32:25 +08:00
sf_dlm
隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。
2023-09-11 17:21:32 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
调整“程序下载”按钮位置
2023-09-07 15:32:15 +08:00
sf_maintenance
设备图文展示
2023-09-13 16:52:40 +08:00
sf_manufacturing
Accept Merge Request #384: (feature/刀具优化 -> develop)
2023-09-14 09:45:22 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
对模型进行上色和特征识别及自动报价
2023-08-25 10:39:31 +08:00
sf_plan
优化代码结构
2023-09-14 09:17:38 +08:00
sf_plan_management
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
2023-09-12 11:12:19 +08:00
sf_quality
质量模块的改造已完成，本地已测试
2023-08-02 09:31:06 +08:00
sf_sale
采购刀具产品反注册接口新增图片字段，3d模型代码放开
2023-09-08 17:14:57 +08:00
sf_tool_management
注释刀具管理-刀具物料查询-整体式刀具参数限制，调整整体式刀具参数位置，添加能力参数图文展示功能，直径类参数增加φ的前缀单位；注释产品-刀具参数-cutting_tool_screw。
2023-09-12 17:36:45 +08:00
sf_warehouse
库存模块日志警告信息处理
2023-08-29 17:28:20 +08:00
sf_wxwork_approval
Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入
2023-06-02 17:07:01 +08:00
spiffy_theme_backend
修改表格样式css的选择器
2023-07-19 14:49:42 +08:00
stock_barcode
no message
2023-08-03 17:32:43 +08:00
web_copy_confirm
解决冲突
2023-06-12 14:35:14 +08:00
web_enterprise
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_environment_ribbon
解决冲突
2023-06-12 14:35:14 +08:00
web_gantt
修改原生gantt图样式（日期格式等去符合国内习惯）
2023-08-30 17:52:13 +08:00
web_grid
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_map
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_mobile
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_refresher
解决冲突
2023-06-12 14:35:14 +08:00
web_sheet_full_width
解决冲突
2023-06-12 14:35:14 +08:00
web_widget_model_viewer
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理
2023-08-29 11:21:13 +08:00
yizuo_login_background_and_styles
修复密码错误bug
2023-01-31 11:30:13 +08:00
zpl_print
自建模块日志警告信息处理
2023-08-28 17:31:41 +08:00
__init__.py
3d模型
2023-03-03 18:17:48 +08:00
.gitignore
修改.gitignore文件，注释忽略lib文件夹部分
2023-07-14 12:26:21 +08:00
Dockerfile
测试devops
2023-03-15 16:30:29 +08:00
odoo.conf
更换数据库
2023-07-14 10:45:02 +08:00
README.md
Initial Commit
2022-09-09 16:12:13 +08:00
requirements.txt
新增cpca模块
2023-04-25 16:22:09 +08:00

README.md

#jikimo_sf

Description
No description provided
Readme 186 MiB