Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

sf_manufacturing/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer', 'jikimo_sale_multiple_supply_methods'],
     'data': [
         'data/stock_data.xml',
         'data/empty_racks_data.xml',

sf_manufacturing/models/mrp_production.py

@@ -717,6 +717,41 @@ class MrpProduction(models.Model):
         return True
 
     def _reset_work_order_sequence(self):
+        """
+        工单工序排序方法(新)
+        """
+        for rec in self:
+            workorder_ids = rec.workorder_ids
+            technology_design_ids = rec.technology_design_ids
+            if workorder_ids.filtered(lambda item: item.state in ('返工', 'rework')):
+                # 获取返工后新生成的工单
+                work_ids = workorder_ids.filtered(lambda item: item.sequence == 0)
+                # 对工单进行逐个插入
+                for work_id in work_ids:
+                    for order_id in rec.workorder_ids.filtered(lambda item: item.sequence > 0):
+                        if work_id.name == order_id.name:
+                            work_id.sequence = order_id.sequence + 1
+                            break
+                    # 对该工单之后的工单工序进行加一
+                    work_order_ids = rec.workorder_ids.filtered(lambda item: item.sequence >= work_id.sequence)
+                    for work in work_order_ids:
+                        work.sequence = work.sequence + 1
+
+            else:
+                # 将工艺设计生成的工单序号赋值给工单的序号
+                for work in workorder_ids:
+                    td_ids = technology_design_ids.filtered(
+                        lambda item: (item.route_id.name in work.name and item.process_parameters_id
+                                      and item.process_parameters_id == work.surface_technics_parameters_id) or
+                                     (item.route_id.name == work.name and item.panel
+                                      and item.panel == work.processing_panel))
+                    if td_ids:
+                        work.sequence = td_ids[0].sequence
+
+    def _reset_work_order_sequence_1(self):
+        """
+        工单工序排序方法（旧）
+        """
         for rec in self:
             workorder_ids = rec.workorder_ids.filtered(lambda item: item.state in ('返工', 'rework'))
             # 产品模型类型
@@ -1232,6 +1267,19 @@ class MrpProduction(models.Model):
                                  'move_dest_ids': production.move_dest_ids.ids,
                                  'user_id': production.user_id.id}
         return production_values_str
+    
+    # 增加制造订单类型
+    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 '人工线下加工'
 
 
 class sf_detection_result(models.Model):

sf_manufacturing/models/product_template.py

@@ -957,6 +957,7 @@ class ResProductMo(models.Model):
             'list_price': item['price'],
             'materials_id': materials_id.id,
             'materials_type_id': materials_type_id.id,
+            'single_manufacturing': product_id.single_manufacturing,
             'is_bfm': True,
             'active': True
         }

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -35,9 +35,9 @@
                     <field name="reservation_state" optional="hide" decoration-danger="reservation_state == 'confirmed'"
                            decoration-success="reservation_state == 'assigned'"/>
                 </xpath>
-                <!--                 <xpath expr="//field[@name='state']" position="before"> -->
-                <!--                     <field name="schedule_state" optional="show"/> -->
-                <!--                 </xpath> -->
+                <xpath expr="//field[@name='state']" position="before">
+                    <field name="production_type" widget="badge" decoration-warning="production_type == '人工线下加工'" decoration-success="production_type == '自动化产线加工'" optional="show"/>
+                </xpath>
                 <xpath expr="//field[@name='activity_ids']" position="replace">
                     <field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
                 </xpath>
@@ -80,6 +80,7 @@
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
+                    <field name="production_type" readonly="1"/>
                     <field name="manual_quotation" readonly="1"/>
                     <field name="programming_no" readonly="1"/>
                     <field name="programming_state" readonly="1"
@@ -98,7 +99,7 @@
                     <field name="production_line_id" readonly="1"/>
                     <!--                    <field name="production_line_state" readonly="1"/>-->
                     <field name="part_name"/>
-                    <field name="part_number" string="成品的零件图号"/>
+                    <field name="part_number" string="零件图号"/>
                     <field name="tool_state"/>
                     <field name="tool_state_remark" string="备注" attrs="{'invisible': [('tool_state', '!=', '1')]}"/>
                     <field name="deadline_of_delivery" readonly="1"/>