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

Accept Merge Request #972: (feature/制造代码优化 -> develop)

Browse Source 
Merge Request: 优化制造订单状态问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/972?initial=true
This commit is contained in:
马广威
2024-04-24 22:55:52 +08:00
committed by Coding
parent 192aecb17d 0bcd077914
commit b237e353a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_manufacturing/models/mrp_production.py
View File

@@ -78,7 +78,7 @@ class MrpProduction(models.Model):
@api.depends( @api.depends(
'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state') 'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state', 'process_state')
def _compute_state(self): def _compute_state(self):
for production in self: for production in self:
if not production.state or not production.product_uom_id: if not production.state or not production.product_uom_id:
@@ -110,15 +110,15 @@ class MrpProduction(models.Model):
production.state = 'progress' production.state = 'progress'
# 新添加的状态逻辑 # 新添加的状态逻辑
if production.state == 'progress' and production.schedule_state == '已排': if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待装夹':
# production.state = 'pending_processing' # production.state = 'pending_processing'
production.state = 'pending_cam' production.state = 'pending_cam'
if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待加工': if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待加工':
# if production.state == 'pending_cam' and production.process_state == '待加工': # if production.state == 'pending_cam' and production.process_state == '待加工':
production.state = 'pending_processing' production.state = 'pending_processing'
elif production.state == 'pending_processing' and production.process_state == '待解除装夹': elif production.state == 'progress' and production.process_state == '待解除装夹':
production.state = 'pending_era_cam' production.state = 'pending_era_cam'
elif production.state == 'pending_era_cam' and production.process_state == '已完工': elif production.state == 'progress' and production.process_state == '已完工':
production.state = 'completed' production.state = 'completed'
elif production.state == 'progress' and production.work_order_state == '已完成': elif production.state == 'progress' and production.work_order_state == '已完成':
production.state = 'completed' production.state = 'completed'