From 89eccb40ac99cc6f1aa67bf6f7649ca998143b1f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 19 Apr 2024 15:42:35 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 561f57a6..9c856b8b 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -109,16 +109,18 @@
                 <field name='is_delivery' invisible="1"/>
                 <!--                 工单form页面的开始停工按钮等 -->
                 <button name="button_start" type="object" string="开始" class="btn-success"
-
+                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','ready')]}"
                         groups="sf_base.group_sf_mrp_user"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
+                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"
                         groups="sf_base.group_sf_mrp_user"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success"
+                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"
                         groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/>
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="停工"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         groups="sf_base.group_sf_mrp_user"
-                        attrs="{'invisible': ['|', '|','|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'),('user_permissions','=',False),('state','=','done'), ('routing_type', '=', 'CNC加工')]}"/>
+                        attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"/>
                 <button name="button_unblock" type="object" string="Unblock"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         groups="sf_base.group_sf_mrp_user"
@@ -523,7 +525,7 @@
                 <field name="is_ok"/>
                 <field name="processing_user_id"/>
                 <field name="inspection_user_id"/>
-                <field name="save_name" widget="CopyClipboardChar"/>
+                <field name="save_name" widget="CopyClipboardChar" attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
             </xpath>
         </field>
     </record>

From 857d5d8916c95730f8740ae6ef771df1bf2c0dde Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 19 Apr 2024 20:12:32 +0800
Subject: [PATCH 02/13] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E5=89=8D=E7=AB=AF=E7=9A=84tree=E3=80=81form?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E9=9C=80=E8=A6=81=E6=8B=86=E8=A7=A3=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py             | 128 +++++++++++++++-
 .../security/ir.model.access.csv              |   6 +-
 sf_tool_management/views/menu_view.xml        |   8 +
 sf_tool_management/views/tool_base_views.xml  | 143 ++++++++++++++++++
 sf_tool_management/wizard/wizard.py           |  55 ++++---
 5 files changed, 309 insertions(+), 31 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 83b4b550..235935a0 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -423,7 +423,8 @@ class FunctionalToolAssembly(models.Model):
     def _compute_integral_product_id(self):
         for item in self:
             if item.integral_freight_barcode:
-                location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.integral_freight_barcode)])
+                location = self.env['sf.shelf.location'].sudo().search(
+                    [('barcode', '=', item.integral_freight_barcode)])
                 if location:
                     item.integral_product_id = location.product_id.id
                 else:
@@ -442,7 +443,7 @@ class FunctionalToolAssembly(models.Model):
     @api.depends('blade_freight_barcode')
     def _compute_blade_product_id(self):
         for item in self:
-            if item.integral_freight_barcode:
+            if item.blade_freight_barcode:
                 location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.blade_freight_barcode)])
                 if location:
                     item.blade_product_id = location.product_id.id
@@ -462,7 +463,7 @@ class FunctionalToolAssembly(models.Model):
     @api.depends('bar_freight_barcode')
     def _compute_bar_product_id(self):
         for item in self:
-            if item.integral_freight_barcode:
+            if item.bar_freight_barcode:
                 location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.bar_freight_barcode)])
                 if location:
                     item.bar_product_id = location.product_id.id
@@ -482,7 +483,7 @@ class FunctionalToolAssembly(models.Model):
     @api.depends('pad_freight_barcode')
     def _compute_pad_product_id(self):
         for item in self:
-            if item.integral_freight_barcode:
+            if item.pad_freight_barcode:
                 location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.pad_freight_barcode)])
                 if location:
                     item.pad_product_id = location.product_id.id
@@ -523,7 +524,7 @@ class FunctionalToolAssembly(models.Model):
     @api.depends('chuck_freight_barcode')
     def _compute_chuck_product_id(self):
         for item in self:
-            if item.integral_freight_barcode:
+            if item.chuck_freight_barcode:
                 location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.chuck_freight_barcode)])
                 if location:
                     item.chuck_product_id = location.product_id.id
@@ -631,3 +632,120 @@ class FunctionalToolAssembly(models.Model):
             code = self._get_code(obj.loading_task_source)
             obj.assembly_order_code = code
         return obj
+
+
+class FunctionalToolDismantle(models.Model):
+    _name = 'sf.functional.tool.dismantle'
+    _inherit = ["barcodes.barcode_events_mixin"]
+    _description = '功能刀具拆解'
+
+    def on_barcode_scanned(self, barcode):
+        """
+        扫码
+        """
+        tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', barcode)])
+        if tool_id:
+            self.functional_tool_id = tool_id.id
+        else:
+            pass
+
+    name = fields.Char('名称', related='functional_tool_id.name')
+
+    functional_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', required=True,
+                                         domain=[('functional_tool_status', '!=', '已拆除')])
+    tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
+                                   compute='_compute_functional_tool_num')
+    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', compute='_compute_functional_tool_num', store=True)
+    diameter = fields.Integer(string='刀具直径(mm)', compute='_compute_functional_tool_num', store=True)
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', compute='_compute_functional_tool_num', store=True)
+    rfid = fields.Char('Rfid', compute='_compute_functional_tool_num', store=True)
+
+    dismantle_cause = fields.Selection(
+        [('寿命到期报废', '寿命到期报废'), ('崩刀报废', '崩刀报废'), ('更换为其他刀具', '更换为其他刀具'),
+         ('刀具需磨削', '刀具需磨削')], string='拆解原因', required=True)
+    dismantle_data = fields.Datetime('拆解日期', readonly=True)
+    dismantle_person = fields.Char('拆解人', readonly=True)
+    image = fields.Binary('图片', readonly=True)
+
+    scrap_id = fields.Char('报废单号')
+    grinding_id = fields.Char('磨削单号')
+
+    # 刀柄
+    handle_product_id = fields.Many2one('product.product', string='刀柄', compute='_compute_functional_tool_num',
+                                        store=True)
+    handle_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
+                                     related='handle_product_id.cutting_tool_model_id')
+    handle_brand_id = fields.Many2one('sf.machine.brand', string='刀柄品牌', related='handle_product_id.brand_id')
+    handle_rfid = fields.Char(string='刀柄Rfid')
+    scrap_boolean = fields.Boolean(string='刀柄是否报废', default=False)
+
+    # 整体式
+    integral_product_id = fields.Many2one('product.product', string='整体式刀具',
+                                          compute='_compute_functional_tool_num', store=True)
+    integral_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
+                                       related='integral_product_id.cutting_tool_model_id')
+    integral_brand_id = fields.Many2one('sf.machine.brand', string='整体式刀具品牌',
+                                        related='integral_product_id.brand_id')
+    integral_freight_barcode = fields.Char('整体式刀具目标货位')
+
+    # 刀片
+    blade_product_id = fields.Many2one('product.product', string='刀片', compute='_compute_functional_tool_num',
+                                       store=True)
+    blade_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号',
+                                    related='blade_product_id.cutting_tool_model_id')
+    blade_brand_id = fields.Many2one('sf.machine.brand', string='刀片品牌', related='blade_product_id.brand_id')
+    blade_freight_barcode = fields.Char('刀片目标货位')
+
+    # 刀杆
+    bar_product_id = fields.Many2one('product.product', string='刀杆', compute='_compute_functional_tool_num',
+                                     store=True)
+    bar_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
+                                  related='bar_product_id.cutting_tool_model_id')
+    bar_brand_id = fields.Many2one('sf.machine.brand', string='刀杆品牌', related='bar_product_id.brand_id')
+    bar_freight_barcode = fields.Char('刀杆目标货位')
+
+    # 刀盘
+    pad_product_id = fields.Many2one('product.product', string='刀盘', compute='_compute_functional_tool_num',
+                                     store=True)
+    pad_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
+                                  related='pad_product_id.cutting_tool_model_id')
+    pad_brand_id = fields.Many2one('sf.machine.brand', string='刀盘品牌', related='pad_product_id.brand_id')
+    pad_freight_barcode = fields.Char('刀盘目标货位')
+
+    # 夹头
+    chuck_product_id = fields.Many2one('product.product', string='夹头', compute='_compute_functional_tool_num',
+                                       store=True)
+    chuck_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
+                                    related='chuck_product_id.cutting_tool_model_id')
+    chuck_brand_id = fields.Many2one('sf.machine.brand', string='夹头品牌', related='chuck_product_id.brand_id')
+    chuck_freight_barcode = fields.Char('夹头目标货位')
+
+    @api.depends('functional_tool_id')
+    def _compute_functional_tool_num(self):
+        for item in self:
+            if item.functional_tool_id:
+                item.tool_groups_id = item.functional_tool_id.tool_groups_id.id
+                item.tool_type_id = item.functional_tool_id.sf_cutting_tool_type_id.id
+                item.diameter = item.functional_tool_id.functional_tool_diameter
+                item.knife_tip_r_angle = item.functional_tool_id.knife_tip_r_angle
+                item.rfid = item.functional_tool_id.rfid
+
+                item.handle_product_id = item.functional_tool_id.functional_tool_name_id.handle_product_id.id
+                item.integral_product_id = item.functional_tool_id.functional_tool_name_id.integral_product_id.id
+                item.blade_product_id = item.functional_tool_id.functional_tool_name_id.blade_product_id.id
+                item.bar_product_id = item.functional_tool_id.functional_tool_name_id.bar_product_id.id
+                item.pad_product_id = item.functional_tool_id.functional_tool_name_id.pad_product_id.id
+                item.chuck_product_id = item.functional_tool_id.functional_tool_name_id.chuck_product_id.id
+            else:
+                item.tool_groups_id = False
+                item.tool_type_id = False
+                item.diameter = 0
+                item.knife_tip_r_angle = 0
+                item.rfid = ''
+
+                item.handle_product_id = False
+                item.integral_product_id = False
+                item.blade_product_id = False
+                item.bar_product_id = False
+                item.pad_product_id = False
+                item.chuck_product_id = False
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 3a7b4589..79800637 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -30,4 +30,8 @@ access_sf_tool_material_search,sf.tool.material.search,model_sf_tool_material_se
 access_sf_tool_material_search_group_plan_dispatch,sf.tool.material.search,model_sf_tool_material_search,sf_base.group_plan_dispatch,1,0,0,0
 
 access_sf_fixture_material_search,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_sf_order_user,1,0,0,0
-access_sf_fixture_material_search_group_plan_dispatch,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_plan_dispatch,1,0,0,0
\ No newline at end of file
+access_sf_fixture_material_search_group_plan_dispatch,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_plan_dispatch,1,0,0,0
+
+
+access_sf_functional_tool_dismantle_group_sf_tool_user,sf.functional.tool.dismantle,model_sf_functional_tool_dismantle,sf_base.group_sf_tool_user,1,1,1,0
+access_sf_functional_tool_dismantle_group_plan_dispatch,sf.functional.tool.dismantle,model_sf_functional_tool_dismantle,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index 13a12725..eae7532e 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -78,5 +78,13 @@
                 parent="menu_sf_tool_manage"
         />
 
+        <menuitem
+                sequence="5"
+                name="功能刀具拆解"
+                id="menu_sf_functional_tool_dismantle"
+                action="sf_functional_tool_dismantle_view_act"
+                parent="menu_sf_tool_manage"
+        />
+
     </data>
 </odoo>
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 46c77b82..4e1a6fc4 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -766,5 +766,148 @@
             <field name="search_view_id" ref="sf_functional_tool_assembly_search"/>
             <field name="context">{'search_default_no_assemble_status':1}</field>
         </record>
+
+
+        <!--================================================功能刀具拆解================================================-->
+        <record id="sf_functional_tool_dismantle_tree" model="ir.ui.view">
+            <field name="name">功能刀具拆解</field>
+            <field name="model">sf.functional.tool.dismantle</field>
+            <field name="arch" type="xml">
+                <tree create="1">
+                    <field name="rfid"/>
+                    <field name="functional_tool_id"/>
+                    <field name="tool_type_id" invisible="1"/>
+                    <field name="tool_groups_id"/>
+                    <field name="diameter"/>
+                    <field name="knife_tip_r_angle"/>
+                    <field name="dismantle_cause"/>
+                    <field name="dismantle_data"/>
+                    <field name="dismantle_person"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="sf_functional_tool_dismantle_form" model="ir.ui.view">
+            <field name="name">功能刀具拆解</field>
+            <field name="model">sf.functional.tool.dismantle</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="functional_tool_id" placeholder="请选择将要拆解的功能刀具"
+                                       options="{'no_create': True}"/>
+                            </h1>
+                        </div>
+                        <field name="_barcode_scanned" widget="barcode_handler"/>
+                        <group>
+                            <group>
+                                <field name="rfid"/>
+                                <field name="tool_type_id"/>
+                                <field name="tool_groups_id"/>
+                                <field name="diameter"/>
+                                <field name="knife_tip_r_angle"/>
+                                <field name="dismantle_cause" placeholder="请选择拆解原因"/>
+                            </group>
+                            <group>
+                                <field name="image"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="物料组装信息">
+                                <group string="刀柄">
+                                    <group>
+                                        <field name="handle_product_id" string="名称"/>
+                                        <field name="handle_type_id" string="型号"/>
+                                        <field name="handle_brand_id" string="品牌"/>
+                                    </group>
+                                    <group>
+                                        <field name="handle_rfid" string="Rfid"/>
+                                    </group>
+                                </group>
+                                <group string="整体式刀具">
+                                    <group>
+                                        <field name="integral_product_id" string="名称"/>
+                                        <field name="integral_type_id" string="型号"/>
+                                        <field name="integral_brand_id" string="品牌"/>
+                                    </group>
+                                    <group>
+                                        <field name="integral_freight_barcode" string="目标货位"/>
+                                    </group>
+                                </group>
+
+                                <group string="刀片">
+                                    <group>
+                                        <field name="blade_product_id" string="名称"/>
+                                        <field name="blade_type_id" string="型号"/>
+                                        <field name="blade_brand_id" string="品牌"/>
+                                    </group>
+                                    <group>
+                                        <field name="blade_freight_barcode" string="目标货位"/>
+                                    </group>
+                                </group>
+
+                                <group string="刀杆">
+                                    <group>
+                                        <field name="bar_product_id" string="名称"/>
+                                        <field name="bar_type_id" string="型号"/>
+                                        <field name="bar_brand_id" string="品牌"/>
+                                    </group>
+                                    <group>
+                                        <field name="bar_freight_barcode" string="目标货位"/>
+                                    </group>
+                                </group>
+
+                                <group string="刀盘">
+                                    <group>
+                                        <field name="pad_product_id" string="名称"/>
+                                        <field name="pad_type_id" string="型号"/>
+                                        <field name="pad_brand_id" string="品牌"/>
+                                    </group>
+                                    <group>
+                                        <field name="pad_freight_barcode" string="目标货位"/>
+                                    </group>
+                                </group>
+
+                                <group string="夹头">
+                                    <group>
+                                        <field name="chuck_product_id" string="名称"/>
+                                        <field name="chuck_type_id" string="型号"/>
+                                        <field name="chuck_brand_id" string="品牌"/>
+                                    </group>
+                                    <group>
+                                        <field name="chuck_freight_barcode" string="目标货位"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="sf_functional_tool_dismantle_search" model="ir.ui.view">
+            <field name="model">sf.functional.tool.dismantle</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="functional_tool_id"/>
+                    <searchpanel>
+                        <field name="tool_groups_id" enable_counters="1" icon="fa-filter"/>
+                        <field name="tool_type_id" enable_counters="1" icon="fa-filter"/>
+                    </searchpanel>
+                </search>
+            </field>
+        </record>
+
+        <record id="sf_functional_tool_dismantle_view_act" model="ir.actions.act_window">
+            <field name="name">功能刀具拆解</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.functional.tool.dismantle</field>
+            <field name="view_mode">tree,form,search</field>
+            <!--            <field name="search_view_id" ref="sf_functional_tool_dismantle_search"/>-->
+            <!--            <field name="context">{'search_default_no_assemble_status':1}</field>-->
+        </record>
+
+
     </data>
 </odoo>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 979d8efe..be31d7f0 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -243,11 +243,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     @api.depends('integral_freight_barcode')
     def _compute_integral_product_id(self):
-        location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.integral_freight_barcode)])
-        if location:
-            self.integral_product_id = location.product_id.id
-        else:
-            self.integral_product_id = False
+        if self.integral_freight_barcode:
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.integral_freight_barcode)])
+            if location:
+                self.integral_product_id = location.product_id.id
+            else:
+                self.integral_product_id = False
 
     # ===============刀片型号====================
     blade_freight_barcode = fields.Char('刀片货位')
@@ -261,11 +262,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     @api.depends('blade_freight_barcode')
     def _compute_blade_product_id(self):
-        location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.blade_freight_barcode)])
-        if location:
-            self.blade_product_id = location.product_id.id
-        else:
-            self.blade_product_id = False
+        if self.blade_freight_barcode:
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.blade_freight_barcode)])
+            if location:
+                self.blade_product_id = location.product_id.id
+            else:
+                self.blade_product_id = False
 
     # ====================刀杆型号==================
     bar_freight_barcode = fields.Char('刀杆货位')
@@ -279,11 +281,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     @api.depends('bar_freight_barcode')
     def _compute_bar_product_id(self):
-        location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.bar_freight_barcode)])
-        if location:
-            self.bar_product_id = location.product_id.id
-        else:
-            self.bar_product_id = False
+        if self.bar_freight_barcode:
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.bar_freight_barcode)])
+            if location:
+                self.bar_product_id = location.product_id.id
+            else:
+                self.bar_product_id = False
 
     # ===============刀盘型号===================
     pad_freight_barcode = fields.Char('刀盘货位')
@@ -297,11 +300,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     @api.depends('pad_freight_barcode')
     def _compute_pad_product_id(self):
-        location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.pad_freight_barcode)])
-        if location:
-            self.pad_product_id = location.product_id.id
-        else:
-            self.pad_product_id = False
+        if self.pad_freight_barcode:
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.pad_freight_barcode)])
+            if location:
+                self.pad_product_id = location.product_id.id
+            else:
+                self.pad_product_id = False
 
     # ================刀柄型号===============
     handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_rfid')
@@ -335,11 +339,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     @api.depends('chuck_freight_barcode')
     def _compute_chuck_product_id(self):
-        location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.chuck_freight_barcode)])
-        if location:
-            self.chuck_product_id = location.product_id.id
-        else:
-            self.chuck_product_id = False
+        if self.chuck_freight_barcode:
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.chuck_freight_barcode)])
+            if location:
+                self.chuck_product_id = location.product_id.id
+            else:
+                self.chuck_product_id = False
 
     # ========================================
 

From e108e2d5d62e798c68597e5e88b59133ec4ca4d6 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 22 Apr 2024 10:58:04 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=A2=9E=E5=8A=A0=E9=95=BF=E5=AE=BD=E9=AB=98?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 134922d1..3ccef829 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -104,7 +104,7 @@ class ResMrpWorkOrder(models.Model):
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
     tray_code = fields.Char(string="托盘编码")
-    glb_file = fields.Binary("glb模型文件")
+    glb_file = fields.Binary("glb模型文件", related='production_id.model_file')
     is_subcontract = fields.Boolean(string='是否外协')
     surface_technics_parameters_id = fields.Many2one('sf.production.process.parameter', string="表面工艺可选参数")
     picking_in_id = fields.Many2one('stock.picking', string='外协入库单')
@@ -719,6 +719,12 @@ class ResMrpWorkOrder(models.Model):
                 picking_out.write({'state': 'assigned'})
         if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
             self.move_raw_ids = self.production_id.move_raw_ids
+            self.move_raw_ids[0].write({
+                'materiel_length': self.move_raw_ids[0].product_id.length,
+                'materiel_width': self.move_raw_ids[0].product_id.width,
+                'materiel_height': self.move_raw_ids[0].product_id.height
+            })
+
             self.ensure_one()
             if any(not time.date_end for time in self.time_ids.filtered(lambda t: t.user_id.id == self.env.user.id)):
                 return True

From 4b2e58a66d84951fa19e463c4db077224ceeaab7 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 22 Apr 2024 14:14:59 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=92=8C=E4=BA=BA?=
 =?UTF-8?q?=E5=B7=A5=E6=8A=A5=E4=BB=B7=E5=8F=8A=E6=B3=A8=E9=87=8A=E6=8E=89?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E9=95=BF=E5=AE=BD=E9=AB=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/quick_easy_order_old.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 21fc3f5e..be9bae3d 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -128,18 +128,18 @@ class QuickEasyOrder(models.Model):
                 # # print(volume)
                 # item.model_volume = volume
                 # # 长宽高/体积
-                # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(library_of_models.code) + '.stl')
+                # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
                 output_file = os.path.join('/tmp', str(model_code) + '.stl')
-                your_mesh = mesh.Mesh.from_file(output_file)
-                volume, cog, inertia = your_mesh.get_mass_properties()
-                xyz = (your_mesh.max_ - your_mesh.min_)
-                item.model_length = xyz[0]  # 长 单位mm
-                item.model_width = xyz[1]  # 宽
-                item.model_height = xyz[2]  # 高
-                item.model_volume = volume
+                # your_mesh = mesh.Mesh.from_file(output_file)
+                # volume, cog, inertia = your_mesh.get_mass_properties()
+                # xyz = (your_mesh.max_ - your_mesh.min_)
+                # item.model_length = xyz[0]  # 长 单位mm
+                # item.model_width = xyz[1]  # 宽
+                # item.model_height = xyz[2]  # 高
+                # item.model_volume = volume
                 write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
                 # 转化为glb
-                # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(library_of_models.code) + '.glb')
+                # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
                 output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')
                 util_path = get_resource_path('sf_base', 'static/util')
                 cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
@@ -189,6 +189,7 @@ class QuickEasyOrder(models.Model):
                     'number': item.quantity,
                     'total_amount': item.price,
                     'remark': '',
+                    'manual_quotation': True,
                     'barcode': barcode
                 })
             # res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list'])
@@ -292,7 +293,7 @@ class QuickEasyOrder(models.Model):
                 'model_height': order.model_height,
                 'model_volume': order.model_volume,
                 'color_model_path': '/tmp/' + str(model_code) + ".step",
-                'model_order_no': order.name,
+                'model_order_no': '%s-%s' % (order.name, 1),
                 'remark': '订单号:%s 客户:%s' % (order.name, order.customer_id.name)
             }
             try:

From eb6607be00c1342a3984685d4988e255b31527c3 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 22 Apr 2024 14:27:59 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96cnc?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=96=B9=E6=B3=95=E5=85=B3=E4=BA=8E=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E8=AE=A2=E5=8D=95=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  4 +-
 sf_manufacturing/models/mrp_workorder.py      | 41 -------------------
 sf_manufacturing/views/mrp_workorder_view.xml | 12 +++---
 3 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 04b4d913..4b915392 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -135,7 +135,8 @@ class MrpProduction(models.Model):
     # cnc程序获取
     def fetchCNC(self):
         cnc = self.env['mrp.production'].search([('id', '=', self.id)])
-        quick_order = self.env['quick.easy.order'].search([('id', '=', cnc.product_id.id)])
+        quick_order = self.env['quick.easy.order'].search(
+            [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
         programme_way = False
         if cnc.manual_quotation is True:
             programme_way = 'manual operation'
@@ -157,7 +158,6 @@ class MrpProduction(models.Model):
                    'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
                    'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
                    'order_no': cnc.origin,
-                   'quick_order_no': quick_order.name if quick_order else False,
                    'model_order_no': cnc.product_id.default_code,
                    'user': cnc.env.user.name,
                    'programme_way': programme_way,
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 20369d9b..14471baf 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -652,47 +652,6 @@ class ResMrpWorkOrder(models.Model):
         else:
             self.results = '合格'
 
-    # cnc程序获取
-    def fetchCNC(self):
-        try:
-            cnc = self.env['mrp.workorder'].search(
-                [('routing_type', '=', 'CNC加工'), ('production_id', '=', self.production_id.id)], limit=1)
-            res = {'model_code': '' if not cnc.product_id.model_code else cnc.product_id.model_code,
-                   'production_no': self.production_id.name,
-                   'machine_tool_code': cnc.workcenter_id.equipment_id.code,
-                   'material_code': cnc.env['sf.production.materials'].search(
-                       [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
-                   'material_type_code': cnc.env['sf.materials.model'].search(
-                       [('id', '=', cnc.product_id.materials_type_id.id)]).materials_no,
-                   'machining_processing_panel': cnc.product_id.model_processing_panel,
-                   'machining_precision': cnc.product_id.model_machining_precision,
-                   'embryo_long': cnc.product_id.bom_ids.bom_line_ids.product_id.length,
-                   'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
-                   'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
-                   'order_no': cnc.production_id.origin,
-                   'model_order_no': cnc.product_id.default_code.rsplit('  -', 1)[0],
-                   'user': self.env.user.name,
-                   'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
-                       cnc.product_id.model_file).decode('utf-8')
-                   }
-            logging.info('res:%s' % res)
-            configsettings = self.env['res.config.settings'].get_values()
-            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-            url = '/api/intelligent_programming/create'
-            config_url = configsettings['sf_url'] + url
-            # res_str = json.dumps(res)
-            ret = requests.post(config_url, json={}, data=res, headers=config_header)
-            ret = ret.json()
-            logging.info('fetchCNC-ret:%s' % ret)
-            if ret['status'] == 1:
-                self.write(
-                    {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
-            else:
-                raise UserError(ret['message'])
-        except Exception as e:
-            logging.info('fetchCNC error:%s' % e)
-            raise UserError("cnc程序获取编程单失败,请联系管理员")
-
     def json_workorder_str1(self, k, production, route):
         workorders_values_str = [0, '', {
             'product_uom_id': production.product_uom_id.id,
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index f3e2faef..65fbd973 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -210,12 +210,12 @@
                         <field name="programming_state" readonly="1"
                                attrs='{"invisible": [("programming_no","=",False)]}'/>
                     </group>
-                    <group>
-                        <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
-                            <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"
-                            />
-                        </div>
-                    </group>
+<!--                    <group>-->
+<!--                        <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">-->
+<!--                            <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"-->
+<!--                            />-->
+<!--                        </div>-->
+<!--                    </group>-->
                 </page>
             </xpath>
             <!--            <page string="Components" name="components">-->

From 690a66b6a12220e8675912a9af2366906d78caaa Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 22 Apr 2024 15:46:43 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=92?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9E=8B=E8=B7=AF=E5=BE=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/quick_easy_order_old.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index be9bae3d..724d4369 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -292,7 +292,7 @@ class QuickEasyOrder(models.Model):
                 'model_width': order.model_width,
                 'model_height': order.model_height,
                 'model_volume': order.model_volume,
-                'color_model_path': '/tmp/' + str(model_code) + ".step",
+                'model_color_path': '/tmp/' + str(model_code) + ".step",
                 'model_order_no': '%s-%s' % (order.name, 1),
                 'remark': '订单号:%s 客户:%s' % (order.name, order.customer_id.name)
             }

From 080a3d717535d230365517781391a8355921429e Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 22 Apr 2024 17:59:48 +0800
Subject: [PATCH 07/13] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=89=98=E7=9B=98=E5=B7=B2=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=A1=E6=A0=B8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=95=B0=E6=8D=AE=E4=B8=8D=E8=83=BD=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E7=9A=84bug=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C=E6=83=85=E5=86=B5=E6=89=AB?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=A0=81=E5=BD=95=E5=85=A5=E4=BA=94=E7=A7=8D?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=9B=AE=E7=9A=84=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=EF=BC=9B4=E3=80=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8B=86=E8=A7=A3=E5=90=8E=E7=9A=84Rfid=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8B=86=E8=A7=A3=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E5=BA=93=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=90=9C=E7=B4=A2=E8=BF=87=E6=BB=A4=EF=BC=9B5?=
 =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4=E6=8B=86=E8=A7=A3?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=AE=8C=E6=88=90=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8B=86=E8=A7=A3=E5=90=8E=E7=9A=84=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E6=98=AF=E5=90=A6=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E3=80=81=E7=A3=A8=E5=89=8A=E6=88=96=E8=80=85=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=90=8C=E6=9D=A1=E4=BB=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8B=86=E8=A7=A3=E5=90=8E=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E5=8E=BB=E5=90=91=E7=9A=84=E5=8A=9F=E8=83=BD=E5=8F=8A?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=A7=BB=E5=8A=A8=E5=8E=86=E5=8F=B2=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E9=99=A4=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7Rfid?=
 =?UTF-8?q?=E7=9A=84=E7=BB=91=E5=AE=9A=E5=B9=B6=E6=9B=B4=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=89=E3=80=826=E3=80=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95=E7=9B=AE=E5=BD=95=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=EF=BC=9B7=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      |   2 +-
 sf_sale/views/purchase_order_view.xml         |   2 +-
 sf_tool_management/models/base.py             | 162 ++++++++++++++++--
 sf_tool_management/models/functional_tool.py  |   1 +
 sf_tool_management/views/menu_view.xml        | 120 ++++++++-----
 sf_tool_management/views/tool_base_views.xml  | 144 ++++++++++------
 .../views/tool_material_search.xml            |   7 -
 7 files changed, 318 insertions(+), 120 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 9627a0f7..54024fe3 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -988,7 +988,7 @@ class SfWorkOrderBarcodes(models.Model):
         #     [('routing_type', '=', '装夹预调'), ('production_id', '=', self.production_id.id)])
         workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)])
         if workorder_old:
-            raise UserError('该托盘已绑定工件，请先解除绑定！！！')
+            raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % workorder_old.production_id.name)
         if workorder:
             if workorder.routing_type == '装夹预调':
                 if workorder.state in ['done']:
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index f92658fc..90c9bd4b 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -94,7 +94,7 @@
                 </xpath>
                 <xpath expr="//field[@name='order_line']" position="attributes">
                     <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
-                        ['pending','approved'])]}
+                        ['approved'])]}
                     </attribute>
                 </xpath>
                 <field name="partner_ref" position="attributes">
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 235935a0..350658a4 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import re
+
 import logging
 
 from datetime import timedelta
@@ -643,11 +645,35 @@ class FunctionalToolDismantle(models.Model):
         """
         扫码
         """
-        tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', barcode)])
-        if tool_id:
-            self.functional_tool_id = tool_id.id
+        # 对barcode进行校验是否为货位编码
+        if not re.match(r'^[A-Za-z0-9]+-[A-Za-z0-9]+-\d{3}-\d{3}$', barcode):
+            tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', barcode)])
+            if tool_id:
+                self.functional_tool_id = tool_id.id
+            else:
+                raise ValidationError('Rfid为【%s】的功能刀具不存在，请重新扫描！' % barcode)
         else:
-            pass
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
+            if not location:
+                raise ValidationError('【%s】该货位不存在，请重新扫码！' % barcode)
+            else:
+                # 判断是否有夹头物料
+                if not self.chuck_product_id:
+                    # 判断是否有整体式刀具物料
+                    if self.integral_product_id:
+                        # 判断货位是否为空货位 或者 是存有整体式刀具的货位
+                        if location.product_id in [False, self.integral_product_id]:
+                            self.integral_freight_id = location.id
+                        else:
+                            raise ValidationError('【%s】该货位已存在【%s】产品，请重新扫码！' % location.barcode,
+                                                  location.product_id.name)
+                    # 判断是否有刀片物料
+                    elif self.blade_product_id:
+                        # 判断是否有刀杆物料
+                        if self.bar_product_id:
+                            pass
+                else:
+                    pass
 
     name = fields.Char('名称', related='functional_tool_id.name')
 
@@ -659,6 +685,7 @@ class FunctionalToolDismantle(models.Model):
     diameter = fields.Integer(string='刀具直径(mm)', compute='_compute_functional_tool_num', store=True)
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', compute='_compute_functional_tool_num', store=True)
     rfid = fields.Char('Rfid', compute='_compute_functional_tool_num', store=True)
+    rfid_dismantle = fields.Char('Rfid(已拆解)', readonly=True)
 
     dismantle_cause = fields.Selection(
         [('寿命到期报废', '寿命到期报废'), ('崩刀报废', '崩刀报废'), ('更换为其他刀具', '更换为其他刀具'),
@@ -667,8 +694,10 @@ class FunctionalToolDismantle(models.Model):
     dismantle_person = fields.Char('拆解人', readonly=True)
     image = fields.Binary('图片', readonly=True)
 
-    scrap_id = fields.Char('报废单号')
-    grinding_id = fields.Char('磨削单号')
+    scrap_id = fields.Char('报废单号', readonly=True)
+    grinding_id = fields.Char('磨削单号', readonly=True)
+
+    state = fields.Selection([('待拆解', '待拆解'), ('已拆解', '已拆解')], default='待拆解')
 
     # 刀柄
     handle_product_id = fields.Many2one('product.product', string='刀柄', compute='_compute_functional_tool_num',
@@ -676,7 +705,7 @@ class FunctionalToolDismantle(models.Model):
     handle_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
                                      related='handle_product_id.cutting_tool_model_id')
     handle_brand_id = fields.Many2one('sf.machine.brand', string='刀柄品牌', related='handle_product_id.brand_id')
-    handle_rfid = fields.Char(string='刀柄Rfid')
+    handle_rfid = fields.Char(string='刀柄Rfid', compute='_compute_functional_tool_num', store=True)
     scrap_boolean = fields.Boolean(string='刀柄是否报废', default=False)
 
     # 整体式
@@ -686,7 +715,8 @@ class FunctionalToolDismantle(models.Model):
                                        related='integral_product_id.cutting_tool_model_id')
     integral_brand_id = fields.Many2one('sf.machine.brand', string='整体式刀具品牌',
                                         related='integral_product_id.brand_id')
-    integral_freight_barcode = fields.Char('整体式刀具目标货位')
+    integral_freight_id = fields.Many2one('sf.shelf.location', '整体式刀具目标货位',
+                                          domain="[('product_id', 'in', (integral_product_id, False))]")
 
     # 刀片
     blade_product_id = fields.Many2one('product.product', string='刀片', compute='_compute_functional_tool_num',
@@ -694,7 +724,8 @@ class FunctionalToolDismantle(models.Model):
     blade_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号',
                                     related='blade_product_id.cutting_tool_model_id')
     blade_brand_id = fields.Many2one('sf.machine.brand', string='刀片品牌', related='blade_product_id.brand_id')
-    blade_freight_barcode = fields.Char('刀片目标货位')
+    blade_freight_id = fields.Many2one('sf.shelf.location', '刀片目标货位',
+                                       domain="[('product_id', 'in', (blade_product_id, False))]")
 
     # 刀杆
     bar_product_id = fields.Many2one('product.product', string='刀杆', compute='_compute_functional_tool_num',
@@ -702,7 +733,8 @@ class FunctionalToolDismantle(models.Model):
     bar_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
                                   related='bar_product_id.cutting_tool_model_id')
     bar_brand_id = fields.Many2one('sf.machine.brand', string='刀杆品牌', related='bar_product_id.brand_id')
-    bar_freight_barcode = fields.Char('刀杆目标货位')
+    bar_freight_id = fields.Many2one('sf.shelf.location', '刀杆目标货位',
+                                     domain="[('product_id', 'in', (bar_product_id, False))]")
 
     # 刀盘
     pad_product_id = fields.Many2one('product.product', string='刀盘', compute='_compute_functional_tool_num',
@@ -710,7 +742,8 @@ class FunctionalToolDismantle(models.Model):
     pad_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
                                   related='pad_product_id.cutting_tool_model_id')
     pad_brand_id = fields.Many2one('sf.machine.brand', string='刀盘品牌', related='pad_product_id.brand_id')
-    pad_freight_barcode = fields.Char('刀盘目标货位')
+    pad_freight_id = fields.Many2one('sf.shelf.location', '刀盘目标货位',
+                                     domain="[('product_id', 'in', (pad_product_id, False))]")
 
     # 夹头
     chuck_product_id = fields.Many2one('product.product', string='夹头', compute='_compute_functional_tool_num',
@@ -718,7 +751,8 @@ class FunctionalToolDismantle(models.Model):
     chuck_type_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
                                     related='chuck_product_id.cutting_tool_model_id')
     chuck_brand_id = fields.Many2one('sf.machine.brand', string='夹头品牌', related='chuck_product_id.brand_id')
-    chuck_freight_barcode = fields.Char('夹头目标货位')
+    chuck_freight_id = fields.Many2one('sf.shelf.location', '夹头目标货位',
+                                       domain="[('product_id', 'in', (chuck_product_id, False))]")
 
     @api.depends('functional_tool_id')
     def _compute_functional_tool_num(self):
@@ -729,6 +763,7 @@ class FunctionalToolDismantle(models.Model):
                 item.diameter = item.functional_tool_id.functional_tool_diameter
                 item.knife_tip_r_angle = item.functional_tool_id.knife_tip_r_angle
                 item.rfid = item.functional_tool_id.rfid
+                item.handle_rfid = item.functional_tool_id.rfid
 
                 item.handle_product_id = item.functional_tool_id.functional_tool_name_id.handle_product_id.id
                 item.integral_product_id = item.functional_tool_id.functional_tool_name_id.integral_product_id.id
@@ -742,6 +777,7 @@ class FunctionalToolDismantle(models.Model):
                 item.diameter = 0
                 item.knife_tip_r_angle = 0
                 item.rfid = ''
+                item.handle_rfid = ''
 
                 item.handle_product_id = False
                 item.integral_product_id = False
@@ -749,3 +785,105 @@ class FunctionalToolDismantle(models.Model):
                 item.bar_product_id = False
                 item.pad_product_id = False
                 item.chuck_product_id = False
+
+    def confirmation_disassembly(self):
+        logging.info('%s刀具确认拆解' % self.dismantle_cause)
+        location = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
+        location_dest = self.env['stock.location'].search([('name', '=', '刀具房')])
+        # =================刀柄是否报废拆解=======
+        location_dest_scrap = self.env['stock.location'].search([('name', '=', 'Scrap')])
+        if self.handle_rfid:
+            lot = self.env['stock.lot'].sudo().search([('name', '=', self.handle_rfid)])
+            functional_tool_assembly = self.functional_tool_id.functional_tool_name_id
+            if self.scrap_boolean:
+                # 刀柄报废 入库到Scrap
+                lot.create_stock_quant(location, location_dest_scrap, functional_tool_assembly.id, '功能刀具拆解',
+                                       functional_tool_assembly)
+            else:
+                # 刀柄不报废 入库到刀具房
+                lot.create_stock_quant(location, location_dest, functional_tool_assembly.id, '功能刀具拆解',
+                                       functional_tool_assembly)
+        # ==============功能刀具报废拆解================
+        if self.dismantle_cause in ['寿命到期报废', '崩刀报废']:
+            # 除刀柄外物料报废 入库到Scrap
+            if self.integral_freight_id:
+                self.integral_product_id.dismantle_stock_moves(False, location, location_dest_scrap)
+            elif self.blade_freight_id:
+                self.blade_product_id.dismantle_stock_moves(False, location, location_dest_scrap)
+                if self.bar_freight_id:
+                    self.bar_product_id.dismantle_stock_moves(False, location, location_dest_scrap)
+                elif self.pad_freight_id:
+                    self.pad_product_id.dismantle_stock_moves(False, location, location_dest_scrap)
+            if self.chuck_freight_id:
+                self.chuck_product_id.dismantle_stock_moves(False, location, location_dest_scrap)
+        # ===========功能刀具磨削拆解==============
+        elif self.dismantle_cause in ['刀具需磨削']:
+            location_dest = self.env['stock.location'].search([('name', '=', '磨削房')])
+            # 除刀柄外物料拆解 入库到具体库位
+            if self.integral_freight_id:
+                self.integral_product_id.dismantle_stock_moves(False, location, location_dest)
+            elif self.blade_freight_id:
+                self.blade_product_id.dismantle_stock_moves(False, location, location_dest)
+                if self.bar_freight_id:
+                    self.bar_product_id.dismantle_stock_moves(False, location, location_dest)
+                elif self.pad_freight_id:
+                    self.pad_product_id.dismantle_stock_moves(False, location, location_dest)
+            if self.chuck_freight_id:
+                self.chuck_product_id.dismantle_stock_moves(False, location, location_dest)
+        # ==============功能刀具更换拆解==============
+        elif self.dismantle_cause in ['更换为其他刀具']:
+            # 除刀柄外物料拆解 入库到具体库位
+            if self.integral_freight_id:
+                self.integral_product_id.dismantle_stock_moves(self.integral_freight_id.barcode, location,
+                                                               location_dest)
+            elif self.blade_freight_id:
+                self.blade_product_id.dismantle_stock_moves(self.blade_freight_id.barcode, location, location_dest)
+                if self.bar_freight_id:
+                    self.bar_product_id.dismantle_stock_moves(self.bar_freight_id.barcode, location, location_dest)
+                elif self.pad_freight_id:
+                    self.pad_product_id.dismantle_stock_moves(self.pad_freight_id.barcode, location, location_dest)
+            if self.chuck_freight_id:
+                self.chuck_product_id.dismantle_stock_moves(self.chuck_freight_id.barcode, location, location_dest)
+        # ===============删除功能刀具的Rfid字段的值， 赋值给Rfid(已拆解)字段=====
+        self.functional_tool_id.write({
+            'rfid_dismantle': self.functional_tool_id.rfid,
+            'rfid': '',
+            'functional_tool_status': '已拆除'
+        })
+        # 修改拆解单的值
+        self.write({
+            'rfid_dismantle': self.rfid,
+            'rfid': '',
+            'state': '已拆解'
+        })
+
+
+class ProductProduct(models.Model):
+    _inherit = 'product.product'
+
+    def dismantle_stock_moves(self, shelf_location_barcode, location_id, location_dest_id):
+        # 创建功能刀具拆解单产品库存移动记录
+        stock_move_id = self.env['stock.move'].sudo().create({
+            'name': '功能刀具拆解',
+            'product_id': self.id,
+            'location_id': location_id.id,
+            'location_dest_id': location_dest_id.id,
+            'product_uom_qty': 1.00,
+            'state': 'done'
+        })
+        if shelf_location_barcode:
+            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', shelf_location_barcode)])
+            location.product_num = location.product_num + 1
+        else:
+            location = False
+        # 创建移动历史记录
+        stock_move_line_id = self.env['stock.move.line'].sudo().create({
+            'product_id': self.id,
+            'move_id': stock_move_id.id,
+            'current_location_id': location.id or False,
+            'install_tool_time': fields.Datetime.now(),
+            'qty_done': 1.0,
+            'state': 'done',
+        })
+
+        return stock_move_id, stock_move_line_id
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index c37d5317..d4718f34 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -14,6 +14,7 @@ class FunctionalCuttingToolEntity(models.Model):
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
     code = fields.Char('编码')
     rfid = fields.Char('Rfid', readonly=True)
+    rfid_dismantle = fields.Char('Rfid(已拆解)', readonly=True)
     name = fields.Char('名称')
     tool_name_id = fields.Many2one('sf.tool.inventory', '功能刀具名称')
     sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index eae7532e..8ddee8eb 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -14,77 +14,111 @@
                   parent="mrp.menu_mrp_root"
                   sequence="20"/>
 
-        <menuitem
-                id="menu_sf_functional_cutting_tool"
-                parent="menu_sf_tool_manage"
-                name="功能刀具"
-                sequence="2"
-                action="sf_function_tool_entry_list_view_act"
-        />
-
-
-        <menuitem
-                id="menu_sf_functional_tool_warning"
-                parent="menu_sf_tool_manage"
-                name="功能刀具预警"
-                sequence="5"
-                action="action_sf_functional_tool_warning"
-        />
-
-        <menuitem
-                sequence="10"
-                name="功能刀具安全库存"
-                id="menu_sf_functional_tool_real_time_distribution"
-                action="sf_real_time_distribution_of_functional_tools_view_act"
-                parent="menu_sf_tool_manage"
-        />
-
-        <menuitem
-                sequence="6"
-                name="功能刀具出入库"
-                id="menu_sf_function_tool_entry_exit_records"
-                action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
-                parent="menu_sf_tool_manage"
-        />
 
+        <!--  =================计划菜单============== -->
         <menuitem
                 sequence="0"
-                name="功能刀具计划"
+                name="计划"
                 id="menu_sf_function_tool_plan"
                 parent="menu_sf_tool_manage"
         />
 
         <menuitem
                 sequence="10"
+                name="机床换刀申请"
+                id="menu_sf_machine_table_tool_changing_apply"
+                action="sf_machine_table_tool_changing_apply_view_act"
+                parent="menu_sf_function_tool_plan"
+        />
+        <menuitem
+                sequence="20"
                 name="CAM工单程序用刀计划"
                 id="menu_sf_cam_work_order_program_knife_plan"
                 action="sf_cam_work_order_program_knife_plan_view_act"
                 parent="menu_sf_function_tool_plan"
         />
 
+
+        <!--  ================功能菜单=================  -->
         <menuitem
-                sequence="0"
-                name="机床换刀申请"
-                id="menu_sf_machine_table_tool_changing_apply"
-                action="sf_machine_table_tool_changing_apply_view_act"
-                parent="menu_sf_function_tool_plan"
+                sequence="5"
+                name="功能"
+                id="menu_sf_function_tool_function"
+                parent="menu_sf_tool_manage"
         />
 
         <menuitem
-                sequence="4"
+                sequence="10"
                 name="功能刀具组装"
                 id="menu_sf_functional_tool_assembly"
                 action="sf_functional_tool_assembly_view_act"
+                parent="menu_sf_function_tool_function"
+        />
+
+        <menuitem
+                sequence="20"
+                name="功能刀具拆解"
+                id="menu_sf_functional_tool_dismantle"
+                action="sf_functional_tool_dismantle_view_act"
+                parent="menu_sf_function_tool_function"
+        />
+
+
+        <!--  ================功能刀具菜单===============  -->
+        <menuitem
+                sequence="10"
+                name="功能刀具"
+                id="menu_sf_function_tool"
                 parent="menu_sf_tool_manage"
         />
 
         <menuitem
-                sequence="5"
-                name="功能刀具拆解"
-                id="menu_sf_functional_tool_dismantle"
-                action="sf_functional_tool_dismantle_view_act"
+                id="menu_sf_functional_cutting_tool"
+                parent="menu_sf_function_tool"
+                name="功能刀具"
+                sequence="10"
+                action="sf_function_tool_entry_list_view_act"
+        />
+
+        <menuitem
+                id="menu_sf_functional_tool_warning"
+                parent="menu_sf_function_tool"
+                name="功能刀具预警"
+                sequence="20"
+                action="action_sf_functional_tool_warning"
+        />
+
+        <menuitem
+                sequence="30"
+                name="功能刀具出入库"
+                id="menu_sf_function_tool_entry_exit_records"
+                action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
+                parent="menu_sf_function_tool"
+        />
+
+        <menuitem
+                sequence="40"
+                name="功能刀具安全库存"
+                id="menu_sf_functional_tool_real_time_distribution"
+                action="sf_real_time_distribution_of_functional_tools_view_act"
+                parent="menu_sf_function_tool"
+        />
+
+        <!--  ===============刀具物料菜单================  -->
+        <menuitem
+                sequence="15"
+                name="刀具物料"
+                id="menu_sf_tool_material"
                 parent="menu_sf_tool_manage"
         />
 
+        <menuitem
+                sequence="10"
+                name="刀具物料查询"
+                id="menu_sf_tool_material_search"
+                action="action_sf_tool_material_search"
+                parent="menu_sf_tool_material"
+        />
+
     </data>
 </odoo>
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 4e1a6fc4..944decd2 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -792,11 +792,16 @@
             <field name="model">sf.functional.tool.dismantle</field>
             <field name="arch" type="xml">
                 <form>
+                    <header>
+                        <button string="确认拆解" name="confirmation_disassembly" type="object" class="btn-primary"
+                                confirm="是否确认拆解" attrs="{‘invisible': [('state', '=', '已拆解')]}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="待拆解,已拆解"/>
+                    </header>
                     <sheet>
                         <div class="oe_title">
                             <h1>
                                 <field name="functional_tool_id" placeholder="请选择将要拆解的功能刀具"
-                                       options="{'no_create': True}"/>
+                                       options="{'no_create': True}" attrs="{‘readonly': [('state', '=', '已拆解')]}"/>
                             </h1>
                         </div>
                         <field name="_barcode_scanned" widget="barcode_handler"/>
@@ -807,76 +812,103 @@
                                 <field name="tool_groups_id"/>
                                 <field name="diameter"/>
                                 <field name="knife_tip_r_angle"/>
-                                <field name="dismantle_cause" placeholder="请选择拆解原因"/>
                             </group>
                             <group>
                                 <field name="image"/>
                             </group>
                         </group>
+                        <group>
+                            <group>
+                                <group>
+                                    <field name="dismantle_cause" placeholder="请选择拆解原因"/>
+                                </group>
+                                <group>
+                                    <field name="scrap_id"
+                                           attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}"/>
+                                    <field name="grinding_id"
+                                           attrs="{'invisible': [('dismantle_cause', 'not in', ['刀具需磨削'])]}"/>
+                                </group>
+                            </group>
+                        </group>
                         <notebook>
                             <page string="物料组装信息">
-                                <group string="刀柄">
-                                    <group>
-                                        <field name="handle_product_id" string="名称"/>
-                                        <field name="handle_type_id" string="型号"/>
-                                        <field name="handle_brand_id" string="品牌"/>
+                                <group>
+                                    <group string="刀柄" attrs="{'invisible': [('handle_product_id', '=', False)]}">
+                                        <group>
+                                            <field name="handle_product_id" string="名称"/>
+                                            <field name="handle_type_id" string="型号"/>
+                                            <field name="handle_brand_id" string="品牌"/>
+                                        </group>
+                                        <group>
+                                            <field name="handle_rfid" string="Rfid"/>
+                                            <field name="scrap_boolean" string="是否报废"
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}"/>
+                                        </group>
                                     </group>
-                                    <group>
-                                        <field name="handle_rfid" string="Rfid"/>
-                                    </group>
-                                </group>
-                                <group string="整体式刀具">
-                                    <group>
-                                        <field name="integral_product_id" string="名称"/>
-                                        <field name="integral_type_id" string="型号"/>
-                                        <field name="integral_brand_id" string="品牌"/>
-                                    </group>
-                                    <group>
-                                        <field name="integral_freight_barcode" string="目标货位"/>
+                                    <group string="夹头" attrs="{'invisible': [('chuck_product_id', '=', False)]}">
+                                        <group>
+                                            <field name="chuck_product_id" string="名称"/>
+                                            <field name="chuck_type_id" string="型号"/>
+                                            <field name="chuck_brand_id" string="品牌"/>
+                                        </group>
+                                        <group>
+                                            <field name="chuck_freight_id" string="目标货位"
+                                                   options="{'no_create': True,'no_create_edit':True}"
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                        </group>
                                     </group>
                                 </group>
+                                <group attrs="{'invisible': [('integral_product_id', '=', False)]}">
+                                    <group string="整体式刀具">
+                                        <group>
+                                            <field name="integral_product_id" string="名称"/>
+                                            <field name="integral_type_id" string="型号"/>
+                                            <field name="integral_brand_id" string="品牌"/>
+                                        </group>
+                                        <group>
+                                            <field name="integral_freight_id" string="目标货位"
+                                                   options="{'no_create': True,'no_create_edit':True}"
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
 
-                                <group string="刀片">
-                                    <group>
-                                        <field name="blade_product_id" string="名称"/>
-                                        <field name="blade_type_id" string="型号"/>
-                                        <field name="blade_brand_id" string="品牌"/>
-                                    </group>
-                                    <group>
-                                        <field name="blade_freight_barcode" string="目标货位"/>
+                                        </group>
                                     </group>
                                 </group>
-
-                                <group string="刀杆">
-                                    <group>
-                                        <field name="bar_product_id" string="名称"/>
-                                        <field name="bar_type_id" string="型号"/>
-                                        <field name="bar_brand_id" string="品牌"/>
+                                <group>
+                                    <group string="刀片" attrs="{'invisible': [('blade_product_id', '=', False)]}">
+                                        <group>
+                                            <field name="blade_product_id" string="名称"/>
+                                            <field name="blade_type_id" string="型号"/>
+                                            <field name="blade_brand_id" string="品牌"/>
+                                        </group>
+                                        <group>
+                                            <field name="blade_freight_id" string="目标货位"
+                                                   options="{'no_create': True,'no_create_edit':True}"
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                        </group>
                                     </group>
-                                    <group>
-                                        <field name="bar_freight_barcode" string="目标货位"/>
+                                    <group string="刀杆" attrs="{'invisible': [('bar_product_id', '=', False)]}">
+                                        <group>
+                                            <field name="bar_product_id" string="名称"/>
+                                            <field name="bar_type_id" string="型号"/>
+                                            <field name="bar_brand_id" string="品牌"/>
+                                        </group>
+                                        <group>
+                                            <field name="bar_freight_id" string="目标货位"
+                                                   options="{'no_create': True,'no_create_edit':True}"
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                        </group>
                                     </group>
-                                </group>
-
-                                <group string="刀盘">
-                                    <group>
-                                        <field name="pad_product_id" string="名称"/>
-                                        <field name="pad_type_id" string="型号"/>
-                                        <field name="pad_brand_id" string="品牌"/>
-                                    </group>
-                                    <group>
-                                        <field name="pad_freight_barcode" string="目标货位"/>
-                                    </group>
-                                </group>
-
-                                <group string="夹头">
-                                    <group>
-                                        <field name="chuck_product_id" string="名称"/>
-                                        <field name="chuck_type_id" string="型号"/>
-                                        <field name="chuck_brand_id" string="品牌"/>
-                                    </group>
-                                    <group>
-                                        <field name="chuck_freight_barcode" string="目标货位"/>
+                                    <group string="刀盘" attrs="{'invisible': [('pad_product_id', '=', False)]}">
+                                        <group>
+                                            <field name="pad_product_id" string="名称"/>
+                                            <field name="pad_type_id" string="型号"/>
+                                            <field name="pad_brand_id" string="品牌"/>
+                                        </group>
+                                        <group>
+                                            <field name="pad_freight_id" string="目标货位"
+                                                   options="{'no_create': True,'no_create_edit':True}"
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                        </group>
                                     </group>
                                 </group>
                             </page>
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index ee63ba26..d4772244 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -94,12 +94,5 @@
             <field name="res_model">sf.tool.material.search</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem
-                sequence="20"
-                name="刀具物料查询"
-                id="menu_sf_tool_material_search"
-                action="action_sf_tool_material_search"
-                parent="menu_sf_tool_manage"
-        />
     </data>
 </odoo>

From 9a157125ba0c61db47871bd770bd1679f0cded99 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 22 Apr 2024 22:30:05 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=98=E5=8C=96agv=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=AF=B9=E5=BA=94=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py              |   1 +
 sf_manufacturing/controllers/controllers.py   |  22 +++---
 sf_manufacturing/controllers/workpiece.py     |   2 +-
 sf_manufacturing/models/__init__.py           |   1 +
 sf_manufacturing/models/agv_setting.py        |  35 +++++++++
 sf_manufacturing/models/mrp_workorder.py      |  67 ++++++++++--------
 sf_manufacturing/models/product_template.py   |   4 +-
 sf_manufacturing/security/img.png             | Bin 0 -> 14518 bytes
 sf_manufacturing/security/ir.model.access.csv |   5 +-
 sf_manufacturing/views/agv_setting_views.xml  |  59 +++++++++++++++
 sf_manufacturing/views/mrp_workorder_view.xml |  39 +++++-----
 .../wizard/workpiece_delivery_views.xml       |  14 ++--
 .../wizard/workpiece_delivery_wizard.py       |   3 +-
 sf_mrs_connect/models/res_config_setting.py   |  31 ++------
 sf_mrs_connect/security/ir.model.access.csv   |   1 -
 .../views/res_config_settings_views.xml       |  42 ++++-------
 sf_sale/models/quick_easy_order.py            |   4 +-
 sf_sale/models/quick_easy_order_old.py        |   4 +-
 sf_sale/security/ir.model.access.csv          |   4 +-
 sf_sale/views/quick_easy_order_view.xml       |  10 +--
 20 files changed, 213 insertions(+), 135 deletions(-)
 create mode 100644 sf_manufacturing/models/agv_setting.py
 create mode 100644 sf_manufacturing/security/img.png
 create mode 100644 sf_manufacturing/views/agv_setting_views.xml

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 6a122097..1c49c88b 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -24,6 +24,7 @@
         'views/mrp_workcenter_views.xml',
         'views/mrp_workorder_view.xml',
         'views/model_type_view.xml',
+        'views/agv_setting_views.xml',
         'views/sf_maintenance_equipment.xml',
 
     ],
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 2cb6c2df..b9cef58e 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -431,12 +431,12 @@ class Manufacturing_Connect(http.Controller):
             if 'DeviceId' in ret:
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                    [('feeder_station_destination', '=', ret['DeviceId'])])
+                    [('feeder_station_start_id.name', '=', ret['DeviceId']),
+                     ('status', '=', '待配送')], limit=1, order='id asc')
                 if workpiece_delivery:
                     for wd in workpiece_delivery:
-                        logging.info('wd.workorder_id:%s' % wd.workorder_id.name)
+                        logging.info('wd.production_id:%s' % wd.production_id.name)
                         if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '待上产线':
-                            logging.info('wd.production_id:%s' % wd.production_id.name)
                             logging.info('wd.production_line_state:%s' % wd.production_id.production_line_state)
                             wd.production_id.write({'production_line_state': '已上产线'})
                             wd.write({'production_line_state': '已上产线'})
@@ -466,20 +466,20 @@ class Manufacturing_Connect(http.Controller):
             if 'DeviceId' in ret:
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                    [('feeder_station_destination', '=', ret['DeviceId'])])
+                    [('feeder_station_destination_id.name', '=', ret['DeviceId']),
+                     ('status', '=', '待配送')], limit=1, order='id asc')
                 if workpiece_delivery:
                     for wd in workpiece_delivery:
-                        logging.info('wd.workorder_id:%s' % wd.workorder_id.name)
+                        logging.info('wd.production_id:%s' % wd.production_id.name)
                         if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '已上产线':
-                            logging.info('wd.production_id:%s' % wd.production_id.name)
                             logging.info('wd.production_line_state:%s' % wd.production_id.production_line_state)
-                            workpiece_delivery_off=request.env['sf.workpiece.delivery'].create({
+                            workpiece_delivery_off = request.env['sf.workpiece.delivery'].sudo().create({
                                 'production_id': wd.production_id.id,
-                                'feeder_station_start': ret['DeviceId'],
-                                'feeder_station_destination': '',
-                                'workorder_id': workpiece_delivery.workorder_id,
+                                'feeder_station_start_id': workpiece_delivery.feeder_station_start_id.id,
+                                'feeder_station_destination_id': '',
+                                'workorder_id': workpiece_delivery.workorder_id.id,
                                 'workpiece_code': workpiece_delivery.workpiece_code,
-                                'production_line_id': workpiece_delivery.production_line_id,
+                                'production_line_id': workpiece_delivery.production_line_id.id,
                                 'task_delivery_time': datetime.now(),
                                 'production_line_state': '已下产线'
                             })
diff --git a/sf_manufacturing/controllers/workpiece.py b/sf_manufacturing/controllers/workpiece.py
index e2f60421..fcdcf606 100644
--- a/sf_manufacturing/controllers/workpiece.py
+++ b/sf_manufacturing/controllers/workpiece.py
@@ -25,7 +25,7 @@ class Workpiece(http.Controller):
                 if 'method' in ret:
                     if ret['method'] == 'end':
                         workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                            [('production_id.name', '=', ret['reqCode'])])
+                            [('production_id.name', '=', ret['reqCode']), ('agv_task_code'), '=', ret['taskCode']])
                         if workpiece_delivery:
                             workpiece_delivery.write({'status': '已配送', 'task_completion_time': ret['reqTime']})
                         else:
diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 3ca83b27..3de23ef3 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -8,3 +8,4 @@ from . import mrp_routing_workcenter
 from . import stock
 from . import res_user
 from . import production_line_base
+from . import agv_setting
diff --git a/sf_manufacturing/models/agv_setting.py b/sf_manufacturing/models/agv_setting.py
new file mode 100644
index 00000000..22c486d1
--- /dev/null
+++ b/sf_manufacturing/models/agv_setting.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from odoo import fields, models
+
+
+class AgvSetting(models.Model):
+    _name = 'sf.agv.site'
+    _description = 'agv站点'
+
+    number = fields.Integer('序号')
+    name = fields.Char('位置编号')
+    owning_region = fields.Char('所属区域')
+    state = fields.Selection([
+        ('占用', '占用'),
+        ('空闲', '空闲')], string='状态')
+    divide_the_work = fields.Char('主要分工')
+
+
+class AgvTaskRoute(models.Model):
+    _name = 'sf.agv.task.route'
+    _description = 'agv任务路线'
+
+    name = fields.Char('名称')
+    type = fields.Selection([
+        ('F01', '搬运'), ], string='类型', default="F01")
+    start_site_id = fields.Many2one('sf.agv.site', '起点接驳站位置编号')
+    end_site_id = fields.Many2one('sf.agv.site', '终点接驳站位置编号')
+    destination_production_line_id = fields.Many2one('sf.production.line', '目的生产线')
+    priority = fields.Selection([
+        ('0', '正常'),
+        ('1', '低'),
+        ('2', '中'),
+        ('3', '高'),
+        ('4', '紧急'),
+    ], string='优先级', default='0')
+    active = fields.Boolean('有效', default=True)
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 14471baf..32dbb220 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -397,8 +397,8 @@ class ResMrpWorkOrder(models.Model):
     def button_workpiece_delivery(self):
         if self.routing_type == '装夹预调':
             for item in self.workpiece_delivery_ids:
-                if not item.feeder_station_start:
-                    raise UserError('【工件配送】明细中请输入起点接驳站')
+                if not item.route_id:
+                    raise UserError('【工件配送】明细中请选择【任务路线】')
                 # if not item.workpiece_code:
                 #     raise UserError('请对【同运工件】进行扫描')
                 else:
@@ -1079,8 +1079,9 @@ class WorkPieceDelivery(models.Model):
                                          store=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间', readonly=True)
     workpiece_code = fields.Char('同运工件编码')
-    feeder_station_start = fields.Char('起点接驳站')
-    feeder_station_destination = fields.Char('目的接驳站')
+    route_id = fields.Many2one('sf.agv.task.route', '任务路线')
+    feeder_station_start_id = fields.Many2one('sf.agv.site', '起点接驳站')
+    feeder_station_destination_id = fields.Many2one('sf.agv.site', '目的接驳站')
     task_delivery_time = fields.Datetime('任务下发时间')
     task_completion_time = fields.Datetime('任务完成时间')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
@@ -1092,41 +1093,49 @@ class WorkPieceDelivery(models.Model):
         string='上/下产线', default='待上产线')
     cnc_program_down_state = fields.Selection([('待下发', '待下发'), ('已下发', '已下发')],
                                               string='CNC程序下发状态', default='待下发')
+    agv_task_code = fields.Char('agv任务单号')
+
+    @api.onchange('route_id')
+    def onchage_route(self):
+        if self.route_id:
+            self.feeder_station_start_id = self.route_id.start_site_id
+            self.feeder_station_destination_id = self.route_id.end_site_id
 
     # 工件配送
     def button_delivery(self):
         if self.cnc_program_down_state == '待下发':
-            if self.status == '待下发':
-                return {
-                    'name': _('确认'),
-                    'type': 'ir.actions.act_window',
-                    'view_mode': 'form',
-                    'res_model': 'sf.workpiece.delivery.wizard',
-                    'target': 'new',
-                    'context': {
-                        'default_delivery_id': self.id,
-                    }}
+            if self.route_id:
+                if self.status == '待下发':
+                    return {
+                        'name': _('确认'),
+                        'type': 'ir.actions.act_window',
+                        'view_mode': 'form',
+                        'res_model': 'sf.workpiece.delivery.wizard',
+                        'target': 'new',
+                        'context': {
+                            'default_delivery_id': self.id,
+                        }}
+                else:
+                    raise UserError('状态为【待下发】的工件记录可进行配送')
             else:
-                raise UserError('状态为【待下发】的工件记录可进行配送')
+                raise UserError('请选择任务路线再进行配送')
         else:
             raise UserError(_("该制造订单还未下发CNC程序单,无法进行工件配送"))
 
     # 配送至avg小车
     def _delivery_avg(self):
         config = self.env['res.config.settings'].get_values()
-        site_production_line = False
-        if self.production_line_state == '待上产线':
-            site_production_line = [('production_line_status', '=', '已上产线')]
-        elif self.production_line_state == '已下产线':
-            site_production_line = [('production_line_status', '=', '已下产线')]
-        agv_site = self.env['res.agv.site'].search(site_production_line, order="number asc")
         positionCode_Arr = []
-        if agv_site:
-            for item in agv_site:
-                positionCode_Arr.append({
-                    'positionCode': item.content,
-                    'code': item.type
-                })
+        if self.feeder_station_start_id:
+            positionCode_Arr.append({
+                'positionCode': self.feeder_station_start_id.name,
+                'code': '00'
+            })
+        if self.feeder_station_destination_id:
+            positionCode_Arr.append({
+                'positionCode': self.feeder_station_destination_id.name,
+                'code': '00'
+            })
         res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '',
                'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': config['wbcode'],
                'positionCodePath': positionCode_Arr,
@@ -1137,14 +1146,14 @@ class WorkPieceDelivery(models.Model):
             config['agv_rcs_url'] = 'http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask'
             logging.info('AGV请求路径:%s' % config['agv_rcs_url'])
             logging.info('AGV-json:%s' % res)
-
             headers = {'Content-Type': 'application/json'}
             ret = requests.post((config['agv_rcs_url']), json=res, headers=headers)
             ret = ret.json()
             logging.info('config-ret:%s' % ret)
             if ret['code'] == 0:
                 if self.production_id.name == ret['reqCode']:
-                    self.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+                    self.write(
+                        {'task_delivery_time': fields.Datetime.now(), 'status': '待配送', 'agv_task_code': ret['data']})
             else:
                 raise UserError(ret['message'])
         except Exception as e:
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 16ea429a..d766629c 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/security/img.png b/sf_manufacturing/security/img.png
new file mode 100644
index 0000000000000000000000000000000000000000..130affd59bc6f1ecbd54ac13e43bf35709c13318
GIT binary patch
literal 14518
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

literal 0
HcmV?d00001

diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 8272af30..e8c2449c 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -129,4 +129,7 @@ access_sf_cmm_program_group_plan_dispatch,sf_cmm_program_group_plan_dispatch,mod
 access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
 
-access_sf_workpiece_delivery_group_plan_dispatch,sf.workpiece.delivery,sf_manufacturing.model_sf_workpiece_delivery,sf_base.group_plan_dispatch,1,0,0,0
\ No newline at end of file
+access_sf_workpiece_delivery_group_plan_dispatch,sf.workpiece.delivery,sf_manufacturing.model_sf_workpiece_delivery,sf_base.group_plan_dispatch,1,0,0,0
+
+access_sf_agv_site_group_sf_order_user,sf_agv_site_group_sf_order_user,model_sf_agv_site,sf_base.group_sf_order_user,1,1,1,0
+access_sf_agv_task_route_group_sf_order_user,sf_agv_task_route_group_sf_order_user,model_sf_agv_task_route,sf_base.group_sf_order_user,1,1,1,0
\ No newline at end of file
diff --git a/sf_manufacturing/views/agv_setting_views.xml b/sf_manufacturing/views/agv_setting_views.xml
new file mode 100644
index 00000000..dea85e6a
--- /dev/null
+++ b/sf_manufacturing/views/agv_setting_views.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!--  agv站点 -->
+        <record id="view_agv_site_tree" model="ir.ui.view">
+            <field name="name">agv站点</field>
+            <field name="model">sf.agv.site</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="number" required="1"/>
+                    <field name="name" required="1"/>
+                    <field name="owning_region" required="1"/>
+                    <field name="state" required="1"/>
+                    <field name="divide_the_work" required="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_agv_site_form" model="ir.actions.act_window">
+            <field name="name">AGV站点</field>
+            <field name="res_model">sf.agv.site</field>
+            <field name="view_mode">tree</field>
+        </record>
+
+        <menuitem id="menu_action_agv_site"
+                  parent="sf_base.menu_sf_base"
+                  name="AGV站点"
+                  sequence="12"
+                  action="action_agv_site_form"/>
+
+        <!--  agv任务路线 -->
+        <record id="view_agv_task_route_tree" model="ir.ui.view">
+            <field name="name">AGV任务路线</field>
+            <field name="model">sf.agv.task.route</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="name" required="1"/>
+                    <field name="type" readonly="1"/>
+                    <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/>
+                    <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
+                    <field name="destination_production_line_id" required="1" options="{'no_create': True}"/>
+                    <field name="priority" widget="priority"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_agv_task_route_form" model="ir.actions.act_window">
+            <field name="name">AGV任务路线</field>
+            <field name="res_model">sf.agv.task.route</field>
+            <field name="view_mode">tree</field>
+        </record>
+
+        <menuitem id="menu_action_agv_task_route"
+                  parent="sf_base.menu_sf_base"
+                  name="AGV任务路线"
+                  sequence="13"
+                  action="action_agv_task_route_form"/>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 65fbd973..0cc541e7 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -210,12 +210,12 @@
                         <field name="programming_state" readonly="1"
                                attrs='{"invisible": [("programming_no","=",False)]}'/>
                     </group>
-<!--                    <group>-->
-<!--                        <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">-->
-<!--                            <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"-->
-<!--                            />-->
-<!--                        </div>-->
-<!--                    </group>-->
+                    <!--                    <group>-->
+                    <!--                        <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">-->
+                    <!--                            <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"-->
+                    <!--                            />-->
+                    <!--                        </div>-->
+                    <!--                    </group>-->
                 </page>
             </xpath>
             <!--            <page string="Components" name="components">-->
@@ -425,8 +425,9 @@
                         <tree editable="bottom">
                             <field name="production_id" invisible="1"/>
                             <field name="workpiece_code"/>
-                            <field name="feeder_station_start" force_save="1"/>
-                            <field name="feeder_station_destination" force_save="1"/>
+                            <field name="route_id" options="{'no_create': True}"/>
+                            <field name="feeder_station_start_id" readonly="1" force_save="1"/>
+                            <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
                             <field name="cnc_program_down_state" readonly="1"/>
                             <field name="production_line_id"/>
                             <field name="task_delivery_time" readonly="1"/>
@@ -526,7 +527,8 @@
                 <field name="is_ok"/>
                 <field name="processing_user_id"/>
                 <field name="inspection_user_id"/>
-                <field name="save_name" widget="CopyClipboardChar" attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
+                <field name="save_name" widget="CopyClipboardChar"
+                       attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
             </xpath>
         </field>
     </record>
@@ -557,7 +559,7 @@
         <field name="name">工件配送</field>
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
-            <tree string="工件配送">
+            <tree string="工件配送" editable="bottom" class="center" create="0" delete="0">
                 <header>
                     <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
                 </header>
@@ -567,12 +569,13 @@
                        decoration-danger="status == '待配送'"/>
                 <field name="production_id" string="工件编码"/>
                 <field name="workpiece_code"/>
-                <field name="production_line_id"/>
-                <field name="feeder_station_start"/>
-                <field name="feeder_station_destination"/>
-                <field name="cnc_program_down_state"/>
-                <field name="task_delivery_time"/>
-                <field name="task_completion_time"/>
+                <field name="production_line_id" options="{'no_create': True}"/>
+                <field name="route_id" options="{'no_create': True}"/>
+                <field name="feeder_station_start_id" readonly="1" force_save="1"/>
+                <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
+                <field name="cnc_program_down_state" readonly="1"/>
+                <field name="task_delivery_time" readonly="1"/>
+                <field name="task_completion_time" readonly="1"/>
                 <field name="delivery_duration" widget="float_time"/>
             </tree>
         </field>
@@ -585,10 +588,10 @@
             <search string="工件配送">
                 <field name="production_id"/>
                 <field name="workpiece_code"/>
-                <field name="feeder_station_start"/>
+                <field name="feeder_station_start_id"/>
                 <field name="production_line_id"/>
                 <field name="task_delivery_time"/>
-                <field name="feeder_station_destination"/>
+                <field name="feeder_station_destination_id"/>
                 <field name="task_completion_time"/>
                 <field name="delivery_duration"/>
                 <field name="status"/>
diff --git a/sf_manufacturing/wizard/workpiece_delivery_views.xml b/sf_manufacturing/wizard/workpiece_delivery_views.xml
index 49e80d52..34625878 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_views.xml
+++ b/sf_manufacturing/wizard/workpiece_delivery_views.xml
@@ -5,14 +5,18 @@
         <field name="model">sf.workpiece.delivery.wizard</field>
         <field name="arch" type="xml">
             <form>
-                <field name="delivery_id" invisible="True"/>
-                <field name="workorder_id" invisible="True"/>
-
+                <group>
+                    <field name="delivery_id" invisible="True"/>
+                    <field name="workorder_id" invisible="True"/>
+                    <field name="route_id" required="1" options="{'no_create': True}"/>
+                </group>
                 <div>
-                    是否确定配送？
+                    <field name="is_ok"/>
+                    确认上述信息正确无误.
                 </div>
                 <footer>
-                    <button string="确认" name="confirm" type="object" class="oe_highlight"/>
+                    <button string="确认配送" name="confirm" type="object" class="oe_highlight"
+                            attrs="{'invisible':[('is_ok','=',False)]}"/>
                     <button string="取消" class="btn btn-secondary" special="cancel"/>
                 </footer>
             </form>
diff --git a/sf_manufacturing/wizard/workpiece_delivery_wizard.py b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
index 7101410d..1de3e84c 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_wizard.py
+++ b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
@@ -11,10 +11,11 @@ class WorkpieceDeliveryWizard(models.TransientModel):
 
     delivery_id = fields.Many2one('sf.workpiece.delivery', string='配送')
     workorder_id = fields.Many2one('mrp.workorder', string='工单')
+    route_id = fields.Many2one('sf.agv.task.route', '任务路线')
+    is_ok = fields.Boolean('确认上述信息正确无误.')
 
     def confirm(self):
         if self.workorder_id:
             self.workorder_id.workpiece_delivery_ids._delivery_avg()
         else:
             self.delivery_id._delivery_avg()
-
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 3f109cbe..ef2d93d8 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -15,6 +15,8 @@ class ResConfigSettings(models.TransientModel):
     sf_url = fields.Char(string='访问地址', default='https://sf.cs.jikimo.com')
     agv_rcs_url = fields.Char(string='avg_rcs访问地址',
                               default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
+    center_control_url = fields.Char(string='中控访问地址',
+                                     default='http://172.16.21.50:8001')
     wbcode = fields.Char('地码')
     agv_code = fields.Char(string='agv编号')
     task_type_no = fields.Char('任务单类型编号')
@@ -99,7 +101,7 @@ class ResConfigSettings(models.TransientModel):
         agv_rcs_url = config.get_param('agv_rcs_url', default='')
         wbcode = config.get_param('wbcode', default='')
         agv_code = config.get_param('agv_code', default='')
-        task_type_no = config.get_param('task_type_no', default='')
+        center_control_url = config.get_param('center_control_url', default='')
         ftp_host = config.get_param('ftp_host', default='')
         ftp_port = config.get_param('ftp_port', default='')
         ftp_user = config.get_param('ftp_user', default='')
@@ -112,7 +114,7 @@ class ResConfigSettings(models.TransientModel):
             agv_rcs_url=agv_rcs_url,
             wbcode=wbcode,
             agv_code=agv_code,
-            task_type_no=task_type_no,
+            center_control_url=center_control_url,
             ftp_host=ftp_host,
             ftp_port=ftp_port,
             ftp_user=ftp_user,
@@ -129,31 +131,8 @@ class ResConfigSettings(models.TransientModel):
         ir_config.set_param("agv_rcs_url", self.agv_rcs_url or "")
         ir_config.set_param("wbcode", self.wbcode or "")
         ir_config.set_param("agv_code", self.agv_code or "")
-        ir_config.set_param("task_type_no", self.task_type_no or "")
+        ir_config.set_param("center_control_url", self.center_control_url or "")
         ir_config.set_param("ftp_host", self.ftp_host or "")
         ir_config.set_param("ftp_port", self.ftp_port or "")
         ir_config.set_param("ftp_user", self.ftp_user or "")
         ir_config.set_param("ftp_password", self.ftp_password or "")
-
-
-class ResAgvSite(models.Model):
-    _name = 'res.agv.site'
-    _description = 'agv站点'
-
-    number = fields.Integer('编号')
-    type = fields.Selection([('00', '位置编号'), ('01', '库区编号'), ('02', '货架编号')], '类型')
-    content = fields.Char('内容')
-    site_prop = fields.Selection([('上产线', '上产线'), ('下产线', '下产线')], '属性')
-    state_status = fields.Selection([('占用', '占用'), ('空闲', '空闲')], '状态')
-    # remark = fields.Char
-    active = fields.Boolean('有效', default=True)
-
-    # @api.model
-    # def create(self, vals):
-    #     if vals.get('number', 'new') == 'new':
-    #         vals['number'] = self.env['ir.sequence'].next_by_code('res.agv.site') or '/'
-    #     return super(ResAgvSite, self).create(vals)
-
-    def unlink(self):
-        for item in self:
-            item.active == True
diff --git a/sf_mrs_connect/security/ir.model.access.csv b/sf_mrs_connect/security/ir.model.access.csv
index f512ec84..0ed43a62 100644
--- a/sf_mrs_connect/security/ir.model.access.csv
+++ b/sf_mrs_connect/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_static_resource_datasync,sf_static_resource_datasync,model_sf_static_resource_datasync,base.group_user,1,1,1,1
-access_res_agv_site,access_res_agv_site,model_res_agv_site,base.group_system,1,1,1,1
 
 
 
diff --git a/sf_mrs_connect/views/res_config_settings_views.xml b/sf_mrs_connect/views/res_config_settings_views.xml
index 0a60df0a..0d1ccc3e 100644
--- a/sf_mrs_connect/views/res_config_settings_views.xml
+++ b/sf_mrs_connect/views/res_config_settings_views.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="view_agv_site_tree" model="ir.ui.view">
-            <field name="name">agv站点集合</field>
-            <field name="model">res.agv.site</field>
-            <field name="arch" type="xml">
-                <tree editable="bottom">
-                    <field name="number"/>
-                    <field name="type"/>
-                    <field name="content"/>
-                    <field name="state_status"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_agv_site_form" model="ir.actions.act_window">
-            <field name="name">站点集合</field>
-            <field name="res_model">res.agv.site</field>
-            <field name="view_mode">tree</field>
-        </record>
-        <menuitem id="menu_action_agv_site_form" action="sf_mrs_connect.action_agv_site_form" name="站点集合"
-                  sequence="11"/>
-
-
         <record id="res_config_settings_view_form_sf_sync" model="ir.ui.view">
             <field name="name">res.config.settings.view.form.inherit.sf_sync</field>
             <field name="model">res.config.settings</field>
@@ -106,10 +84,6 @@
                                         <label for="agv_rcs_url" string="访问地址"/>
                                         <field name="agv_rcs_url"/>
                                     </div>
-                                    <div class="text-muted">
-                                        <label for="task_type_no"/>
-                                        <field name="task_type_no"/>
-                                    </div>
                                     <div class="text-muted">
                                         <label for="agv_code" string="车辆编号"/>
                                         <field name="agv_code"/>
@@ -118,9 +92,19 @@
                                         <label for="wbcode"/>
                                         <field name="wbcode"/>
                                     </div>
-                                    <div class="mt8">
-                                        <button type="action" name="%(sf_mrs_connect.action_agv_site_form)d"
-                                                string="站点集合" class="btn-link" icon="fa-arrow-right"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <h2>中控参数配置</h2>
+                        <div class="row mt16 o_settings_container">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                <div class="o_setting_right_pane">
+                                    <div class="text-muted">
+                                        <label for="center_control_url" string="访问地址"/>
+                                        <field name="center_control_url"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 1ece6b86..ed52d9de 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 724d4369..24bf5738 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv
index 290829df..451396e3 100644
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_quick_easy_order,quick_easy_order,model_quick_easy_order,base.group_system,1,1,1,0
-access_quick_easy_order_group_sale_salemanager,quick_easy_order_group_sale_salemanager,model_quick_easy_order,sf_base.group_sale_salemanager,1,0,1,0
-access_quick_easy_order_group_sale_director,quick_easy_order_group_sale_director,model_quick_easy_order,sf_base.group_sale_director,1,0,1,0
+access_quick_easy_order_group_sale_salemanager,quick_easy_order_group_sale_salemanager,model_quick_easy_order,sf_base.group_sale_salemanager,1,1,1,0
+access_quick_easy_order_group_sale_director,quick_easy_order_group_sale_director,model_quick_easy_order,sf_base.group_sale_director,1,1,1,0
 access_sf_auto_quatotion_common,sf_auto_quatotion_common,model_sf_auto_quatotion_common,base.group_system,1,1,1,1
 access_sale_order_manager,sale_order_manager,model_sale_order,sf_base.group_sale_salemanager,1,1,1,0
 access_sale_order_director,sale_order_director,model_sale_order,sf_base.group_sale_director,1,1,1,0
diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index abc574b0..3038b987 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -48,7 +48,7 @@
                         <group>
                             <group>
                                 <field name="customer_id" context="{'is_customer': True }"
-                                       options="{'no_create': True}"/>
+                                       options="{'no_create': True}" required="1"/>
                                 <field name="upload_model_file" widget="many2many_binary"/>
                                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                                        attrs="{'invisible': [('model_file', '=', False)]}"/>
@@ -68,12 +68,12 @@
                                 </div>
                                 <field name="model_volume" attrs="{'invisible': [('model_file', '=', False)]}"
                                        options="{'format': false}"/>
-                                <field name="material_id" options="{'no_create': True}"/>
-                                <field name="material_model_id" options="{'no_create': True}"/>
+                                <field name="material_id" options="{'no_create': True}" required="1"/>
+                                <field name="material_model_id" options="{'no_create': True}" required="1"/>
                                 <!--                                <field name="process_id"/>-->
                                 <field name="parameter_ids" widget="many2many_tags" string="表面工艺参数"
-                                       options="{'no_create': True}"/>
-                                <field name="machining_precision"/>
+                                       options="{'no_create': True}" required="1"/>
+                                <field name="machining_precision" required="1"/>
                                 <field name="processing_time"/>
                                 <field name="quantity" options="{'format': false}"/>
                                 <field name="unit_price"/>

From 4e94b8b4c8a20be300ff388dbf5844304e2cd1dd Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 23 Apr 2024 09:54:44 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 32dbb220..ab520434 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -902,7 +902,7 @@ class CNCprocessing(models.Model):
     # 将FTP的nc文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
         remotepath = os.path.join('/NC', production_no, 'return', processing_panel)
-        serverdir = os.pat.join('/tmp', production_no, 'return', processing_panel)
+        serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])

From 307e052740fc030efdabe01185210c97095489c3 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 23 Apr 2024 14:05:10 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96agv=E5=8F=8A=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=BD=AE=E5=92=8C=E5=AF=B9=E5=BA=94=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py   |  20 +-
 sf_manufacturing/controllers/workpiece.py     |   5 +
 sf_manufacturing/models/agv_setting.py        |  19 +
 sf_manufacturing/models/mrp_workorder.py      | 703 +++++++++---------
 sf_manufacturing/models/product_template.py   |   4 +-
 .../wizard/workpiece_delivery_views.xml       |  11 +-
 .../wizard/workpiece_delivery_wizard.py       |   2 -
 sf_mrs_connect/models/res_config_setting.py   |   4 +
 .../views/res_config_settings_views.xml       |   4 +
 sf_sale/models/quick_easy_order.py            |   4 +-
 sf_sale/models/quick_easy_order_old.py        |   4 +-
 .../models/maintenance_equipment.py           |  10 +-
 12 files changed, 411 insertions(+), 379 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index b9cef58e..bbd9cac9 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -432,7 +432,7 @@ class Manufacturing_Connect(http.Controller):
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
                     [('feeder_station_start_id.name', '=', ret['DeviceId']),
-                     ('status', '=', '待配送')], limit=1, order='id asc')
+                     ('status', '=', '已配送'), ('type', '=', '上产线')], order='id asc')
                 if workpiece_delivery:
                     for wd in workpiece_delivery:
                         logging.info('wd.production_id:%s' % wd.production_id.name)
@@ -441,7 +441,7 @@ class Manufacturing_Connect(http.Controller):
                             wd.production_id.write({'production_line_state': '已上产线'})
                             wd.write({'production_line_state': '已上产线'})
                 else:
-                    res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该DeviceId没有对应的工件配送数据'}
+                    res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该DeviceId没有对应的已配送工件数据'}
             else:
                 res = {'Succeed': False, 'ErrorCode': 201, 'Error': '未传DeviceId字段'}
         except Exception as e:
@@ -466,26 +466,16 @@ class Manufacturing_Connect(http.Controller):
             if 'DeviceId' in ret:
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                    [('feeder_station_destination_id.name', '=', ret['DeviceId']),
-                     ('status', '=', '待配送')], limit=1, order='id asc')
+                    [('feeder_station_start_id.name', '=', ret['DeviceId']),
+                     ('status', '=', '已配送'), ('type', '=', '上产线')], order='id asc')
                 if workpiece_delivery:
                     for wd in workpiece_delivery:
                         logging.info('wd.production_id:%s' % wd.production_id.name)
                         if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '已上产线':
                             logging.info('wd.production_line_state:%s' % wd.production_id.production_line_state)
-                            workpiece_delivery_off = request.env['sf.workpiece.delivery'].sudo().create({
-                                'production_id': wd.production_id.id,
-                                'feeder_station_start_id': workpiece_delivery.feeder_station_start_id.id,
-                                'feeder_station_destination_id': '',
-                                'workorder_id': workpiece_delivery.workorder_id.id,
-                                'workpiece_code': workpiece_delivery.workpiece_code,
-                                'production_line_id': workpiece_delivery.production_line_id.id,
-                                'task_delivery_time': datetime.now(),
-                                'production_line_state': '已下产线'
-                            })
                             wd.production_id.write({'production_line_state': '已下产线'})
                             logging.info('开始向agv下发下产线任务')
-                            workpiece_delivery_off._delivery_avg()
+                            wd._delivery_avg()
                             logging.info('agv下发下产线任务已配送')
 
                 else:
diff --git a/sf_manufacturing/controllers/workpiece.py b/sf_manufacturing/controllers/workpiece.py
index fcdcf606..775da5a0 100644
--- a/sf_manufacturing/controllers/workpiece.py
+++ b/sf_manufacturing/controllers/workpiece.py
@@ -28,6 +28,11 @@ class Workpiece(http.Controller):
                             [('production_id.name', '=', ret['reqCode']), ('agv_task_code'), '=', ret['taskCode']])
                         if workpiece_delivery:
                             workpiece_delivery.write({'status': '已配送', 'task_completion_time': ret['reqTime']})
+                            if workpiece_delivery.type == '下产线':
+                                workpiece_delivery_clear = request.env['sf.workpiece.delivery'].sudo().search(
+                                    [('production_id.name', '=', ret['reqCode']), ('type', '=', '运送空料架')])
+                                if workpiece_delivery_clear:
+                                    workpiece_delivery_clear._delivery_avg()
                         else:
                             res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该reqCode暂未查到对应的工件配送记录'}
                 else:
diff --git a/sf_manufacturing/models/agv_setting.py b/sf_manufacturing/models/agv_setting.py
index 22c486d1..70075285 100644
--- a/sf_manufacturing/models/agv_setting.py
+++ b/sf_manufacturing/models/agv_setting.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import requests
+import logging
 from odoo import fields, models
 
 
@@ -13,6 +15,23 @@ class AgvSetting(models.Model):
         ('占用', '占用'),
         ('空闲', '空闲')], string='状态')
     divide_the_work = fields.Char('主要分工')
+    active = fields.Boolean('有效', default=True)
+
+    def update_site_state(self):
+        # 调取中控的接驳站接口并修改对应站点的状态
+        config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+        headers = {'Authorization': config['center_control_Authorization']}
+        center_control_url = config['center_control_url'] + "/AutoDeviceApi/GetAgvStationState"
+        center_control_r = requests.get(center_control_url, params={}, headers=headers)
+        ret = center_control_r.json()
+        logging.info('工件配送-请求中控站点信息:%s' % ret)
+        datas = ret['Datas']
+        for item in self:
+            for da in datas:
+                if da['DeviceId'] == item.name:
+                    if da['AtHome'] is True:
+                        item.state = '占用'
 
 
 class AgvTaskRoute(models.Model):
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index ab520434..2184e7d1 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -458,360 +458,376 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_finished': False,
             'duration_expected': duration_expected,
             'duration': 0,
-            'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self.env[
-                'sf.workpiece.delivery'].create(
-                {'production_id': production.id})
+            'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list(
+                production)
         }]
         return workorders_values_str
 
-    # 拼接工单对象属性值(表面工艺)
-    def _json_workorder_surface_process_str(self, production, route, process_parameter, supplier_id):
-        workorders_values_str = [0, '', {
-            'product_uom_id': production.product_uom_id.id,
-            'qty_producing': 0,
-            'operation_id': False,
-            'name': '%s-%s' % (route.name, process_parameter.name),
-            'processing_panel': '',
-            'routing_type': '表面工艺',
-            'surface_technics_parameters_id': process_parameter.id,
-            'work_state': '',
-            'supplier_id': supplier_id,
-            'is_subcontract': True if process_parameter.gain_way == '外协' else False,
-            'workcenter_id': self.env[
-                'mrp.workcenter'].get_process_outsourcing_workcenter() if process_parameter.gain_way == '外协' else
-            self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
-                                                              route.routing_type,
-                                                              production.product_id),
-            'date_planned_start': False,
-            'date_planned_finished': False,
-            'duration_expected': 60,
-            'duration': 0
-        }]
-        return workorders_values_str
+    def _json_workpiece_delivery_list(self, production):
+        return [
+            [0, '', {'production_id': production.id, 'type': '上产线'}],
+            [0, '', {'production_id': production.id, 'type': '下产线'}],
+            [0, '', {'production_id': production.id, 'type': '运送空料架'}],
+        ]
+
+
+# 拼接工单对象属性值(表面工艺)
+def _json_workorder_surface_process_str(self, production, route, process_parameter, supplier_id):
+    workorders_values_str = [0, '', {
+        'product_uom_id': production.product_uom_id.id,
+        'qty_producing': 0,
+        'operation_id': False,
+        'name': '%s-%s' % (route.name, process_parameter.name),
+        'processing_panel': '',
+        'routing_type': '表面工艺',
+        'surface_technics_parameters_id': process_parameter.id,
+        'work_state': '',
+        'supplier_id': supplier_id,
+        'is_subcontract': True if process_parameter.gain_way == '外协' else False,
+        'workcenter_id': self.env[
+            'mrp.workcenter'].get_process_outsourcing_workcenter() if process_parameter.gain_way == '外协' else
+        self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                          route.routing_type,
+                                                          production.product_id),
+        'date_planned_start': False,
+        'date_planned_finished': False,
+        'duration_expected': 60,
+        'duration': 0
+    }]
+    return workorders_values_str
+
+
+#  维修模块按钮
+def button_maintenance_req(self):
+    self.ensure_one()
+    return {
+        'name': _('New Maintenance Request'),
+        'view_mode': 'form',
+        'views': [(self.env.ref('mrp_maintenance.maintenance_request_view_form_inherit_mrp').id, 'form')],
+        'res_model': 'maintenance.request',
+        'type': 'ir.actions.act_window',
+        'context': {
+            'default_company_id': self.company_id.id,
+            'default_workorder_id': self.id,
+            'default_production_id': self.production_id.id,
+            'discard_on_footer_button': True,
+        },
+        'target': 'new',
+        'domain': [('workorder_id', '=', self.id)]
+    }
+
+
+# tray_id = fields.Many2one('sf.tray', string="托盘信息", tracking=True)
+
+# 扫码绑定托盘方法
+
+# def gettray(self):
+#     if self.tray_code != False:
+#         values = self.env['sf.tray'].search([("code", "=", self.tray_code)])
+#         if values:
+#             if values.state == "占用":
+#                 raise UserError('该托盘已占用')
+#             if values.state == "报损":
+#                 raise UserError('该托盘已损坏')
+#             else:
+#                 values.update({
+#                     'workorder_id': self,
+#                     'production_id': self.production_id,
+#                     'state': '占用',
+#                 })
+#                 self.work_state = "已绑定"
+#                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
+#                 for a in orders:
+#                     a.tray_id = values
+#         else:
+#             raise UserError('该托盘编码已失效')
+#     else:
+#         raise UserError('托盘码不能为空')
+
+# 验证坯料序列号是否正确
+def pro_code_is_ok(self, barcode):
+    if barcode is not False:
+        if barcode != self.pro_code:
+            raise UserError('坯料序列号错误')
+            return False
+        else:
+            return True
+
+
+pro_code = fields.Char(string='坯料序列号')
+
+pro_code_ok = fields.Boolean(default=False)
+
+
+# 托盘扫码绑定
+# def gettray_auto(self, barcode):
+#     if barcode != False:
+#         values = self.env['sf.tray'].search([("code", "=", barcode)])
+#
+#         if values:
+#             if values.state == "占用":
+#                 raise UserError('该托盘已占用')
+#             if values.state == "报损":
+#                 raise UserError('该托盘已损坏')
+#             else:
+#                 values.update({
+#                     'workorder_id': self,
+#                     'production_id': self.production_id,
+#                     'state': '占用',
+#                 })
+#                 self.work_state = "已绑定"
+#                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
+#                 for a in orders:
+#                     a.tray_id = values
+#
+#                 return values
+#
+#                 # return {
+#                 #     'name': _('New Maintenance Request'),
+#                 #     'view_mode': 'form',
+#                 #     'res_model': 'maintenance.request',
+#                 #     'type': 'ir.actions.act_window',
+#                 #     'context': {
+#                 #         'default_company_id': self.company_id.id,
+#                 #         'default_production_id': self.id,
+#                 #     },
+#                 #     'domain': [('production_id', '=', self.id)],
+#                 # }
+#         else:
+#             raise UserError('该托盘编码已失效')
+#     else:
+#         raise UserError('托盘码不能为空')
+
+# 解除托盘绑定
+# def unbindtray(self):
+#     tray = self.env['sf.tray'].search([("production_id", "=", self.production_id.id)])
+#     if tray:
+#         tray.unclamp()
+#         self.tray_id = False
+
+# return {
+#     'name': _('New Maintenance Request'),
+#     'view_mode': 'form',
+#     'res_model': 'maintenance.request',
+#     'res_id':self.id,
+#     'type': 'ir.actions.act_window',
+#     'context': {
+#         'default_company_id': self.company_id.id,
+#         'default_production_id': self.id,
+#     },
+#     'domain': [('production_id', '=', self.id)],
+#     'target':'new'
+# }
+
+def recreateManufacturingOrWorkerOrder(self):
+    """
+    重新生成制造订单或者重新生成工单
+    """
+    if self.test_results == '报废':
+        values = self.env['mrp.production'].create_production1_values(self.production_id)
+        productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
+            self.production_id.company_id).create(
+            values)
+        self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+        self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+        productions._create_workorder()
+        productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
+                                       (
+                                               p.move_dest_ids.procure_method != 'make_to_order' and
+                                               not p.move_raw_ids and not p.workorder_ids)).action_confirm()
+
+        for production in productions:
+            origin_production = production.move_dest_ids and production.move_dest_ids[
+                0].raw_material_production_id or False
+            orderpoint = production.orderpoint_id
+            if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
+                production.message_post(
+                    body=_('This production order has been created from Replenishment Report.'),
+                    message_type='comment',
+                    subtype_xmlid='mail.mt_note')
+            elif orderpoint:
+                production.message_post_with_view(
+                    'mail.message_origin_link',
+                    values={'self': production, 'origin': orderpoint},
+                    subtype_id=self.env.ref('mail.mt_note').id)
+            elif origin_production:
+                production.message_post_with_view(
+                    'mail.message_origin_link',
+                    values={'self': production, 'origin': origin_production},
+                    subtype_id=self.env.ref('mail.mt_note').id)
+    if self.test_results == '返工':
+        productions = self.production_id
+        # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+        # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+        productions._create_workorder2(self.processing_panel)
+    else:
+        self.results = '合格'
+
+
+def json_workorder_str1(self, k, production, route):
+    workorders_values_str = [0, '', {
+        'product_uom_id': production.product_uom_id.id,
+        'qty_producing': 0,
+        'operation_id': False,
+        'name': '%s(返工)' % route.route_workcenter_id.name,
+        'processing_panel': k,
+        'routing_type': route.routing_type,
+        'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
+        'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                                           route.routing_type,
+                                                                           production.product_id),
+        'date_planned_start': False,
+        'date_planned_finished': False,
+        'duration_expected': 60,
+        'duration': 0,
+
+    }]
+    return workorders_values_str
+
+
+# 重写工单开始按钮方法
+def button_start(self):
+    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:
+        picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
+        if picking_out.state == 'confirmed':
+            picking_out.write({'state': 'assigned'})
+    if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
+        self.move_raw_ids = self.production_id.move_raw_ids
+        self.move_raw_ids[0].write({
+            'materiel_length': self.move_raw_ids[0].product_id.length,
+            'materiel_width': self.move_raw_ids[0].product_id.width,
+            'materiel_height': self.move_raw_ids[0].product_id.height
+        })
 
-    #  维修模块按钮
-    def button_maintenance_req(self):
         self.ensure_one()
-        return {
-            'name': _('New Maintenance Request'),
-            'view_mode': 'form',
-            'views': [(self.env.ref('mrp_maintenance.maintenance_request_view_form_inherit_mrp').id, 'form')],
-            'res_model': 'maintenance.request',
-            'type': 'ir.actions.act_window',
-            'context': {
-                'default_company_id': self.company_id.id,
-                'default_workorder_id': self.id,
-                'default_production_id': self.production_id.id,
-                'discard_on_footer_button': True,
-            },
-            'target': 'new',
-            'domain': [('workorder_id', '=', self.id)]
-        }
+        if any(not time.date_end for time in self.time_ids.filtered(lambda t: t.user_id.id == self.env.user.id)):
+            return True
+        # As button_start is automatically called in the new view
+        if self.state in ('done', 'cancel'):
+            return True
 
-    # tray_id = fields.Many2one('sf.tray', string="托盘信息", tracking=True)
-
-    # 扫码绑定托盘方法
-
-    # def gettray(self):
-    #     if self.tray_code != False:
-    #         values = self.env['sf.tray'].search([("code", "=", self.tray_code)])
-    #         if values:
-    #             if values.state == "占用":
-    #                 raise UserError('该托盘已占用')
-    #             if values.state == "报损":
-    #                 raise UserError('该托盘已损坏')
-    #             else:
-    #                 values.update({
-    #                     'workorder_id': self,
-    #                     'production_id': self.production_id,
-    #                     'state': '占用',
-    #                 })
-    #                 self.work_state = "已绑定"
-    #                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
-    #                 for a in orders:
-    #                     a.tray_id = values
-    #         else:
-    #             raise UserError('该托盘编码已失效')
-    #     else:
-    #         raise UserError('托盘码不能为空')
-
-    # 验证坯料序列号是否正确
-    def pro_code_is_ok(self, barcode):
-        if barcode is not False:
-            if barcode != self.pro_code:
-                raise UserError('坯料序列号错误')
-                return False
-            else:
-                return True
-
-    pro_code = fields.Char(string='坯料序列号')
-
-    pro_code_ok = fields.Boolean(default=False)
-
-    # 托盘扫码绑定
-    # def gettray_auto(self, barcode):
-    #     if barcode != False:
-    #         values = self.env['sf.tray'].search([("code", "=", barcode)])
-    #
-    #         if values:
-    #             if values.state == "占用":
-    #                 raise UserError('该托盘已占用')
-    #             if values.state == "报损":
-    #                 raise UserError('该托盘已损坏')
-    #             else:
-    #                 values.update({
-    #                     'workorder_id': self,
-    #                     'production_id': self.production_id,
-    #                     'state': '占用',
-    #                 })
-    #                 self.work_state = "已绑定"
-    #                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
-    #                 for a in orders:
-    #                     a.tray_id = values
-    #
-    #                 return values
-    #
-    #                 # return {
-    #                 #     'name': _('New Maintenance Request'),
-    #                 #     'view_mode': 'form',
-    #                 #     'res_model': 'maintenance.request',
-    #                 #     'type': 'ir.actions.act_window',
-    #                 #     'context': {
-    #                 #         'default_company_id': self.company_id.id,
-    #                 #         'default_production_id': self.id,
-    #                 #     },
-    #                 #     'domain': [('production_id', '=', self.id)],
-    #                 # }
-    #         else:
-    #             raise UserError('该托盘编码已失效')
-    #     else:
-    #         raise UserError('托盘码不能为空')
-
-    # 解除托盘绑定
-    # def unbindtray(self):
-    #     tray = self.env['sf.tray'].search([("production_id", "=", self.production_id.id)])
-    #     if tray:
-    #         tray.unclamp()
-    #         self.tray_id = False
-
-    # return {
-    #     'name': _('New Maintenance Request'),
-    #     'view_mode': 'form',
-    #     'res_model': 'maintenance.request',
-    #     'res_id':self.id,
-    #     'type': 'ir.actions.act_window',
-    #     'context': {
-    #         'default_company_id': self.company_id.id,
-    #         'default_production_id': self.id,
-    #     },
-    #     'domain': [('production_id', '=', self.id)],
-    #     'target':'new'
-    # }
-
-    def recreateManufacturingOrWorkerOrder(self):
-        """
-        重新生成制造订单或者重新生成工单
-        """
-        if self.test_results == '报废':
-            values = self.env['mrp.production'].create_production1_values(self.production_id)
-            productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
-                self.production_id.company_id).create(
-                values)
-            self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
-            self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-            productions._create_workorder()
-            productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
-                                           (
-                                                   p.move_dest_ids.procure_method != 'make_to_order' and
-                                                   not p.move_raw_ids and not p.workorder_ids)).action_confirm()
-
-            for production in productions:
-                origin_production = production.move_dest_ids and production.move_dest_ids[
-                    0].raw_material_production_id or False
-                orderpoint = production.orderpoint_id
-                if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
-                    production.message_post(
-                        body=_('This production order has been created from Replenishment Report.'),
-                        message_type='comment',
-                        subtype_xmlid='mail.mt_note')
-                elif orderpoint:
-                    production.message_post_with_view(
-                        'mail.message_origin_link',
-                        values={'self': production, 'origin': orderpoint},
-                        subtype_id=self.env.ref('mail.mt_note').id)
-                elif origin_production:
-                    production.message_post_with_view(
-                        'mail.message_origin_link',
-                        values={'self': production, 'origin': origin_production},
-                        subtype_id=self.env.ref('mail.mt_note').id)
-        if self.test_results == '返工':
-            productions = self.production_id
-            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-            productions._create_workorder2(self.processing_panel)
+        if self.product_tracking == 'serial':
+            self.qty_producing = 1.0
         else:
-            self.results = '合格'
+            self.qty_producing = self.qty_remaining
 
-    def json_workorder_str1(self, k, production, route):
-        workorders_values_str = [0, '', {
-            'product_uom_id': production.product_uom_id.id,
-            'qty_producing': 0,
-            'operation_id': False,
-            'name': '%s(返工)' % route.route_workcenter_id.name,
-            'processing_panel': k,
-            'routing_type': route.routing_type,
-            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
-            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
-                                                                               route.routing_type,
-                                                                               production.product_id),
-            'date_planned_start': False,
-            'date_planned_finished': False,
-            'duration_expected': 60,
-            'duration': 0,
-
-        }]
-        return workorders_values_str
-
-    # 重写工单开始按钮方法
-    def button_start(self):
-        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:
-            picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
-            if picking_out.state == 'confirmed':
-                picking_out.write({'state': 'assigned'})
-        if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
-            self.move_raw_ids = self.production_id.move_raw_ids
-            self.move_raw_ids[0].write({
-                'materiel_length': self.move_raw_ids[0].product_id.length,
-                'materiel_width': self.move_raw_ids[0].product_id.width,
-                'materiel_height': self.move_raw_ids[0].product_id.height
+        self.env['mrp.workcenter.productivity'].create(
+            self._prepare_timeline_vals(self.duration, datetime.now())
+        )
+        if self.production_id.state != 'progress':
+            self.production_id.write({
+                'date_start': datetime.now(),
             })
-
-            self.ensure_one()
-            if any(not time.date_end for time in self.time_ids.filtered(lambda t: t.user_id.id == self.env.user.id)):
-                return True
-            # As button_start is automatically called in the new view
-            if self.state in ('done', 'cancel'):
-                return True
-
-            if self.product_tracking == 'serial':
-                self.qty_producing = 1.0
-            else:
-                self.qty_producing = self.qty_remaining
-
-            self.env['mrp.workcenter.productivity'].create(
-                self._prepare_timeline_vals(self.duration, datetime.now())
-            )
-            if self.production_id.state != 'progress':
-                self.production_id.write({
-                    'date_start': datetime.now(),
-                })
-            if self.state == 'progress':
-                return True
-            start_date = datetime.now()
-            vals = {
-                'state': 'progress',
-                'date_start': start_date,
-            }
-            if not self.leave_id:
-                leave = self.env['resource.calendar.leaves'].create({
-                    'name': self.display_name,
-                    'calendar_id': self.workcenter_id.resource_calendar_id.id,
-                    'date_from': start_date,
-                    'date_to': start_date + relativedelta(minutes=self.duration_expected),
-                    'resource_id': self.workcenter_id.resource_id.id,
-                    'time_type': 'other'
-                })
-                vals['leave_id'] = leave.id
-                return self.write(vals)
-            else:
-                if self.date_planned_start > start_date:
-                    vals['date_planned_start'] = start_date
-                if self.date_planned_finished and self.date_planned_finished < start_date:
-                    vals['date_planned_finished'] = start_date
-                return self.write(vals)
+        if self.state == 'progress':
+            return True
+        start_date = datetime.now()
+        vals = {
+            'state': 'progress',
+            'date_start': start_date,
+        }
+        if not self.leave_id:
+            leave = self.env['resource.calendar.leaves'].create({
+                'name': self.display_name,
+                'calendar_id': self.workcenter_id.resource_calendar_id.id,
+                'date_from': start_date,
+                'date_to': start_date + relativedelta(minutes=self.duration_expected),
+                'resource_id': self.workcenter_id.resource_id.id,
+                'time_type': 'other'
+            })
+            vals['leave_id'] = leave.id
+            return self.write(vals)
         else:
-            raise UserError(_('请先完成上一步工单'))
+            if self.date_planned_start > start_date:
+                vals['date_planned_start'] = start_date
+            if self.date_planned_finished and self.date_planned_finished < start_date:
+                vals['date_planned_finished'] = start_date
+            return self.write(vals)
+    else:
+        raise UserError(_('请先完成上一步工单'))
 
-    def button_finish(self):
-        if self.routing_type == '装夹预调':
-            if not self.material_center_point and self.X_deviation_angle > 0:
-                raise UserError("请对前置三元检测定位参数进行计算定位")
-            if not self.rfid_code:
-                raise UserError("请扫RFID码进行绑定")
-        if self.picking_out_id:
-            picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
-            if picking_out.workorder_out_id:
-                order_line_ids = []
-                for item in picking_out.workorder_out_id:
-                    server_product = self.env['product.template'].search(
-                        [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
-                         ('detailed_type', '=', 'service')])
-                    if server_product:
-                        order_line_ids.append((0, 0, {
-                            'product_id': server_product.product_variant_id.id,
-                            'product_qty': 1,
-                            'product_uom': server_product.uom_id.id
-                        }))
-                    else:
-                        raise UserError(
-                            '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
-                self.env['purchase.order'].create({
-                    'partner_id': server_product.seller_ids.partner_id.id,
-                    'state': 'draft',
-                    'order_line': order_line_ids,
-                })
-        super().button_finish()
-        is_production_id = True
+
+def button_finish(self):
+    if self.routing_type == '装夹预调':
+        if not self.material_center_point and self.X_deviation_angle > 0:
+            raise UserError("请对前置三元检测定位参数进行计算定位")
+        if not self.rfid_code:
+            raise UserError("请扫RFID码进行绑定")
+    if self.picking_out_id:
+        picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
+        if picking_out.workorder_out_id:
+            order_line_ids = []
+            for item in picking_out.workorder_out_id:
+                server_product = self.env['product.template'].search(
+                    [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
+                     ('detailed_type', '=', 'service')])
+                if server_product:
+                    order_line_ids.append((0, 0, {
+                        'product_id': server_product.product_variant_id.id,
+                        'product_qty': 1,
+                        'product_uom': server_product.uom_id.id
+                    }))
+                else:
+                    raise UserError(
+                        '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
+            self.env['purchase.order'].create({
+                'partner_id': server_product.seller_ids.partner_id.id,
+                'state': 'draft',
+                'order_line': order_line_ids,
+            })
+    super().button_finish()
+    is_production_id = True
+    for workorder in self.production_id.workorder_ids:
+        if workorder.state != 'done':
+            is_production_id = False
+    if is_production_id == True and self.name == '解除装夹':
         for workorder in self.production_id.workorder_ids:
-            if workorder.state != 'done':
-                is_production_id = False
-        if is_production_id == True and self.name == '解除装夹':
-            for workorder in self.production_id.workorder_ids:
-                workorder.rfid_code_old = workorder.rfid_code
-                workorder.rfid_code = None
-            for move_raw_id in self.production_id.move_raw_ids:
-                move_raw_id.quantity_done = move_raw_id.product_uom_qty
-            self.production_id.button_mark_done1()
-            # self.production_id.state = 'done'
+            workorder.rfid_code_old = workorder.rfid_code
+            workorder.rfid_code = None
+        for move_raw_id in self.production_id.move_raw_ids:
+            move_raw_id.quantity_done = move_raw_id.product_uom_qty
+        self.production_id.button_mark_done1()
+        # self.production_id.state = 'done'
 
-    # 将FTP的检测报告文件下载到临时目录
-    def download_reportfile_tmp(self, workorder, reportpath):
-        logging.info('reportpath:%s' % reportpath)
-        production_no_ftp = reportpath.split('/')
-        production_no = workorder.production_id.name.replace('/', '_')
-        # ftp地址
-        remotepath = os.path.join('/NC', production_no_ftp[1], 'detection')
-        logging.info('ftp地址:%s' % remotepath)
-        if reportpath.find(production_no) != -1:
-            # 服务器内临时地址
-            serverdir = os.path.join('/tmp', production_no_ftp[1], 'detection')
-            ftp_resconfig = self.env['res.config.settings'].get_values()
-            ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
-                                ftp_resconfig['ftp_user'],
-                                ftp_resconfig['ftp_password'])
-            download_state = ftp.download_reportfile_tree(remotepath, serverdir, reportpath)
-            logging.info('download_state:%s' % download_state)
-        else:
-            download_state = 2
-        return download_state
 
-    # 根据中控系统提供的检测文件地址去ftp里对应的制造订单里获取
-    def get_detection_file(self, workorder, reportPath):
-        if reportPath.startswith('/'):
-            reportPath = reportPath[1:]
-        serverdir = os.path.join('/tmp', reportPath)
-        logging.info('get_detection_file-serverdir:%s' % serverdir)
-        serverdir_prefix = os.path.dirname(serverdir)
-        for root, dirs, files in os.walk(serverdir_prefix):
-            for filename in files:
-                if filename == os.path.basename(reportPath):
-                    report_file_path = os.path.join(root, filename)
-                    logging.info('get_detection_file-report_file_path:%s' % report_file_path)
-                    workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
-                    return True
+# 将FTP的检测报告文件下载到临时目录
+def download_reportfile_tmp(self, workorder, reportpath):
+    logging.info('reportpath:%s' % reportpath)
+    production_no_ftp = reportpath.split('/')
+    production_no = workorder.production_id.name.replace('/', '_')
+    # ftp地址
+    remotepath = os.path.join('/NC', production_no_ftp[1], 'detection')
+    logging.info('ftp地址:%s' % remotepath)
+    if reportpath.find(production_no) != -1:
+        # 服务器内临时地址
+        serverdir = os.path.join('/tmp', production_no_ftp[1], 'detection')
+        ftp_resconfig = self.env['res.config.settings'].get_values()
+        ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
+                            ftp_resconfig['ftp_user'],
+                            ftp_resconfig['ftp_password'])
+        download_state = ftp.download_reportfile_tree(remotepath, serverdir, reportpath)
+        logging.info('download_state:%s' % download_state)
+    else:
+        download_state = 2
+    return download_state
+
+
+# 根据中控系统提供的检测文件地址去ftp里对应的制造订单里获取
+def get_detection_file(self, workorder, reportPath):
+    if reportPath.startswith('/'):
+        reportPath = reportPath[1:]
+    serverdir = os.path.join('/tmp', reportPath)
+    logging.info('get_detection_file-serverdir:%s' % serverdir)
+    serverdir_prefix = os.path.dirname(serverdir)
+    for root, dirs, files in os.walk(serverdir_prefix):
+        for filename in files:
+            if filename == os.path.basename(reportPath):
+                report_file_path = os.path.join(root, filename)
+                logging.info('get_detection_file-report_file_path:%s' % report_file_path)
+                workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
+                return True
 
 
 class CNCprocessing(models.Model):
@@ -1084,6 +1100,8 @@ class WorkPieceDelivery(models.Model):
     feeder_station_destination_id = fields.Many2one('sf.agv.site', '目的接驳站')
     task_delivery_time = fields.Datetime('任务下发时间')
     task_completion_time = fields.Datetime('任务完成时间')
+    type = fields.Selection(
+        [('上产线', '上产线'), ('下产线', '下产线'), ('运送空料架', '运送空料架')], string='类型')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
     status = fields.Selection(
         [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态',
@@ -1124,6 +1142,9 @@ class WorkPieceDelivery(models.Model):
 
     # 配送至avg小车
     def _delivery_avg(self):
+        agv_site = self.env['sf.agv.site'].search([])
+        if agv_site:
+            agv_site.update_site_state()
         config = self.env['res.config.settings'].get_values()
         positionCode_Arr = []
         if self.feeder_station_start_id:
@@ -1143,7 +1164,7 @@ class WorkPieceDelivery(models.Model):
                'podDir': '', 'materialLot': '', 'priority': '', 'taskCode': '', 'agvCode': '', 'materialLot': '',
                'data': ''}
         try:
-            config['agv_rcs_url'] = 'http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask'
+            # config['agv_rcs_url'] = 'http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask'
             logging.info('AGV请求路径:%s' % config['agv_rcs_url'])
             logging.info('AGV-json:%s' % res)
             headers = {'Content-Type': 'application/json'}
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index d766629c..16ea429a 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/wizard/workpiece_delivery_views.xml b/sf_manufacturing/wizard/workpiece_delivery_views.xml
index 34625878..83cfb89f 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_views.xml
+++ b/sf_manufacturing/wizard/workpiece_delivery_views.xml
@@ -5,18 +5,11 @@
         <field name="model">sf.workpiece.delivery.wizard</field>
         <field name="arch" type="xml">
             <form>
-                <group>
                     <field name="delivery_id" invisible="True"/>
                     <field name="workorder_id" invisible="True"/>
-                    <field name="route_id" required="1" options="{'no_create': True}"/>
-                </group>
-                <div>
-                    <field name="is_ok"/>
-                    确认上述信息正确无误.
-                </div>
+                <div>是否确定配送?</div>
                 <footer>
-                    <button string="确认配送" name="confirm" type="object" class="oe_highlight"
-                            attrs="{'invisible':[('is_ok','=',False)]}"/>
+                    <button string="确认" name="confirm" type="object" class="oe_highlight"/>
                     <button string="取消" class="btn btn-secondary" special="cancel"/>
                 </footer>
             </form>
diff --git a/sf_manufacturing/wizard/workpiece_delivery_wizard.py b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
index 1de3e84c..ab7f4556 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_wizard.py
+++ b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
@@ -11,8 +11,6 @@ class WorkpieceDeliveryWizard(models.TransientModel):
 
     delivery_id = fields.Many2one('sf.workpiece.delivery', string='配送')
     workorder_id = fields.Many2one('mrp.workorder', string='工单')
-    route_id = fields.Many2one('sf.agv.task.route', '任务路线')
-    is_ok = fields.Boolean('确认上述信息正确无误.')
 
     def confirm(self):
         if self.workorder_id:
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index ef2d93d8..035b10a0 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -17,6 +17,7 @@ class ResConfigSettings(models.TransientModel):
                               default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
     center_control_url = fields.Char(string='中控访问地址',
                                      default='http://172.16.21.50:8001')
+    center_control_Authorization = fields.Char(string='中控访问认证')
     wbcode = fields.Char('地码')
     agv_code = fields.Char(string='agv编号')
     task_type_no = fields.Char('任务单类型编号')
@@ -102,6 +103,7 @@ class ResConfigSettings(models.TransientModel):
         wbcode = config.get_param('wbcode', default='')
         agv_code = config.get_param('agv_code', default='')
         center_control_url = config.get_param('center_control_url', default='')
+        center_control_Authorization = config.get_param('center_control_Authorization', default='')
         ftp_host = config.get_param('ftp_host', default='')
         ftp_port = config.get_param('ftp_port', default='')
         ftp_user = config.get_param('ftp_user', default='')
@@ -115,6 +117,7 @@ class ResConfigSettings(models.TransientModel):
             wbcode=wbcode,
             agv_code=agv_code,
             center_control_url=center_control_url,
+            center_control_Authorization=center_control_Authorization,
             ftp_host=ftp_host,
             ftp_port=ftp_port,
             ftp_user=ftp_user,
@@ -132,6 +135,7 @@ class ResConfigSettings(models.TransientModel):
         ir_config.set_param("wbcode", self.wbcode or "")
         ir_config.set_param("agv_code", self.agv_code or "")
         ir_config.set_param("center_control_url", self.center_control_url or "")
+        ir_config.set_param("center_control_Authorization", self.center_control_Authorization or "")
         ir_config.set_param("ftp_host", self.ftp_host or "")
         ir_config.set_param("ftp_port", self.ftp_port or "")
         ir_config.set_param("ftp_user", self.ftp_user or "")
diff --git a/sf_mrs_connect/views/res_config_settings_views.xml b/sf_mrs_connect/views/res_config_settings_views.xml
index 0d1ccc3e..2be92365 100644
--- a/sf_mrs_connect/views/res_config_settings_views.xml
+++ b/sf_mrs_connect/views/res_config_settings_views.xml
@@ -106,6 +106,10 @@
                                         <label for="center_control_url" string="访问地址"/>
                                         <field name="center_control_url"/>
                                     </div>
+                                     <div class="text-muted">
+                                        <label for="center_control_Authorization" string="身份认证"/>
+                                        <field name="center_control_Authorization"/>
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index ed52d9de..1ece6b86 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 24bf5738..724d4369 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index d39dc685..9932d135 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -43,12 +43,10 @@ class SfMaintenanceEquipment(models.Model):
 
     # ==========机床当前刀库实时信息接口==========
     def register_equipment_tool(self):
-        # sf_sync_config = self.env['res.config.settings'].get_values()
-        # token = sf_sync_config['token']
-        # sf_secret_key = sf_sync_config['sf_secret_key']
-        # headers = Common.get_headers(self, token, sf_secret_key)
-        headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'}
-        crea_url = "https://x24467i973.zicp.fun/AutoDeviceApi/GetToolInfos"
+        config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+        headers = {'Authorization': config['center_control_Authorization']}
+        crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
         params = {"DeviceId": self.name}
         r = requests.get(crea_url, params=params, headers=headers)
         ret = r.json()

From 8bc23f5136a4063db6abcedefd8d8ca2f2c0cb8d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 23 Apr 2024 14:15:45 +0800
Subject: [PATCH 11/13] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3=E5=8D=95=E6=8B=86?=
 =?UTF-8?q?=E8=A7=A3=E5=8E=9F=E5=9B=A0=E4=B8=BA=E6=9B=B4=E6=8D=A2=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=88=80=E5=85=B7=E6=97=B6=E7=9A=84=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E6=8B=86=E8=A7=A3=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=8B=86=E8=A7=A3?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E6=8B=86?=
 =?UTF-8?q?=E8=A7=A3=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=8F=8A=E5=85=B6=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E7=AD=89=EF=BC=9B?=
 =?UTF-8?q?3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E6=8B=86?=
 =?UTF-8?q?=E8=A7=A3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=B7=BB=E5=8A=A0=E5=8A=A8=E4=BD=9C=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=B7=B2=E6=8B=86=E8=A7=A3=E7=8A=B6=E6=80=81=E7=9A=84=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B4=E3=80=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E6=B5=81=E7=A8=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E8=B4=A7=E4=BD=8D?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py             | 79 +++++++++++++------
 sf_tool_management/models/functional_tool.py  | 11 ++-
 .../models/maintenance_equipment.py           |  2 +
 .../models/tool_material_search.py            |  4 +-
 .../views/functional_tool_views.xml           | 10 ++-
 sf_tool_management/views/tool_base_views.xml  | 31 +++++---
 sf_tool_management/wizard/wizard.py           | 35 ++++----
 sf_tool_management/wizard/wizard_view.xml     |  2 +-
 8 files changed, 114 insertions(+), 60 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 350658a4..43baaab5 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -647,33 +647,56 @@ class FunctionalToolDismantle(models.Model):
         """
         # 对barcode进行校验是否为货位编码
         if not re.match(r'^[A-Za-z0-9]+-[A-Za-z0-9]+-\d{3}-\d{3}$', barcode):
-            tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', barcode)])
+            tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                [('rfid', '=', barcode), ('functional_tool_status', '!=', '已拆除')])
             if tool_id:
                 self.functional_tool_id = tool_id.id
             else:
                 raise ValidationError('Rfid为【%s】的功能刀具不存在，请重新扫描！' % barcode)
         else:
-            location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
-            if not location:
-                raise ValidationError('【%s】该货位不存在，请重新扫码！' % barcode)
-            else:
-                # 判断是否有夹头物料
-                if not self.chuck_product_id:
-                    # 判断是否有整体式刀具物料
-                    if self.integral_product_id:
-                        # 判断货位是否为空货位 或者 是存有整体式刀具的货位
-                        if location.product_id in [False, self.integral_product_id]:
-                            self.integral_freight_id = location.id
-                        else:
-                            raise ValidationError('【%s】该货位已存在【%s】产品，请重新扫码！' % location.barcode,
-                                                  location.product_id.name)
-                    # 判断是否有刀片物料
-                    elif self.blade_product_id:
-                        # 判断是否有刀杆物料
-                        if self.bar_product_id:
-                            pass
+            if self.dismantle_cause == '更换为其他刀具':
+                location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
+                if not location:
+                    raise ValidationError('【%s】该货位不存在，请重新扫码！' % barcode)
                 else:
-                    pass
+                    if not location.product_id:
+                        # 判断功能刀具存在哪些刀具物料需要录入库位
+                        if self.chuck_product_id:  # 夹头
+                            if not self.chuck_freight_id:
+                                self.chuck_freight_id = location.id
+                                return True
+                        if self.integral_product_id:  # 整体式刀具
+                            if not self.integral_freight_id:
+                                self.integral_freight_id = location.id
+                                return True
+                        elif self.blade_product_id:  # 刀片
+                            if not self.blade_freight_id:
+                                self.blade_freight_id = location.id
+                                return True
+                            if self.bar_product_id:  # 刀杆
+                                if not self.bar_freight_id:
+                                    self.bar_freight_id = location.id
+                                    return True
+                            elif self.pad_product_id:  # 刀盘
+                                if not self.pad_freight_id:
+                                    self.pad_freight_id = location.id
+                                    return True
+                    else:
+                        # 判断货位存放的是那个刀具物料产品
+                        if self.integral_product_id == location.product_id:  # 整体式刀具
+                            self.integral_freight_id = location.id
+                        elif self.blade_product_id == location.product_id:  # 刀片
+                            self.blade_freight_id = location.id
+                        elif self.bar_product_id == location.product_id:  # 刀杆
+                            self.bar_freight_id = location.id
+                        elif self.pad_product_id == location.product_id:  # 刀盘
+                            self.pad_freight_id = location.id
+                        elif self.chuck_product_id == location.product_id:  # 夹头
+                            self.chuck_freight_id = location.id
+            elif self.dismantle_cause in ['寿命到期报废', '崩刀报废']:
+                raise ValidationError('该功能刀具因为%s拆解，无需录入库位' % self.dismantle_cause)
+            else:
+                raise ValidationError('该功能刀具因为%s拆解，无需录入库位' % self.dismantle_cause)
 
     name = fields.Char('名称', related='functional_tool_id.name')
 
@@ -698,6 +721,7 @@ class FunctionalToolDismantle(models.Model):
     grinding_id = fields.Char('磨削单号', readonly=True)
 
     state = fields.Selection([('待拆解', '待拆解'), ('已拆解', '已拆解')], default='待拆解')
+    active = fields.Boolean('有效', default=True)
 
     # 刀柄
     handle_product_id = fields.Many2one('product.product', string='刀柄', compute='_compute_functional_tool_num',
@@ -787,22 +811,24 @@ class FunctionalToolDismantle(models.Model):
                 item.chuck_product_id = False
 
     def confirmation_disassembly(self):
-        logging.info('%s刀具确认拆解' % self.dismantle_cause)
+        logging.info('%s刀具确认开始拆解' % self.dismantle_cause)
+        if self.functional_tool_id.functional_tool_status == '已拆除':
+            raise ValidationError('Rfid为【%s】的功能刀具已经拆解，请勿重复操作！' % self.functional_tool_id.rfid_dismantle)
         location = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
         location_dest = self.env['stock.location'].search([('name', '=', '刀具房')])
         # =================刀柄是否报废拆解=======
         location_dest_scrap = self.env['stock.location'].search([('name', '=', 'Scrap')])
         if self.handle_rfid:
-            lot = self.env['stock.lot'].sudo().search([('name', '=', self.handle_rfid)])
+            lot = self.env['stock.lot'].sudo().search([('rfid', '=', self.handle_rfid)])
             functional_tool_assembly = self.functional_tool_id.functional_tool_name_id
             if self.scrap_boolean:
                 # 刀柄报废 入库到Scrap
                 lot.create_stock_quant(location, location_dest_scrap, functional_tool_assembly.id, '功能刀具拆解',
-                                       functional_tool_assembly)
+                                       functional_tool_assembly, functional_tool_assembly.tool_groups_id)
             else:
                 # 刀柄不报废 入库到刀具房
                 lot.create_stock_quant(location, location_dest, functional_tool_assembly.id, '功能刀具拆解',
-                                       functional_tool_assembly)
+                                       functional_tool_assembly, functional_tool_assembly.tool_groups_id)
         # ==============功能刀具报废拆解================
         if self.dismantle_cause in ['寿命到期报废', '崩刀报废']:
             # 除刀柄外物料报废 入库到Scrap
@@ -853,9 +879,12 @@ class FunctionalToolDismantle(models.Model):
         # 修改拆解单的值
         self.write({
             'rfid_dismantle': self.rfid,
+            'dismantle_data': fields.Datetime.now(),
+            'dismantle_person': self.env.user.name,
             'rfid': '',
             'state': '已拆解'
         })
+        logging.info('刀具拆解成功！')
 
 
 class ProductProduct(models.Model):
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index d4718f34..eae00080 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -45,7 +45,7 @@ class FunctionalCuttingToolEntity(models.Model):
 
     active = fields.Boolean(string='已归档', default=True)
 
-    @api.depends('barcode_id.quant_ids')
+    @api.depends('barcode_id.quant_ids', 'functional_tool_status')
     def _compute_current_location_id(self):
         for record in self:
             if record.barcode_id.quant_ids:
@@ -61,6 +61,12 @@ class FunctionalCuttingToolEntity(models.Model):
             else:
                 record.current_location_id = False
                 record.current_location = False
+            if record.functional_tool_status == '已拆除':
+                record.current_location_id = False
+                record.current_location = False
+                record.tool_room_num = 0
+                record.line_edge_knife_library_num = 0
+                record.machine_knife_library_num = 0
 
     def get_location_num(self):
         """
@@ -185,7 +191,8 @@ class FunctionalCuttingToolEntity(models.Model):
         stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
         self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
-                                           self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id)
+                                           self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id,
+                                           self.functional_tool_name_id.tool_groups_id)
 
     # ==========刀具组接口==========
     # def _register_functional_tool_groups(self, obj):
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index d39dc685..4452f768 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -112,6 +112,8 @@ class StockLot(models.Model):
                             record.tool_material_status = '可用'
                         elif record.quant_ids[-1].location_id.name == '刀具组装位置':
                             record.tool_material_status = '在用'
+                        elif record.quant_ids[-1].location_id.name == 'Scrap':
+                            record.tool_material_status = '报废'
                         else:
                             record.tool_material_status = '未入库'
                         if record.tool_material_search_id:
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index bfb8d64b..ee60c048 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -39,9 +39,7 @@ class ToolMaterial(models.Model):
                     usable_num += quant.quantity
                 elif location == '刀具组装位置':
                     have_been_used_num += quant.quantity
-                elif location == '进货':
-                    pass
-                elif location != 'Vendors':
+                elif location == 'Scrap':
                     scrap_num += quant.quantity
             record.usable_num = usable_num
             record.have_been_used_num = have_been_used_num
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 82fbd8bc..53e050d9 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -85,7 +85,10 @@
                         <group>
                             <group>
                                 <field name="barcode_id" invisible="1"/>
-                                <field name="rfid" readonly="1"/>
+                                <field name="rfid" readonly="1"
+                                       attrs="{'invisible': [('functional_tool_status', '=', '已拆除')]}"/>
+                                <field name="rfid_dismantle" readonly="1"
+                                       attrs="{'invisible': [('functional_tool_status', '!=', '已拆除')]}"/>
                                 <field name="tool_name_id" invisible="0"
                                        placeholder="请输入20字以内的名称"/>
                                 <field name="sf_cutting_tool_type_id"/>
@@ -202,6 +205,9 @@
 
                     <field name="current_location_id" invisible="True"/>
                     <field name="sf_cutting_tool_type_id" invisible="True"/>
+                    <filter string="未拆除" name="no_state_removed" domain="[('functional_tool_status', '!=', '已拆除')]"/>
+                    <filter string="已拆除" name="state_removed" domain="[('functional_tool_status', '=', '已拆除')]"/>
+                    <separator/>
                     <filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
                     <searchpanel>
                         <field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
@@ -218,6 +224,8 @@
             <field name="res_model">sf.functional.cutting.tool.entity</field>
             <field name="view_mode">tree,form,search</field>
             <field name="view_id" ref="view_functional_cutting_tool_list_tree"/>
+            <field name="search_view_id" ref="view_functional_cutting_tool_list_search"/>
+            <field name="context">{'search_default_no_state_removed':1}</field>
         </record>
 
         <!--  ======================================== 功能刀具预警========================================-->
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 944decd2..1db89ddb 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -783,6 +783,7 @@
                     <field name="dismantle_cause"/>
                     <field name="dismantle_data"/>
                     <field name="dismantle_person"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -794,20 +795,21 @@
                 <form>
                     <header>
                         <button string="确认拆解" name="confirmation_disassembly" type="object" class="btn-primary"
-                                confirm="是否确认拆解" attrs="{‘invisible': [('state', '=', '已拆解')]}"/>
+                                confirm="是否确认拆解" attrs="{'invisible': [('state', '=', '已拆解')]}"/>
                         <field name="state" widget="statusbar" statusbar_visible="待拆解,已拆解"/>
                     </header>
                     <sheet>
                         <div class="oe_title">
                             <h1>
                                 <field name="functional_tool_id" placeholder="请选择将要拆解的功能刀具"
-                                       options="{'no_create': True}" attrs="{‘readonly': [('state', '=', '已拆解')]}"/>
+                                       options="{'no_create': True}" attrs="{'readonly': [('state', '=', '已拆解')]}"/>
                             </h1>
                         </div>
                         <field name="_barcode_scanned" widget="barcode_handler"/>
                         <group>
                             <group>
-                                <field name="rfid"/>
+                                <field name="rfid" attrs="{'invisible': [('state', '=', '已拆解')]}"/>
+                                <field name="rfid_dismantle" attrs="{'invisible': [('state', '!=', '已拆解')]}"/>
                                 <field name="tool_type_id"/>
                                 <field name="tool_groups_id"/>
                                 <field name="diameter"/>
@@ -820,7 +822,8 @@
                         <group>
                             <group>
                                 <group>
-                                    <field name="dismantle_cause" placeholder="请选择拆解原因"/>
+                                    <field name="dismantle_cause" placeholder="请选择拆解原因"
+                                           attrs="{'readonly': [('state', '=', '已拆解')]}"/>
                                 </group>
                                 <group>
                                     <field name="scrap_id"
@@ -842,7 +845,7 @@
                                         <group>
                                             <field name="handle_rfid" string="Rfid"/>
                                             <field name="scrap_boolean" string="是否报废"
-                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])]}"/>
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['寿命到期报废','崩刀报废'])], 'readonly': [('state', '=', '已拆解')]}"/>
                                         </group>
                                     </group>
                                     <group string="夹头" attrs="{'invisible': [('chuck_product_id', '=', False)]}">
@@ -854,7 +857,7 @@
                                         <group>
                                             <field name="chuck_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
-                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')]}"/>
                                         </group>
                                     </group>
                                 </group>
@@ -868,7 +871,7 @@
                                         <group>
                                             <field name="integral_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
-                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')]}"/>
 
                                         </group>
                                     </group>
@@ -883,7 +886,7 @@
                                         <group>
                                             <field name="blade_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
-                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')]}"/>
                                         </group>
                                     </group>
                                     <group string="刀杆" attrs="{'invisible': [('bar_product_id', '=', False)]}">
@@ -895,7 +898,7 @@
                                         <group>
                                             <field name="bar_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
-                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')]}"/>
                                         </group>
                                     </group>
                                     <group string="刀盘" attrs="{'invisible': [('pad_product_id', '=', False)]}">
@@ -907,7 +910,7 @@
                                         <group>
                                             <field name="pad_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
-                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])]}"/>
+                                                   attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')]}"/>
                                         </group>
                                     </group>
                                 </group>
@@ -923,6 +926,10 @@
             <field name="arch" type="xml">
                 <search>
                     <field name="functional_tool_id"/>
+                    <filter name="no_dismantle_state" string="未拆解" domain="[('state','!=','已拆解')]"/>
+                    <filter name="dismantle_state" string="已拆解" domain="[('state','=','已拆解')]"/>
+                    <separator/>
+                    <filter name="on_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel>
                         <field name="tool_groups_id" enable_counters="1" icon="fa-filter"/>
                         <field name="tool_type_id" enable_counters="1" icon="fa-filter"/>
@@ -936,8 +943,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.functional.tool.dismantle</field>
             <field name="view_mode">tree,form,search</field>
-            <!--            <field name="search_view_id" ref="sf_functional_tool_dismantle_search"/>-->
-            <!--            <field name="context">{'search_default_no_assemble_status':1}</field>-->
+            <field name="search_view_id" ref="sf_functional_tool_dismantle_search"/>
+            <field name="context">{'search_default_no_dismantle_state':1}</field>
         </record>
 
 
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index be31d7f0..a97e7274 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -403,7 +403,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     after_name_id = fields.Many2one('sf.tool.inventory', string='功能刀具名称', required=True)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
     rfid = fields.Char('Rfid', compute='_compute_rfid')
-    tool_code = fields.Char(string='功能刀具编码', compute='_compute_tool_code')
+    code = fields.Char(string='功能刀具编码', compute='_compute_code')
     after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name', store=True)
     after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
                                                              string='组装后功能刀具类型')
@@ -448,7 +448,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     @api.depends('after_assembly_functional_tool_type_id', 'integral_specification_id', 'bar_specification_id',
                  'pad_specification_id', 'handle_specification_id', 'after_assembly_tool_loading_length')
-    def _compute_tool_code(self):
+    def _compute_code(self):
         for obj in self:
             str_1 = 'GNDJ-%s' % obj.after_assembly_functional_tool_type_id.code
             str_2 = ''
@@ -467,11 +467,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
                         obj.pad_specification_id.cut_depth_max, obj.handle_specification_id.total_length,
                     )
                 else:
-                    obj.tool_code = str_2
+                    obj.code = str_2
                     return True
-                obj.tool_code = str_2 + str(self._get_code(str_2))
+                obj.code = str_2 + str(self._get_code(str_2))
             else:
-                obj.tool_code = str_2
+                obj.code = str_2
 
     def _get_code(self, str_2):
         functional_tool_assembly = self.env['sf.functional.cutting.tool.entity'].sudo().search(
@@ -618,7 +618,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     def get_desc_1(self, stock_lot):
         return {
             'barcode_id': stock_lot.id,
-            'code': self.tool_code,
+            'code': self.code,
             'rfid': self.rfid,
             'tool_groups_id': self.after_tool_groups_id.id,
             'integral_freight_barcode': self.integral_freight_barcode,
@@ -655,7 +655,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     def get_desc_2(self, stock_lot, functional_tool_assembly_id):
         return {
             'barcode_id': stock_lot.id,
-            'code': self.tool_code,
+            'code': self.code,
             'name': self.after_name_id.name,
             'tool_name_id': self.after_name_id.id,
             'rfid': self.rfid,
@@ -718,7 +718,7 @@ class StockPicking(models.Model):
             'functional_tool_type_id': obj.functional_tool_type_id.id,
             'diameter': obj.after_assembly_functional_tool_diameter,
             'knife_tip_r_angle': obj.after_assembly_knife_tip_r_angle,
-            'code': obj.tool_code,
+            'code': obj.code,
             'rfid': obj.rfid,
             'functional_tool_name': obj.after_assembly_functional_tool_name,
             'tool_groups_id': obj.after_tool_groups_id.id
@@ -762,7 +762,7 @@ class ProductProduct(models.Model):
         stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
         stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id,
-                                     '功能刀具组装', obj)
+                                     '功能刀具组装', obj, obj.after_tool_groups_id)
 
         return stock_lot
 
@@ -796,7 +796,7 @@ class ProductProduct(models.Model):
         location_inventory_id = tool_material.quant_ids.location_id[-1]
         stock_location_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
-        tool_material.create_stock_quant(location_inventory_id, stock_location_id, None, '功能刀具组装', False)
+        tool_material.create_stock_quant(location_inventory_id, stock_location_id, None, '功能刀具组装', False, False)
 
     def material_stock_moves(self, shelf_location_barcode):
         # 创建库存移动记录
@@ -819,16 +819,19 @@ class ProductProduct(models.Model):
             'qty_done': 1.0,
             'state': 'done',
         })
-
-        location.product_num = location.product_num - 1
-
+        if location.product_num > 0:
+            location.product_num = location.product_num - 1
+        else:
+            raise ValidationError(
+                '【%s】货位的【%s】产品库存数量为零，请采购入库后再重新组装！' % (location.barcode, location.product_id.name))
         return stock_move_id, stock_move_line_id
 
 
 class StockLot(models.Model):
     _inherit = 'stock.lot'
 
-    def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id, name, obj):
+    def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id, name, obj,
+                           tool_groups_id):
         """
             对功能刀具组装过程的功能刀具和刀具物料进行库存移动，以及创建移动历史
         """
@@ -855,10 +858,10 @@ class StockLot(models.Model):
             'functional_tool_type_id': False if not obj else obj.functional_tool_type_id.id,
             'diameter': None if not obj else obj.after_assembly_functional_tool_diameter,
             'knife_tip_r_angle': None if not obj else obj.after_assembly_knife_tip_r_angle,
-            'code': '' if not obj else obj.tool_code,
+            'code': '' if not obj else obj.code,
             'rfid': '' if not obj else obj.rfid,
             'functional_tool_name': '' if not obj else obj.after_assembly_functional_tool_name,
-            'tool_groups_id': False if not obj else obj.after_tool_groups_id.id
+            'tool_groups_id': False if not tool_groups_id else tool_groups_id.id
         })
         return stock_move_id, stock_move_line_id
 
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index 0eb2a77f..636f94f7 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -334,7 +334,7 @@
                         <group>
                             <group>
                                 <field name="barcode_id" invisible="True"/>
-                                <field name="tool_code" readonly="True"/>
+                                <field name="code" readonly="True"/>
                                 <field name="rfid" class="custom_required"/>
                                 <field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
                                        options="{'no_create': True, 'no_quick_create': True}"/>

From 1fa5ebd80a7f1c6331763696c30c58dbe7147ca2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 23 Apr 2024 14:19:55 +0800
Subject: [PATCH 12/13] 1

---
 sf_manufacturing/controllers/controllers.py | 2 +-
 sf_mrs_connect/controllers/controllers.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index bbd9cac9..28f0702c 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -467,7 +467,7 @@ class Manufacturing_Connect(http.Controller):
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
                     [('feeder_station_start_id.name', '=', ret['DeviceId']),
-                     ('status', '=', '已配送'), ('type', '=', '上产线')], order='id asc')
+                     ('status', '=', '已配送'), ('type', '=', '下产线')], order='id asc')
                 if workpiece_delivery:
                     for wd in workpiece_delivery:
                         logging.info('wd.production_id:%s' % wd.production_id.name)
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 6efc4b82..44a65200 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -29,8 +29,8 @@ class Sf_Mrs_Connect(http.Controller):
                 request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'])])
             logging.info('制造订单号:%s' % cnc_production.name)
             if cnc_production:
-                if ret['glb_file']:
-                    cnc_production.glb_file = base64.b64encode(ret['glb_file'])
+                # if ret['glb_file']:
+                #     cnc_production.glb_file = base64.b64encode(ret['glb_file'])
                 # 拉取所有加工面的程序文件
                 # i = 1
 

From c56886aebe3cad896f009f1648d2ddfeb05de780 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 23 Apr 2024 15:33:59 +0800
Subject: [PATCH 13/13] =?UTF-8?q?1=E3=80=81=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py   | 690 ++++++++++-----------
 sf_quality/models/quality.py               |  11 +-
 sf_tool_management/models/mrp_workorder.py |  12 +-
 3 files changed, 349 insertions(+), 364 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 77467962..c0a0d218 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -470,365 +470,355 @@ class ResMrpWorkOrder(models.Model):
             [0, '', {'production_id': production.id, 'type': '运送空料架'}],
         ]
 
+    # 拼接工单对象属性值(表面工艺)
+    def _json_workorder_surface_process_str(self, production, route, process_parameter, supplier_id):
+        workorders_values_str = [0, '', {
+            'product_uom_id': production.product_uom_id.id,
+            'qty_producing': 0,
+            'operation_id': False,
+            'name': '%s-%s' % (route.name, process_parameter.name),
+            'processing_panel': '',
+            'routing_type': '表面工艺',
+            'surface_technics_parameters_id': process_parameter.id,
+            'work_state': '',
+            'supplier_id': supplier_id,
+            'is_subcontract': True if process_parameter.gain_way == '外协' else False,
+            'workcenter_id': self.env[
+                'mrp.workcenter'].get_process_outsourcing_workcenter() if process_parameter.gain_way == '外协' else
+            self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                              route.routing_type,
+                                                              production.product_id),
+            'date_planned_start': False,
+            'date_planned_finished': False,
+            'duration_expected': 60,
+            'duration': 0
+        }]
+        return workorders_values_str
 
-# 拼接工单对象属性值(表面工艺)
-def _json_workorder_surface_process_str(self, production, route, process_parameter, supplier_id):
-    workorders_values_str = [0, '', {
-        'product_uom_id': production.product_uom_id.id,
-        'qty_producing': 0,
-        'operation_id': False,
-        'name': '%s-%s' % (route.name, process_parameter.name),
-        'processing_panel': '',
-        'routing_type': '表面工艺',
-        'surface_technics_parameters_id': process_parameter.id,
-        'work_state': '',
-        'supplier_id': supplier_id,
-        'is_subcontract': True if process_parameter.gain_way == '外协' else False,
-        'workcenter_id': self.env[
-            'mrp.workcenter'].get_process_outsourcing_workcenter() if process_parameter.gain_way == '外协' else
-        self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
-                                                          route.routing_type,
-                                                          production.product_id),
-        'date_planned_start': False,
-        'date_planned_finished': False,
-        'duration_expected': 60,
-        'duration': 0
-    }]
-    return workorders_values_str
-
-
-#  维修模块按钮
-def button_maintenance_req(self):
-    self.ensure_one()
-    return {
-        'name': _('New Maintenance Request'),
-        'view_mode': 'form',
-        'views': [(self.env.ref('mrp_maintenance.maintenance_request_view_form_inherit_mrp').id, 'form')],
-        'res_model': 'maintenance.request',
-        'type': 'ir.actions.act_window',
-        'context': {
-            'default_company_id': self.company_id.id,
-            'default_workorder_id': self.id,
-            'default_production_id': self.production_id.id,
-            'discard_on_footer_button': True,
-        },
-        'target': 'new',
-        'domain': [('workorder_id', '=', self.id)]
-    }
-
-
-# tray_id = fields.Many2one('sf.tray', string="托盘信息", tracking=True)
-
-# 扫码绑定托盘方法
-
-# def gettray(self):
-#     if self.tray_code != False:
-#         values = self.env['sf.tray'].search([("code", "=", self.tray_code)])
-#         if values:
-#             if values.state == "占用":
-#                 raise UserError('该托盘已占用')
-#             if values.state == "报损":
-#                 raise UserError('该托盘已损坏')
-#             else:
-#                 values.update({
-#                     'workorder_id': self,
-#                     'production_id': self.production_id,
-#                     'state': '占用',
-#                 })
-#                 self.work_state = "已绑定"
-#                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
-#                 for a in orders:
-#                     a.tray_id = values
-#         else:
-#             raise UserError('该托盘编码已失效')
-#     else:
-#         raise UserError('托盘码不能为空')
-
-# 验证坯料序列号是否正确
-def pro_code_is_ok(self, barcode):
-    if barcode is not False:
-        if barcode != self.pro_code:
-            raise UserError('坯料序列号错误')
-            return False
-        else:
-            return True
-
-
-pro_code = fields.Char(string='坯料序列号')
-
-pro_code_ok = fields.Boolean(default=False)
-
-
-# 托盘扫码绑定
-# def gettray_auto(self, barcode):
-#     if barcode != False:
-#         values = self.env['sf.tray'].search([("code", "=", barcode)])
-#
-#         if values:
-#             if values.state == "占用":
-#                 raise UserError('该托盘已占用')
-#             if values.state == "报损":
-#                 raise UserError('该托盘已损坏')
-#             else:
-#                 values.update({
-#                     'workorder_id': self,
-#                     'production_id': self.production_id,
-#                     'state': '占用',
-#                 })
-#                 self.work_state = "已绑定"
-#                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
-#                 for a in orders:
-#                     a.tray_id = values
-#
-#                 return values
-#
-#                 # return {
-#                 #     'name': _('New Maintenance Request'),
-#                 #     'view_mode': 'form',
-#                 #     'res_model': 'maintenance.request',
-#                 #     'type': 'ir.actions.act_window',
-#                 #     'context': {
-#                 #         'default_company_id': self.company_id.id,
-#                 #         'default_production_id': self.id,
-#                 #     },
-#                 #     'domain': [('production_id', '=', self.id)],
-#                 # }
-#         else:
-#             raise UserError('该托盘编码已失效')
-#     else:
-#         raise UserError('托盘码不能为空')
-
-# 解除托盘绑定
-# def unbindtray(self):
-#     tray = self.env['sf.tray'].search([("production_id", "=", self.production_id.id)])
-#     if tray:
-#         tray.unclamp()
-#         self.tray_id = False
-
-# return {
-#     'name': _('New Maintenance Request'),
-#     'view_mode': 'form',
-#     'res_model': 'maintenance.request',
-#     'res_id':self.id,
-#     'type': 'ir.actions.act_window',
-#     'context': {
-#         'default_company_id': self.company_id.id,
-#         'default_production_id': self.id,
-#     },
-#     'domain': [('production_id', '=', self.id)],
-#     'target':'new'
-# }
-
-def recreateManufacturingOrWorkerOrder(self):
-    """
-    重新生成制造订单或者重新生成工单
-    """
-    if self.test_results == '报废':
-        values = self.env['mrp.production'].create_production1_values(self.production_id)
-        productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
-            self.production_id.company_id).create(
-            values)
-        self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
-        self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-        productions._create_workorder()
-        productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
-                                       (
-                                               p.move_dest_ids.procure_method != 'make_to_order' and
-                                               not p.move_raw_ids and not p.workorder_ids)).action_confirm()
-
-        for production in productions:
-            origin_production = production.move_dest_ids and production.move_dest_ids[
-                0].raw_material_production_id or False
-            orderpoint = production.orderpoint_id
-            if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
-                production.message_post(
-                    body=_('This production order has been created from Replenishment Report.'),
-                    message_type='comment',
-                    subtype_xmlid='mail.mt_note')
-            elif orderpoint:
-                production.message_post_with_view(
-                    'mail.message_origin_link',
-                    values={'self': production, 'origin': orderpoint},
-                    subtype_id=self.env.ref('mail.mt_note').id)
-            elif origin_production:
-                production.message_post_with_view(
-                    'mail.message_origin_link',
-                    values={'self': production, 'origin': origin_production},
-                    subtype_id=self.env.ref('mail.mt_note').id)
-    if self.test_results == '返工':
-        productions = self.production_id
-        # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
-        # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-        productions._create_workorder2(self.processing_panel)
-    else:
-        self.results = '合格'
-
-
-def json_workorder_str1(self, k, production, route):
-    workorders_values_str = [0, '', {
-        'product_uom_id': production.product_uom_id.id,
-        'qty_producing': 0,
-        'operation_id': False,
-        'name': '%s(返工)' % route.route_workcenter_id.name,
-        'processing_panel': k,
-        'routing_type': route.routing_type,
-        'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
-        'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
-                                                                           route.routing_type,
-                                                                           production.product_id),
-        'date_planned_start': False,
-        'date_planned_finished': False,
-        'duration_expected': 60,
-        'duration': 0,
-
-    }]
-    return workorders_values_str
-
-
-# 重写工单开始按钮方法
-def button_start(self):
-    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:
-        picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
-        if picking_out.state == 'confirmed':
-            picking_out.write({'state': 'assigned'})
-    if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
-        self.move_raw_ids = self.production_id.move_raw_ids
-        self.move_raw_ids[0].write({
-            'materiel_length': self.move_raw_ids[0].product_id.length,
-            'materiel_width': self.move_raw_ids[0].product_id.width,
-            'materiel_height': self.move_raw_ids[0].product_id.height
-        })
-
+    #  维修模块按钮
+    def button_maintenance_req(self):
         self.ensure_one()
-        if any(not time.date_end for time in self.time_ids.filtered(lambda t: t.user_id.id == self.env.user.id)):
-            return True
-        # As button_start is automatically called in the new view
-        if self.state in ('done', 'cancel'):
-            return True
-
-        if self.product_tracking == 'serial':
-            self.qty_producing = 1.0
-        else:
-            self.qty_producing = self.qty_remaining
-
-        self.env['mrp.workcenter.productivity'].create(
-            self._prepare_timeline_vals(self.duration, datetime.now())
-        )
-        if self.production_id.state != 'progress':
-            self.production_id.write({
-                'date_start': datetime.now(),
-            })
-        if self.state == 'progress':
-            return True
-        start_date = datetime.now()
-        vals = {
-            'state': 'progress',
-            'date_start': start_date,
+        return {
+            'name': _('New Maintenance Request'),
+            'view_mode': 'form',
+            'views': [(self.env.ref('mrp_maintenance.maintenance_request_view_form_inherit_mrp').id, 'form')],
+            'res_model': 'maintenance.request',
+            'type': 'ir.actions.act_window',
+            'context': {
+                'default_company_id': self.company_id.id,
+                'default_workorder_id': self.id,
+                'default_production_id': self.production_id.id,
+                'discard_on_footer_button': True,
+            },
+            'target': 'new',
+            'domain': [('workorder_id', '=', self.id)]
         }
-        if not self.leave_id:
-            leave = self.env['resource.calendar.leaves'].create({
-                'name': self.display_name,
-                'calendar_id': self.workcenter_id.resource_calendar_id.id,
-                'date_from': start_date,
-                'date_to': start_date + relativedelta(minutes=self.duration_expected),
-                'resource_id': self.workcenter_id.resource_id.id,
-                'time_type': 'other'
-            })
-            vals['leave_id'] = leave.id
-            return self.write(vals)
-        else:
-            if self.date_planned_start > start_date:
-                vals['date_planned_start'] = start_date
-            if self.date_planned_finished and self.date_planned_finished < start_date:
-                vals['date_planned_finished'] = start_date
-            return self.write(vals)
-    else:
-        raise UserError(_('请先完成上一步工单'))
 
+    # tray_id = fields.Many2one('sf.tray', string="托盘信息", tracking=True)
 
-def button_finish(self):
-    if self.routing_type == '装夹预调':
-        if not self.material_center_point and self.X_deviation_angle > 0:
-            raise UserError("请对前置三元检测定位参数进行计算定位")
-        if not self.rfid_code:
-            raise UserError("请扫RFID码进行绑定")
-    if self.picking_out_id:
-        picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
-        if picking_out.workorder_out_id:
-            order_line_ids = []
-            for item in picking_out.workorder_out_id:
-                server_product = self.env['product.template'].search(
-                    [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
-                     ('detailed_type', '=', 'service')])
-                if server_product:
-                    order_line_ids.append((0, 0, {
-                        'product_id': server_product.product_variant_id.id,
-                        'product_qty': 1,
-                        'product_uom': server_product.uom_id.id
-                    }))
-                else:
-                    raise UserError(
-                        '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
-            self.env['purchase.order'].create({
-                'partner_id': server_product.seller_ids.partner_id.id,
-                'state': 'draft',
-                'order_line': order_line_ids,
-            })
-    super().button_finish()
-    is_production_id = True
-    for workorder in self.production_id.workorder_ids:
-        if workorder.state != 'done':
-            is_production_id = False
-    if is_production_id == True and self.name == '解除装夹':
-        for workorder in self.production_id.workorder_ids:
-            workorder.rfid_code_old = workorder.rfid_code
-            workorder.rfid_code = None
-        for move_raw_id in self.production_id.move_raw_ids:
-            move_raw_id.quantity_done = move_raw_id.product_uom_qty
-        self.production_id.button_mark_done1()
-        # self.production_id.state = 'done'
+    # 扫码绑定托盘方法
 
+    # def gettray(self):
+    #     if self.tray_code != False:
+    #         values = self.env['sf.tray'].search([("code", "=", self.tray_code)])
+    #         if values:
+    #             if values.state == "占用":
+    #                 raise UserError('该托盘已占用')
+    #             if values.state == "报损":
+    #                 raise UserError('该托盘已损坏')
+    #             else:
+    #                 values.update({
+    #                     'workorder_id': self,
+    #                     'production_id': self.production_id,
+    #                     'state': '占用',
+    #                 })
+    #                 self.work_state = "已绑定"
+    #                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
+    #                 for a in orders:
+    #                     a.tray_id = values
+    #         else:
+    #             raise UserError('该托盘编码已失效')
+    #     else:
+    #         raise UserError('托盘码不能为空')
 
-# 将FTP的检测报告文件下载到临时目录
-def download_reportfile_tmp(self, workorder, reportpath):
-    logging.info('reportpath:%s' % reportpath)
-    production_no_ftp = reportpath.split('/')
-    production_no = workorder.production_id.name.replace('/', '_')
-    # ftp地址
-    remotepath = os.path.join('/NC', production_no_ftp[1], 'detection')
-    logging.info('ftp地址:%s' % remotepath)
-    if reportpath.find(production_no) != -1:
-        # 服务器内临时地址
-        serverdir = os.path.join('/tmp', production_no_ftp[1], 'detection')
-        ftp_resconfig = self.env['res.config.settings'].get_values()
-        ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
-                            ftp_resconfig['ftp_user'],
-                            ftp_resconfig['ftp_password'])
-        download_state = ftp.download_reportfile_tree(remotepath, serverdir, reportpath)
-        logging.info('download_state:%s' % download_state)
-    else:
-        download_state = 2
-    return download_state
-
-
-# 根据中控系统提供的检测文件地址去ftp里对应的制造订单里获取
-def get_detection_file(self, workorder, reportPath):
-    if reportPath.startswith('/'):
-        reportPath = reportPath[1:]
-    serverdir = os.path.join('/tmp', reportPath)
-    logging.info('get_detection_file-serverdir:%s' % serverdir)
-    serverdir_prefix = os.path.dirname(serverdir)
-    for root, dirs, files in os.walk(serverdir_prefix):
-        for filename in files:
-            if filename == os.path.basename(reportPath):
-                report_file_path = os.path.join(root, filename)
-                logging.info('get_detection_file-report_file_path:%s' % report_file_path)
-                workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
+    # 验证坯料序列号是否正确
+    def pro_code_is_ok(self, barcode):
+        if barcode is not False:
+            if barcode != self.pro_code:
+                raise UserError('坯料序列号错误')
+                return False
+            else:
                 return True
 
+    pro_code = fields.Char(string='坯料序列号')
+
+    pro_code_ok = fields.Boolean(default=False)
+
+    # 托盘扫码绑定
+    # def gettray_auto(self, barcode):
+    #     if barcode != False:
+    #         values = self.env['sf.tray'].search([("code", "=", barcode)])
+    #
+    #         if values:
+    #             if values.state == "占用":
+    #                 raise UserError('该托盘已占用')
+    #             if values.state == "报损":
+    #                 raise UserError('该托盘已损坏')
+    #             else:
+    #                 values.update({
+    #                     'workorder_id': self,
+    #                     'production_id': self.production_id,
+    #                     'state': '占用',
+    #                 })
+    #                 self.work_state = "已绑定"
+    #                 orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)])
+    #                 for a in orders:
+    #                     a.tray_id = values
+    #
+    #                 return values
+    #
+    #                 # return {
+    #                 #     'name': _('New Maintenance Request'),
+    #                 #     'view_mode': 'form',
+    #                 #     'res_model': 'maintenance.request',
+    #                 #     'type': 'ir.actions.act_window',
+    #                 #     'context': {
+    #                 #         'default_company_id': self.company_id.id,
+    #                 #         'default_production_id': self.id,
+    #                 #     },
+    #                 #     'domain': [('production_id', '=', self.id)],
+    #                 # }
+    #         else:
+    #             raise UserError('该托盘编码已失效')
+    #     else:
+    #         raise UserError('托盘码不能为空')
+
+    # 解除托盘绑定
+    # def unbindtray(self):
+    #     tray = self.env['sf.tray'].search([("production_id", "=", self.production_id.id)])
+    #     if tray:
+    #         tray.unclamp()
+    #         self.tray_id = False
+
+    # return {
+    #     'name': _('New Maintenance Request'),
+    #     'view_mode': 'form',
+    #     'res_model': 'maintenance.request',
+    #     'res_id':self.id,
+    #     'type': 'ir.actions.act_window',
+    #     'context': {
+    #         'default_company_id': self.company_id.id,
+    #         'default_production_id': self.id,
+    #     },
+    #     'domain': [('production_id', '=', self.id)],
+    #     'target':'new'
+    # }
+
+    def recreateManufacturingOrWorkerOrder(self):
+        """
+        重新生成制造订单或者重新生成工单
+        """
+        if self.test_results == '报废':
+            values = self.env['mrp.production'].create_production1_values(self.production_id)
+            productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
+                self.production_id.company_id).create(
+                values)
+            self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+            self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+            productions._create_workorder()
+            productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
+                                           (
+                                                   p.move_dest_ids.procure_method != 'make_to_order' and
+                                                   not p.move_raw_ids and not p.workorder_ids)).action_confirm()
+
+            for production in productions:
+                origin_production = production.move_dest_ids and production.move_dest_ids[
+                    0].raw_material_production_id or False
+                orderpoint = production.orderpoint_id
+                if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
+                    production.message_post(
+                        body=_('This production order has been created from Replenishment Report.'),
+                        message_type='comment',
+                        subtype_xmlid='mail.mt_note')
+                elif orderpoint:
+                    production.message_post_with_view(
+                        'mail.message_origin_link',
+                        values={'self': production, 'origin': orderpoint},
+                        subtype_id=self.env.ref('mail.mt_note').id)
+                elif origin_production:
+                    production.message_post_with_view(
+                        'mail.message_origin_link',
+                        values={'self': production, 'origin': origin_production},
+                        subtype_id=self.env.ref('mail.mt_note').id)
+        if self.test_results == '返工':
+            productions = self.production_id
+            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+            productions._create_workorder2(self.processing_panel)
+        else:
+            self.results = '合格'
+
+    def json_workorder_str1(self, k, production, route):
+        workorders_values_str = [0, '', {
+            'product_uom_id': production.product_uom_id.id,
+            'qty_producing': 0,
+            'operation_id': False,
+            'name': '%s(返工)' % route.route_workcenter_id.name,
+            'processing_panel': k,
+            'routing_type': route.routing_type,
+            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
+            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                                               route.routing_type,
+                                                                               production.product_id),
+            'date_planned_start': False,
+            'date_planned_finished': False,
+            'duration_expected': 60,
+            'duration': 0,
+
+        }]
+        return workorders_values_str
+
+    # 重写工单开始按钮方法
+    def button_start(self):
+        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:
+            picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
+            if picking_out.state == 'confirmed':
+                picking_out.write({'state': 'assigned'})
+        if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
+            self.move_raw_ids = self.production_id.move_raw_ids
+            self.move_raw_ids[0].write({
+                'materiel_length': self.move_raw_ids[0].product_id.length,
+                'materiel_width': self.move_raw_ids[0].product_id.width,
+                'materiel_height': self.move_raw_ids[0].product_id.height
+            })
+
+            self.ensure_one()
+            if any(not time.date_end for time in self.time_ids.filtered(lambda t: t.user_id.id == self.env.user.id)):
+                return True
+            # As button_start is automatically called in the new view
+            if self.state in ('done', 'cancel'):
+                return True
+
+            if self.product_tracking == 'serial':
+                self.qty_producing = 1.0
+            else:
+                self.qty_producing = self.qty_remaining
+
+            self.env['mrp.workcenter.productivity'].create(
+                self._prepare_timeline_vals(self.duration, datetime.now())
+            )
+            if self.production_id.state != 'progress':
+                self.production_id.write({
+                    'date_start': datetime.now(),
+                })
+            if self.state == 'progress':
+                return True
+            start_date = datetime.now()
+            vals = {
+                'state': 'progress',
+                'date_start': start_date,
+            }
+            if not self.leave_id:
+                leave = self.env['resource.calendar.leaves'].create({
+                    'name': self.display_name,
+                    'calendar_id': self.workcenter_id.resource_calendar_id.id,
+                    'date_from': start_date,
+                    'date_to': start_date + relativedelta(minutes=self.duration_expected),
+                    'resource_id': self.workcenter_id.resource_id.id,
+                    'time_type': 'other'
+                })
+                vals['leave_id'] = leave.id
+                return self.write(vals)
+            else:
+                if self.date_planned_start > start_date:
+                    vals['date_planned_start'] = start_date
+                if self.date_planned_finished and self.date_planned_finished < start_date:
+                    vals['date_planned_finished'] = start_date
+                return self.write(vals)
+        else:
+            raise UserError(_('请先完成上一步工单'))
+
+    def button_finish(self):
+        if self.routing_type == '装夹预调':
+            if not self.material_center_point and self.X_deviation_angle > 0:
+                raise UserError("请对前置三元检测定位参数进行计算定位")
+            if not self.rfid_code:
+                raise UserError("请扫RFID码进行绑定")
+        if self.picking_out_id:
+            picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
+            if picking_out.workorder_out_id:
+                order_line_ids = []
+                for item in picking_out.workorder_out_id:
+                    server_product = self.env['product.template'].search(
+                        [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
+                         ('detailed_type', '=', 'service')])
+                    if server_product:
+                        order_line_ids.append((0, 0, {
+                            'product_id': server_product.product_variant_id.id,
+                            'product_qty': 1,
+                            'product_uom': server_product.uom_id.id
+                        }))
+                    else:
+                        raise UserError(
+                            '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
+                self.env['purchase.order'].create({
+                    'partner_id': server_product.seller_ids.partner_id.id,
+                    'state': 'draft',
+                    'order_line': order_line_ids,
+                })
+        super().button_finish()
+        is_production_id = True
+        for workorder in self.production_id.workorder_ids:
+            if workorder.state != 'done':
+                is_production_id = False
+        if is_production_id == True and self.name == '解除装夹':
+            for workorder in self.production_id.workorder_ids:
+                workorder.rfid_code_old = workorder.rfid_code
+                workorder.rfid_code = None
+            for move_raw_id in self.production_id.move_raw_ids:
+                move_raw_id.quantity_done = move_raw_id.product_uom_qty
+            self.production_id.button_mark_done1()
+            # self.production_id.state = 'done'
+
+    # 将FTP的检测报告文件下载到临时目录
+    def download_reportfile_tmp(self, workorder, reportpath):
+        logging.info('reportpath:%s' % reportpath)
+        production_no_ftp = reportpath.split('/')
+        production_no = workorder.production_id.name.replace('/', '_')
+        # ftp地址
+        remotepath = os.path.join('/NC', production_no_ftp[1], 'detection')
+        logging.info('ftp地址:%s' % remotepath)
+        if reportpath.find(production_no) != -1:
+            # 服务器内临时地址
+            serverdir = os.path.join('/tmp', production_no_ftp[1], 'detection')
+            ftp_resconfig = self.env['res.config.settings'].get_values()
+            ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
+                                ftp_resconfig['ftp_user'],
+                                ftp_resconfig['ftp_password'])
+            download_state = ftp.download_reportfile_tree(remotepath, serverdir, reportpath)
+            logging.info('download_state:%s' % download_state)
+        else:
+            download_state = 2
+        return download_state
+
+    # 根据中控系统提供的检测文件地址去ftp里对应的制造订单里获取
+    def get_detection_file(self, workorder, reportPath):
+        if reportPath.startswith('/'):
+            reportPath = reportPath[1:]
+        serverdir = os.path.join('/tmp', reportPath)
+        logging.info('get_detection_file-serverdir:%s' % serverdir)
+        serverdir_prefix = os.path.dirname(serverdir)
+        for root, dirs, files in os.walk(serverdir_prefix):
+            for filename in files:
+                if filename == os.path.basename(reportPath):
+                    report_file_path = os.path.join(root, filename)
+                    logging.info('get_detection_file-report_file_path:%s' % report_file_path)
+                    workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
+                    return True
+
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index 809dbba3..ea3d5f3a 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -12,13 +12,10 @@ class QualityCheck(models.Model):
 
     # ==========零件特采接口==========
     def _register_quality_check(self):
-        # create_url = '/AutoDeviceApi/PartSpecProc'
-        # sf_sync_config = self.env['res.config.settings'].get_values()
-        # token = sf_sync_config['token']
-        # sf_secret_key = sf_sync_config['sf_secret_key']
-        # headers = Common.get_headers(self, token, sf_secret_key)
-        headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'}
-        crea_url = "https://x24467i973.zicp.fun/AutoDeviceApi/PartSpecProc"
+        config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+        headers = {'Authorization': config['center_control_Authorization']}
+        crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
         origin = self.picking_id.origin
         production_id = self.env['mrp.production'].sudo().search([('name', '=', origin)])
         rfid = '' if not production_id.workorder_ids else production_id.workorder_ids[-1].rfid_code or ''
diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py
index 8098c5a1..2821e277 100644
--- a/sf_tool_management/models/mrp_workorder.py
+++ b/sf_tool_management/models/mrp_workorder.py
@@ -12,18 +12,16 @@ class CNCprocessing(models.Model):
 
     # ==========MES装刀指令接口==========
     def register_cnc_processing(self, knife_plan):
-        # sf_sync_config = self.env['res.config.settings'].get_values()
-        # token = sf_sync_config['token']
-        # sf_secret_key = sf_sync_config['sf_secret_key']
-        # headers = Common.get_headers(self, token, sf_secret_key)
-        headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'}
-        strurl = "https://x24467i973.zicp.fun/AutoDeviceApi/ToolLoadInstruct"
+        config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+        headers = {'Authorization': config['center_control_Authorization']}
+        crea_url = config['center_control_url'] + "/AutoDeviceApi/GetToolInfos"
         val = {
             'DeviceId': knife_plan.machine_table_name,
             'RfidCode': knife_plan.sf_functional_tool_assembly_id.rfid,
             'ToolId': int(knife_plan.cutter_spacing_code_id.code[1:])
         }
-        r = requests.post(strurl, json=val, headers=headers)
+        r = requests.post(crea_url, json=val, headers=headers)
         ret = r.json()
         logging.info('register_cnc_processing:%s' % ret)
         if ret['Succeed']: