From 7d4314abc764dcfbcda2b63b6570bdd2f65e67e1 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 5 Mar 2025 11:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B5=E7=AD=BE=E5=8F=AF=E5=85=A8=E9=87=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_workorder_views.xml             |  2 +-
 sf_dlm/views/product_workorder.xml            |  2 +-
 sf_machine_connect/views/delivery_record.xml  |  2 +-
 .../views/machine_info_present.xml            |  2 +-
 .../data/sf_work_individuation_page.xml       | 58 +++++++++++++++++++
 sf_manufacturing/models/mrp_production.py     |  2 +-
 sf_manufacturing/models/mrp_workorder.py      | 13 +++--
 sf_manufacturing/views/mrp_workorder_view.xml | 37 +++++++-----
 sf_quality/models/quality.py                  |  4 +-
 sf_quality/views/quality_check_view.xml       |  2 +-
 10 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/jikimo_workorder_exception/views/mrp_workorder_views.xml b/jikimo_workorder_exception/views/mrp_workorder_views.xml
index 55ee0aa7..1ce168dc 100644
--- a/jikimo_workorder_exception/views/mrp_workorder_views.xml
+++ b/jikimo_workorder_exception/views/mrp_workorder_views.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[last()]" position="after">
                     <field name="routing_type" invisible="1"/>
-                    <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
+                    <page string="异常记录" name="workorder_exception" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "ER")]}'>
                         <field name="exception_ids" nolabel="1" readonly="1">
                             <tree create="false" delete="false" edit="false">
                                 <field name="exception_content" string="反馈的异常/问题信息"/>
diff --git a/sf_dlm/views/product_workorder.xml b/sf_dlm/views/product_workorder.xml
index 4c5f2a10..769e2369 100644
--- a/sf_dlm/views/product_workorder.xml
+++ b/sf_dlm/views/product_workorder.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
             <xpath expr="//page[1]" position="before">
-                <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
+                <page string="开料要求" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CMR")]}'>
                     <group>
                         <group>
                             <field name="product_tmpl_id_materials_id" widget="many2one"/>
diff --git a/sf_machine_connect/views/delivery_record.xml b/sf_machine_connect/views/delivery_record.xml
index b614a7bb..d3d84cec 100644
--- a/sf_machine_connect/views/delivery_record.xml
+++ b/sf_machine_connect/views/delivery_record.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//page[last()-3]" position="before">
 <!--                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>-->
-                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="下发记录" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "HDR")]}'>
                     <field name="delivery_records">
                         <tree create="false">
                             <field name="delivery_type"/>
diff --git a/sf_machine_connect/views/machine_info_present.xml b/sf_machine_connect/views/machine_info_present.xml
index b25a3515..78571a47 100644
--- a/sf_machine_connect/views/machine_info_present.xml
+++ b/sf_machine_connect/views/machine_info_present.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
             <xpath expr="//page[last()-3]" position="before">
-                <page string="机床信息" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="机床信息" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "MTI")]}'>
                     <group string="机床信息">
                         <group>
                             <field name="machine_tool_name"/>
diff --git a/sf_manufacturing/data/sf_work_individuation_page.xml b/sf_manufacturing/data/sf_work_individuation_page.xml
index 89bf333b..0b23324d 100644
--- a/sf_manufacturing/data/sf_work_individuation_page.xml
+++ b/sf_manufacturing/data/sf_work_individuation_page.xml
@@ -4,5 +4,63 @@
             <field name="code">PTD</field>
             <field name="name">后置三元检测</field>
         </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_2">
+            <field name="code">WCP</field>
+            <field name="name">工件装夹</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_3">
+            <field name="code">ITD_PP</field>
+            <field name="name">前置三元检测定位参数</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_4">
+            <field name="code">2D_MD</field>
+            <field name="name">2D加工图纸</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_5">
+            <field name="code">QIS</field>
+            <field name="name">质检标准</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_6">
+            <field name="code">WD</field>
+            <field name="name">工件配送</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_9">
+            <field name="code">CNC_P</field>
+            <field name="name">CNC程序</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_10">
+            <field name="code">CMM_P</field>
+            <field name="name">CMM程序</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_11">
+            <field name="code">MTI</field>
+            <field name="name">机床信息</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_12">
+            <field name="code">HDR</field>
+            <field name="name">下发记录</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_13">
+            <field name="code">ER</field>
+            <field name="name">异常记录</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_14">
+            <field name="code">DCP</field>
+            <field name="name">解除装夹</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_15">
+            <field name="code">CMR</field>
+            <field name="name">开料要求</field>
+        </record>
+
+            <!--   原生页签先不进行配置     -->
+<!--        <record model="sf.work.individuation.page" id="sf_work_individuation_page_7">-->
+<!--            <field name="code">ML</field>-->
+<!--            <field name="name">物料</field>-->
+<!--        </record>-->
+<!--        <record model="sf.work.individuation.page" id="sf_work_individuation_page_8">-->
+<!--            <field name="code">TT</field>-->
+<!--            <field name="name">时间跟踪</field>-->
+<!--        </record>-->
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 17c1803e..4f9571c8 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -365,7 +365,7 @@ class MrpProduction(models.Model):
                     and production.schedule_state == '已排' and production.is_rework is False):
                 production.state = 'pending_cam'
             if any((wo.test_results == '返工' and wo.state == 'done' and
-                    (production.programming_state in ['已编程'] or wo.individuation_page_PTD is True))
+                    (production.programming_state in ['已编程'] or 'PTD' in wo.individuation_page_list))
                    or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
                    for wo in production.workorder_ids) or production.is_rework is True:
                 production.state = 'rework'
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index a2bae378..728123e0 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1442,7 +1442,7 @@ class ResMrpWorkOrder(models.Model):
                 record.production_id.process_state = '待加工'
                 # 生成工件配送单
                 record.workpiece_delivery_ids = record._json_workpiece_delivery_list()
-            if record.routing_type == 'CNC加工' or record.individuation_page_PTD is True:
+            if record.routing_type == 'CNC加工' or 'PTD' in record.individuation_page_list:
                 if record.routing_type == 'CNC加工':
                     record.process_state = '待解除装夹'
                     # record.write({'process_state': '待加工'})
@@ -1676,10 +1676,10 @@ class ResMrpWorkOrder(models.Model):
 
     # ==============================配置化页签--个性化记录===================================
     routing_workcenter_id = fields.Many2one('mrp.routing.workcenter', compute='_compute_routing_workcenter_id',
-                                            store=True)
+                                            store=True, string='工序作业')
     individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录', store=True,
                                               compute='_compute_individuation_page_ids')
-    individuation_page_PTD = fields.Boolean('个性化记录(是否显示后置三元检测[PTD]页签)', default=False)
+    individuation_page_list = fields.Char('个性化记录', default=None)
 
     @api.depends('name')
     def _compute_routing_workcenter_id(self):
@@ -1695,10 +1695,11 @@ class ResMrpWorkOrder(models.Model):
             if mw.routing_workcenter_id:
                 mw.individuation_page_ids = mw.routing_workcenter_id.individuation_page_ids.ids
                 # 初始化页签配置
-                mw.individuation_page_PTD = False
+                mw.individuation_page_list = None
                 # 根据工单对应的【作业_个性化记录】配置页签
-                if any(item.code == 'PTD' for item in mw.routing_workcenter_id.individuation_page_ids):
-                    mw.individuation_page_PTD = True
+                individuation_page_list = [item.code for item in mw.routing_workcenter_id.individuation_page_ids]
+                if individuation_page_list:
+                    mw.individuation_page_list = list(set(individuation_page_list))
 
     # =============================================================================================
 
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index ff6b0a20..23c67c71 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -227,8 +227,7 @@
                 <!--                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>-->
             </xpath>
             <xpath expr="//page[1]" position="before">
-                <page string="开料要求"
-                      attrs='{"invisible": [("routing_type","not in",("切割", "线切割", "人工线下加工"))]}'>
+                <page string="开料要求" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CMR")]}'>
                     <group>
                         <group>
                             <field name="product_tmpl_id_materials_id" widget="many2one"/>
@@ -325,7 +324,7 @@
 
 
             <xpath expr="//page[1]" position="before">
-                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
+                <page string="工件装夹" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "WCP")]}'>
                     <group>
                         <!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
                         <group string="托盘">
@@ -347,7 +346,7 @@
                                placeholder="如有预调程序信息请在此处输入....."/>
                     </group>
                 </page>
-                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
+                <page string="前置三元检测定位参数" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "ITD_PP")]}'>
 
                     <div>左面:</div>
                     <div class="o_address_format">
@@ -504,17 +503,15 @@
                     </group>
                 </page>
 
-                <page string="2D加工图纸"
-                      attrs='{"invisible": [("routing_type","not in",["装夹预调", "人工线下加工"])]}'>
+                <page string="2D加工图纸" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "2D_MD")]}'>
                     <field name="machining_drawings" widget="adaptive_viewer"/>
                 </page>
 
-                <page string="质检标准" attrs="{'invisible': [('routing_type','!=','装夹预调')]}">
+                <page string="质检标准" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "QIS")]}'>
                     <field name="quality_standard" widget="adaptive_viewer"/>
                 </page>
 
-                <page string="工件配送"
-                      attrs="{'invisible': [('routing_type','!=','装夹预调')]}">
+                <page string="工件配送" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "WD")]}'>
                     <field name="workpiece_delivery_ids">
                         <tree editable="bottom">
                             <field name="production_id" invisible="1"/>
@@ -542,11 +539,19 @@
                         attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
             </xpath>
 
+                <!--  =====原生页签，暂时不进行配置=====   -->
+<!--            <xpath expr="//page[@name='components']" position="attributes">-->
+<!--                <attribute name="attrs">{"invisible": ["!", ("individuation_page_list", "ilike", "ML")]}</attribute>-->
+<!--            </xpath>-->
+<!--            <xpath expr="//page[@name='time_tracking']" position="attributes">-->
+<!--                <attribute name="attrs">{"invisible": ["!", ("individuation_page_list", "ilike", "TT")]}</attribute>-->
+<!--            </xpath>-->
+                <!--  =============================  -->
 
             <xpath expr="//page[1]" position="before">
                 <field name="results" invisible="1"/>
-                <field name="individuation_page_PTD" invisible="1"/>
-                <page string="后置三元检测" attrs='{"invisible": [("individuation_page_PTD", "=", False)]}'>
+                <field name="individuation_page_list" invisible="1"/>
+                <page string="后置三元检测" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "PTD")]}'>
                     <group>
                         <field name="test_results"
                                attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
@@ -568,16 +573,16 @@
                     <!--                                attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>-->
                     <!--                    </div>-->
                 </page>
-                <page string="2D加工图纸" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="2D加工图纸" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "2D_MD")]}'>
                     <field name="machining_drawings" widget="adaptive_viewer"/>
                 </page>
 
-                <page string="质检标准" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="质检标准" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "QIS")]}'>
                     <field name="quality_standard" widget="adaptive_viewer"/>
                 </page>
             </xpath>
             <xpath expr="//page[1]" position="before">
-                <page string="CNC程序" attrs='{"invisible": [("routing_type","not in",["CNC加工", "人工线下加工"])]}'>
+                <page string="CNC程序" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CNC_P")]}'>
                     <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
                            readonly="0">
                         <tree>
@@ -601,7 +606,7 @@
                     </field>
 
                 </page>
-                <page string="CMM程序" attrs='{"invisible": [("routing_type","not in",["CNC加工", "人工线下加工"])]}'>
+                <page string="CMM程序" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CMM_P")]}'>
                     <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
                         <tree>
                             <field name="sequence_number"/>
@@ -614,7 +619,7 @@
                 </page>
             </xpath>
             <xpath expr="//page[1]" position="before">
-                <page string="解除装夹" attrs='{"invisible": [("routing_type","!=","解除装夹")]}'>
+                <page string="解除装夹" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "DCP")]}'>
                     <!--                    <field name="tray_id" readonly="1"/>-->
                     <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
                     <!--                        <button type="object" class="oe_highlight" name="unbindtray" string="解除装夹"-->
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index ebe30a71..498ec402 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -18,7 +18,7 @@ class QualityCheck(models.Model):
         ('cancel', '已取消'), ], string='状态', tracking=True, store=True,
         default='none', copy=False, compute='_compute_quality_state')
 
-    individuation_page_PTD = fields.Boolean('个性化记录(是否显示后置三元检测[PTD]页签)', related='workorder_id.individuation_page_PTD')
+    individuation_page_list = fields.Char('个性化记录', related='workorder_id.individuation_page_list')
     work_state = fields.Selection(related='workorder_id.state', string='工单状态')
     processing_panel = fields.Char(related='workorder_id.processing_panel', string='加工面')
 
@@ -93,7 +93,7 @@ class QualityCheck(models.Model):
                 raise ValidationError('请填写【判定结果】里的信息')
             if self.test_results == '合格':
                 raise ValidationError('请重新选择【判定结果】-【检测结果】')
-            if self.workorder_id.routing_type != 'CNC加工' and self.workorder_id.individuation_page_PTD is False:
+            if self.workorder_id.routing_type != 'CNC加工' and 'PTD' not in self.workorder_id.individuation_page_list:
                 self.workorder_id.production_id.write({'detection_result_ids': [(0, 0, {
                     'rework_reason': self.reason,
                     'detailed_reason': self.detailed_reason,
diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
index 00b139de..83ffcbca 100644
--- a/sf_quality/views/quality_check_view.xml
+++ b/sf_quality/views/quality_check_view.xml
@@ -8,7 +8,7 @@
             <xpath expr="//field[@name='alert_ids']" position="after">
                 <field name="production_id" invisible="1"/>
                 <field name="work_state" invisible="1"/>
-                <field name="individuation_page_PTD" invisible="1"/>
+                <field name="individuation_page_list" invisible="1"/>
                 <field name="production_line_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="equipment_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"