代码合并

This commit is contained in:
liaodanlong
2025-01-13 17:16:22 +08:00
parent 119e4b9590
commit 6cf4bf1005

View File

@@ -443,10 +443,6 @@ class MrpProduction(models.Model):
for deleted_design in deleted_designs:
workorder = self.env['mrp.workorder'].search([('technology_design_id', '=', deleted_design.id)])
purchase = workorder._get_surface_technics_purchase_ids()
account = self.env['account.move'].search([('id', 'in', purchase.invoice_ids.ids)])
if account.state not in ['cancel', False]:
if account.name not in account_moves:
account_moves.append(account.name)
if purchase.state not in ['cancel', 'draft', False]:
purchase_orders.append(purchase.name)
special_design = self.technology_design_ids.filtered(
@@ -460,10 +456,6 @@ class MrpProduction(models.Model):
if not product_production_process:
if special.process_parameters_id not in process_parameters:
process_parameters.append(special.process_parameters_id.display_name)
if account_moves:
raise UserError(_("请联系工厂生产经理对该(%s)账单进行取消", ", ".join(account_moves)))
if purchase_orders:
raise UserError(_("请联系工厂生产经理对该(%s)采购订单进行取消", ", ".join(purchase_orders)))
if parameters_not: