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

工艺外协代码

Browse Source
This commit is contained in:
liaodanlong
2025-05-07 17:17:41 +08:00
parent efc4ae31c9 5f72519dc2
commit 51c517145b
5 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1269,9 +1269,9 @@ class ResMrpWorkOrder(models.Model):
workorder.state = 'pending'
continue
# ================= 如果制造订单制造类型为【人工线下加工】==========================
lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
picking_ids = workorder.production_id.picking_ids.filtered(
lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
# lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
# picking_ids = workorder.production_id.picking_ids.filtered(
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
# exists = any(
# move_line.lot_id == lot_id
# for picking in picking_ids
@@ -1279,7 +1279,7 @@ class ResMrpWorkOrder(models.Model):
# for move_line in move.move_line_ids
# )
if (workorder.production_id.production_type == '人工线下加工'
and workorder.production_id.schedule_state == '已排' and lot_id):
and workorder.production_id.schedule_state == '已排'):
# and workorder.production_id.programming_state == '已编程'
if workorder.is_subcontract is True:
if workorder.production_id.state == 'rework':
@@ -1369,11 +1369,10 @@ class ResMrpWorkOrder(models.Model):
# 判断是否有坯料的序列号信息
boolean = False
if self.production_id.move_raw_ids:
if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料':
if self.production_id.move_raw_ids[0].product_id.categ_type == '坯料' and self.production_id.move_raw_ids[0].product_id.tracking == 'serial':
if self.production_id.move_raw_ids[0].move_line_ids:
if self.production_id.move_raw_ids[0].move_line_ids:
if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
boolean = True
if self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
boolean = True
else:
boolean = True
if not boolean: