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

优化制造订单报废

Browse Source
This commit is contained in:
jinling.yang
2024-11-22 17:51:40 +08:00
parent 70f8aadd66
commit 33b9c48e87
5 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
View File

@@ -14,7 +14,8 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
def confirm(self):
if self.is_technology_re_adjust is True:
domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed')]
domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'),
('product_id', '=', self.production_id.product_id.id)]
else:
domain = [('id', '=', self.production_id.id)]
technology_designs = self.env['sf.technology.design'].sudo().search(
@@ -112,9 +113,5 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
workorders = item.workorder_ids.filtered(lambda wo: wo.state not in ('cancel')).sorted(
key=lambda a: a.sequence)
if workorders[0].state in ['pending']:
if workorder[0].production_id.product_id.categ_id.type == '成品':
cnc_workorder = self.search(
[('production_id', '=', item.id), ('routing_type', '=', 'CNC加工')],
limit=1, order='id asc')
if cnc_workorder.cnc_ids:
workorders[0].state = 'waiting'
if workorder[0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
workorders[0].state = 'waiting'

11
sf_manufacturing/wizard/production_technology_wizard.py
View File

@@ -15,7 +15,8 @@ class ProductionTechnologyWizard(models.TransientModel):
def confirm(self):
if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type == '成品':
domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed')]
domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'),
('product_id', '=', self.production_id.product_id.id)]
else:
domain = [('id', '=', self.production_id.id)]
technology_designs = self.production_id.technology_design_ids
@@ -63,9 +64,5 @@ class ProductionTechnologyWizard(models.TransientModel):
workorder = item.workorder_ids.filtered(lambda wo: wo.state not in ('cancel')).sorted(
key=lambda a: a.sequence)
if workorder[0].state in ['pending']:
if workorder[0].production_id.product_id.categ_id.type == '成品':
cnc_workorder = self.search(
[('production_id', '=', item.id), ('routing_type', '=', 'CNC加工')],
limit=1, order='id asc')
if cnc_workorder.cnc_ids:
workorder[0].state = 'waiting'
if workorder[0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
workorders[0].state = 'waiting'