jinling.yang 3f86dd48ec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单 ...

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/models/product_template.py
#	sf_manufacturing/views/mrp_workorder_view.xml

2024-04-08 16:47:16 +08:00

..

__init__.py

修改代码不规范问题

2023-11-23 17:37:06 +08:00

model_type.py

1、新增功能刀具列表模型自动计算功能刀具在刀具房数量功能；2、优化功能刀具安全库存模型相同功能刀具的检索条件；3、修改功能刀具组装单组装的初始位置为Production，修改功能刀具序列号的生成规则

2023-11-27 17:27:55 +08:00

mrp_maintenance.py

代码规范

2023-11-24 10:30:33 +08:00

mrp_production.py

修改工单显隐控制逻辑

2024-03-11 10:56:03 +08:00

mrp_routing_workcenter.py

修改设备oee自动生成，设备刀库编码规则

2024-02-28 17:14:42 +08:00

mrp_workcenter.py

修改获取CNC程序从工单到制造订单

2024-01-05 11:23:27 +08:00

mrp_workorder.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单

2024-04-08 16:47:16 +08:00

product_template.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单

2024-04-08 16:47:16 +08:00

production_line_base.py

1、基于原生的移动历史重构功能刀具出入库记录模型；2、功能刀具列表模型新增查询当前功能刀具出入库记录按钮；3、删除旧的功能刀具出入库记录模型和出入库记录人模型；4、机台换刀申请模型的功能刀具名称字段改为绑定功能刀具组装单；5、优化功能刀具组装单确认组装功能的创建移动历史记录功能。

2023-11-23 17:15:34 +08:00

quality.py

开发sf制造模块权限角色

2023-11-21 17:42:36 +08:00

res_user.py

开发sf制造模块权限角色

2023-11-21 17:42:36 +08:00

stock.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单

2024-04-08 16:47:16 +08:00