拉取最新代码

sf_machine_connect/views/SfWorkOrderBarcodes.xml

@@ -13,7 +13,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group//field[@name='processing_panel']" position="after">
                 <!-- invisible="1" -->
-                <field name="_barcode_scanned" widget="barcode_handler" string="扫码" attrs='{"invisible": [("routing_type","!=","装夹预制")]}'/>
+                <field name="_barcode_scanned" widget="barcode_handler" string="扫码" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
             </xpath>
             <xpath expr="//page//field[@name='tray_code']" position="replace">
                 <field name="tray_code" widget="code"/>

sf_manufacturing/models/mrp_production.py

@@ -258,7 +258,7 @@ class MrpProduction(models.Model):
                     )
                     i += 1
                     for route in product_routing_workcenter:
-                        if i == 1 and route.routing_type == '装夹预制':
+                        if i == 1 and route.routing_type == '装夹预调':
                             workorders_values.append(
                                 self.env['mrp.workorder'].json_workorder_str('', production, route))
                         if route.is_repeat is True:

sf_manufacturing/models/mrp_workorder.py

@@ -207,9 +207,9 @@ class ResMrpWorkOrder(models.Model):
         # elif route.routing_type == '获取CNC加工程序':
         #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
         #         [('name', '=', '获取CNC加工程序')]).time_cycle
-        elif route.routing_type == '装夹预制':
+        elif route.routing_type == '装夹预调':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '装夹预制')]).time_cycle
+                [('name', '=', '装夹预调')]).time_cycle
         # elif route.routing_type == '前置三元定位检测':
         #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
         #         [('name', '=', '前置三元定位检测')]).time_cycle
@@ -495,7 +495,7 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
-        if self.routing_type == '装夹预制' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+        if self.routing_type == '装夹预调' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
         # 外协出库单，从“正在等待”变为“就绪”状态
         if self.is_subcontract is True:

sf_manufacturing/models/product_template.py

@@ -833,9 +833,9 @@ class ResProductFixture(models.Model):
     fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号')
     specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '夹具规格')
 
-    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True)
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
-    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     model_file = fields.Binary(string="3D模型图")
 
     # 夹具物料基本参数

sf_manufacturing/views/mrp_workorder_view.xml

@@ -162,11 +162,11 @@
                     <field name="equipment_id"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="functional_fixture_id"
-                           attrs='{"invisible": [("routing_type","!=","装夹预制")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_code" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹预制")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹预制")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                 </group>
                 <group attrs='{"invisible": [("routing_type","=","获取CNC加工程序")]}'>
                     <div>
@@ -219,7 +219,7 @@
 
                 <!--                    </div>-->
                 <!--                </page>-->
-                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预制")]}'>
+                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
                         <group string="卡盘">
                             <field name="chuck_serial_number"/>
@@ -241,7 +241,7 @@
                                placeholder="如有预调程序信息请在此处输入....."/>
                     </group>
                 </page>
-                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预制")]}'>
+                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
 
                     <div>左面:</div>
                     <div class="o_address_format">