Merge branch 'feature/客供料入库单优化' into feature/采购优化

sf_manufacturing/models/mrp_production.py

@@ -1126,6 +1126,14 @@ class MrpProduction(models.Model):
         cloud_programming = None
         if self.programming_state in ['已编程']:
             cloud_programming = self._cron_get_programming_state()
+        result_ids = self.detection_result_ids.filtered(lambda dr: dr.handle_result == '待处理')
+        work_ids = []
+        if result_ids:
+            for result_id in result_ids:
+                work_ids.append(self.workorder_ids.filtered(
+                    lambda wk: (wk.name == result_id.routing_type
+                                and wk.processing_panel == result_id.processing_panel
+                                and wk.state == 'done')).id)
         return {
             'name': _('返工'),
             'type': 'ir.actions.act_window',
@@ -1134,7 +1142,7 @@ class MrpProduction(models.Model):
             'target': 'new',
             'context': {
                 'default_production_id': self.id,
-                'default_workorder_ids': self.workorder_ids.filtered(lambda wk: wk.state == 'done').ids,
+                'default_workorder_ids': work_ids,
                 'default_reprogramming_num': cloud_programming['reprogramming_num'],
                 'default_programming_state': cloud_programming['programming_state'],
                 'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False

sf_manufacturing/models/mrp_workorder.py

@@ -1096,7 +1096,7 @@ class ResMrpWorkOrder(models.Model):
             #     if purchase_order.picking_ids.filtered(lambda p: p.state in ['waiting', 'confirmed', 'assigned']):
             #         workorder.state = 'waiting'
             #         continue
-            if workorder.routing_type == '表面工艺':
+            if workorder.technology_design_id.routing_tag == 'special':
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:

sf_manufacturing/models/stock.py

@@ -475,6 +475,8 @@ class ProductionLot(models.Model):
                             [('company_id', '=', company.id), ('product_id', '=', product.id),
                              ('name', 'ilike', product.name.split('[')[0])],
                             limit=1, order='name desc')
+                        if not last_serial:
+                            return "%s-%03d" % (product.name, 1)
                     return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name, 2)[1]
         now = datetime.now().strftime("%Y%m%d")
         if product.cutting_tool_model_id: