Merge branch 'feature/库存模块优化' into feature/新增功能刀具拆解单模型

2024-04-23 14:18:34 +08:00
parent bcff104013 8bc23f5136
commit f1dad7701f
13 changed files with 632 additions and 102 deletions
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -972,7 +972,7 @@ class SfWorkOrderBarcodes(models.Model):
        #     [('routing_type', '=', '装夹预调'), ('production_id', '=', self.production_id.id)])
        workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)])
        if workorder_old:
-            raise UserError('该托盘已绑定工件，请先解除绑定！！！')
+            raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % workorder_old.production_id.name)
        if workorder:
            if workorder.routing_type == '装夹预调':
                if workorder.state in ['done']: