Merge branch 'refs/heads/develop' into feature/delivery_status

# Conflicts:
#	sf_manufacturing/__manifest__.py

sf_manufacturing/models/mrp_production.py

@@ -307,8 +307,7 @@ class MrpProduction(models.Model):
                                        precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
                      for move in production.move_raw_ids if move.product_id):
                 production.state = 'progress'
-            elif not production.technology_design_ids:
-                production.state = 'technology_to_confirmed'
+    
             # 新添加的状态逻辑
             if (
                     production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
@@ -810,6 +809,7 @@ class MrpProduction(models.Model):
                     if td_ids:
                         work.sequence = td_ids[0].sequence
 
+
     def _reset_work_order_sequence_1(self):
         """
         工单工序排序方法（旧）
@@ -1331,17 +1331,17 @@ class MrpProduction(models.Model):
         return production_values_str
 
     # 增加制造订单类型
-    production_type = fields.Selection(
-        [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
-        string='制造类型',
-        compute='_compute_production_type',
-        store=True
-    )
+    # production_type = fields.Selection(
+    #     [('自动化产线加工', '自动化产线加工'), ('人工线下加工', '人工线下加工')],
+    #     string='制造类型',
+    #     compute='_compute_production_type',
+    #     store=True
+    # )
 
-    @api.depends('product_id.is_manual_processing')
-    def _compute_production_type(self):
-        for production in self:
-            production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
+    # @api.depends('product_id.is_manual_processing')
+    # def _compute_production_type(self):
+    #     for production in self:
+    #         production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
 
 
 class sf_detection_result(models.Model):