qihao.gong@jikimo.com 8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 ...

# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml

2023-07-14 09:02:48 +08:00

..

__init__.py

将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录

2023-07-13 16:05:38 +08:00

model_type.py

刀具产品页面刀具物料及型号字段修改

2023-06-28 18:32:45 +08:00

mrp_maintenance.py

更改制造模块名

2022-11-22 09:41:52 +08:00

mrp_production.py

优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能

2023-07-13 16:57:48 +08:00

mrp_routing_workcenter.py

优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’

2023-04-20 19:39:12 +08:00

mrp_workcenter.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划

2023-07-14 09:02:48 +08:00

mrp_workorder.py

优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能

2023-07-13 16:57:48 +08:00

product_template.py

刀具产品模板根据型号展示不同字段和值

2023-06-29 18:53:11 +08:00

production_line_base.py

将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录

2023-07-13 16:05:38 +08:00

quality.py

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

res_user.py

代码规范整理，产品页面模型和胚料的模型类型字段做显示

2023-02-09 15:26:08 +08:00

stock.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹

2023-07-06 17:33:47 +08:00

tray.py

解决coding扫描代码报错问题

2023-04-25 14:42:34 +08:00