jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑

Browse Source
This commit is contained in:
yuxianghui
2025-06-05 16:59:33 +08:00
parent 222efc57c2
commit 95cb5251dc
5 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/wizard/production_wizard.py
View File

@@ -46,10 +46,10 @@ class ProductionWizard(models.TransientModel):
mrp_workorder_list = self.mrp_production_id.workorder_ids.filtered(lambda kw: kw.rfid_code)
for workorder in mrp_workorder_list:
rfid_code = workorder.rfid_code
workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code is not False).write(
workorder.filtered(lambda wo: wo.routing_type == '装夹预调' and wo.rfid_code and wo.state != 'rework').write(
{'rfid_code_old': rfid_code, 'rfid_code': False})
workorder.filtered(lambda wo: (wo.routing_type != '装夹预调' and
(wo.rfid_code_old is not False or wo.rfid_code is not False))).write(
(wo.rfid_code_old or wo.rfid_code) and wo.state != 'rework')).write(
{'rfid_code_old': False, 'rfid_code': False})
if self.is_remanufacture is True:

8
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -173,8 +173,12 @@ class ReworkWizard(models.TransientModel):
# ====新工单绑定rfid===
for new_work_id in new_work_ids:
if new_work_id.routing_type in ['CNC加工', '解除装夹']:
new_work_id.write({'rfid_code': self.production_id.workorder_ids.filtered(
lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
# 获取new_work_id同一个加工面已经绑定rfid的非返工的装夹预调工单
work_id = self.production_id.workorder_ids.filtered(
lambda wk: (wk.processing_panel == new_work_id.processing_panel and wk.rfid_code
and wk.routing_type == '装夹预调' and wk.state != 'rework'))
if work_id:
new_work_id.write({'rfid_code': work_id.rfid_code})
self.production_id.detection_result_ids.filtered(
lambda ap1: ap1.handle_result == '待处理').write({'handle_result': '已处理'})
panels = [] # 返工的加工面