jinling.yang 2acdbca2b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协 ...

# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py

2023-04-21 15:40:03 +08:00

..

__init__.py

工单优化

2023-01-09 20:40:27 +08:00

model_type.py

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

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

mrp_maintenance.py

更改制造模块名

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

mrp_production.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

2023-04-21 15:40:03 +08:00

mrp_routing_workcenter.py

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

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

mrp_workcenter.py

1.sf的工作中心新增表面工艺字段，工序类型新增表面工艺类型，且当工序类型为表面工艺时，则显示表面工艺，其他则不显示

2023-03-30 17:52:05 +08:00

mrp_workorder.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

2023-04-21 15:40:03 +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

表面工艺外协需求，不包含页面展示外协出入库单

2023-04-21 15:32:55 +08:00

tray.py

新增同步mrs的表面工艺类别接口

2023-03-23 18:18:57 +08:00