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

sf_manufacturing/__manifest__.py

@@ -16,6 +16,7 @@
         'data/stock_data.xml',
         'data/empty_racks_data.xml',
         'data/panel_data.xml',
+        'data/sf_work_individuation_page.xml',
         'data/agv_scheduling_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',

sf_manufacturing/data/sf_work_individuation_page.xml

@@ -0,0 +1,8 @@
+<odoo>
+    <data noupdate="1">
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_1">
+            <field name="code">PTD</field>
+            <field name="name">后置三元检测</field>
+        </record>
+    </data>
+</odoo>

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -25,6 +25,8 @@ class ResMrpRoutingWorkcenter(models.Model):
     bom_id = fields.Many2one('mrp.bom', required=False)
     surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
     reserved_duration = fields.Float('预留时长', default=30, tracking=True)
+    is_outsource = fields.Boolean('外协', default=False)
+    individuation_page = fields.Many2many('sf.work.individuation.page', string='个性化记录')
 
     def get_no(self):
         international_standards = self.search(
@@ -101,3 +103,10 @@ class ResMrpRoutingWorkcenter(models.Model):
             domain = args + [('id', 'not in', route_workcenter_ids)]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
         return super()._name_search(name, args, operator, limit, name_get_uid)
+
+
+class WorkIndividuationPage(models.Model):
+    _name = 'sf.work.individuation.page'
+
+    code = fields.Char('编号')
+    name = fields.Char('名称')

sf_manufacturing/security/ir.model.access.csv

@@ -186,4 +186,7 @@ access_sf_detection_result_manager,sf_detection_result_manager,model_sf_detectio
 access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0
 
 access_mrp_workorder_group_purchase_director,mrp_workorder,model_mrp_workorder,sf_base.group_purchase_director,1,1,0,0
-access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0
+access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0
+
+access_sf_work_individuation_page,sf_work_individuation_page,model_sf_work_individuation_page,sf_base.group_sf_mrp_user,1,1,1,0
+access_sf_work_individuation_page_group_plan_dispatch,sf_work_individuation_page_group_plan_dispatch,model_sf_work_individuation_page,sf_base.group_plan_dispatch,1,1,0,0

sf_manufacturing/views/mrp_routing_workcenter_view.xml

@@ -17,6 +17,8 @@
                 <field name="bom_product_template_attribute_value_ids" position="after">
                     <field name="routing_type" required="1"/>
                     <field name="routing_tag" required="1" string="工序标签"/>
+                    <field name="is_outsource"/>
+                    <field name="individuation_page" widget="many2many_tags" options="{'create': False}"/>
                     <field name="is_repeat"/>
                     <field name="reserved_duration"/>
                 </field>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -172,7 +172,7 @@
 
                 <!--                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"-->
                 <!--                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>-->
-                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
+                <button name="button_start" type="object" string="开始" class="btn-success"
                         attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>