jinling.yang 5ffe2ce0e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） ...

# Conflicts:
#	sf_maintenance/views/maintenance_views.xml

2023-10-30 10:48:13 +08:00

..

__init__.py

同步刀具标准库

2023-10-19 10:49:54 +08:00

model_type.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理

2023-08-29 11:21:13 +08:00

mrp_maintenance.py

修改故障日志bug

2023-09-27 14:30:38 +08:00

mrp_production.py

删除制造订单处排程相关的部分，排程模块架构改造完成

2023-08-25 10:43:22 +08:00

mrp_routing_workcenter.py

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

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

mrp_workcenter.py

修改故障日志bug

2023-09-27 14:30:38 +08:00

mrp_workorder.py

机床id改为设备id

2023-10-30 09:36:52 +08:00

product_template.py

产品新增刀具物料为刀片，刀盘，刀杆，夹头，刀柄，相关联的字段，及对应页面的优化

2023-10-27 17:44:12 +08:00

production_line_base.py

修改维保生成编码和名称的规则

2023-09-26 17:29:14 +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-09-14 09:46:28 +08:00