From ac383797e06836cb5f98e7928d4227e871090193 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 28 Dec 2022 16:44:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=B0=86=E4=B8=89=E5=85=83=E8=A1=A5?=
 =?UTF-8?q?=E5=81=BF=E5=80=BC=E5=86=99=E5=85=A5CNC=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 2fb49715..f1545a7d 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -104,7 +104,11 @@ class ResMrpWorkOrder(models.Model):
         print("(%.2f,%.2f)" % (x, y))
         self.material_center_point = ("(%.2f,%.2f,%.2f)" % (x, y, z))
         self.X_deviation_angle = jdz
-        return self.material_center_point
+        # 将补偿值写入CNC加工工单
+        workorder = self.env['mrp.workorder'].browse(self.ids)
+        work = workorder.production_id.workorder_ids
+        work.compensation_value_x = eval(self.material_center_point)[0]
+        work.compensation_value_y = eval(self.material_center_point)[1]
 
     def json_workorder_str(self, k, production, route):
         workorders_values_str = [0, '', {

From a5f79ea97d3c4125f3efa55c77eed8fff10aab87 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 3 Jan 2023 11:08:39 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=87=8D=E5=86=99=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 55 ++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index f1545a7d..cdffe09f 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -31,7 +31,7 @@ class ResMrpWorkOrder(models.Model):
     ], string="工序类型")
     cnc_worksheet = fields.Binary(
         '工作指令', readonly=True)
-    material_center_point = fields.Char(string='配料中心点')
+    material_center_point = fields.Char(string='胚料中心点')
     X1_axis = fields.Float(default=0)
     Y1_axis = fields.Float(default=0)
     Z1_axis = fields.Float(default=0)
@@ -284,6 +284,20 @@ class ResMrpWorkOrder(models.Model):
     def button_start(self):
         if self.state == 'waiting' or self.state == 'ready':
             self.ensure_one()
+
+            if self.routing_type == '获取CNC加工程序':
+                json = {
+                    'params': {
+                        'model_name': 'jikimo.process.order',
+                        'field_name': 'name',
+                        'default_code': 'PO-2022-1123-0014',
+                        'state': '加工中',
+                        'date_start': datetime.now(),
+                    },
+                }
+                url = 'https://bfm.cs.jikimo.com/api/get/state'
+                requests.post(url, json=json, data=None)
+
             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
@@ -329,6 +343,41 @@ class ResMrpWorkOrder(models.Model):
         else:
             raise ValidationError(_('请先完成上一步工单'))
 
+    #  重写完成按钮
+    def button_finish(self):
+        end_date = datetime.now()
+
+        if self.routing_type == '解除装夹':
+            json = {
+                'params': {
+                    'model_name': 'jikimo.process.order',
+                    'field_name': 'name',
+                    'default_code': 'PO-2022-1123-0014',
+                    'state': '加工中',
+                    'date_finishi': datetime.now(),
+                },
+            }
+            url = 'https://bfm.cs.jikimo.com/api/get/state'
+            requests.post(url, json=json, data=None)
+
+        for workorder in self:
+            if workorder.state in ('done', 'cancel'):
+                continue
+            workorder.end_all()
+            vals = {
+                'qty_produced': workorder.qty_produced or workorder.qty_producing or workorder.qty_production,
+                'state': 'done',
+                'date_finished': end_date,
+                'date_planned_finished': end_date,
+                'costs_hour': workorder.workcenter_id.costs_hour
+            }
+            if not workorder.date_start:
+                vals['date_start'] = end_date
+            if not workorder.date_planned_start or end_date < workorder.date_planned_start:
+                vals['date_planned_start'] = end_date
+            workorder.write(vals)
+        return True
+
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'
@@ -345,13 +394,13 @@ class CNCprocessing(models.Model):
     depth_of_processing_z = fields.Char('加工深度(Z)')
     cutting_tool_extension_length = fields.Char('刀具伸出长度')
     cutting_tool_handle_type = fields.Char('刀柄型号')
-    estimated_processing_time = fields.Datetime('预计加工时间')
+    estimated_processing_time = fields.Char('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
 
     # mrs下发编程单创建CNC加工
     def cnc_processing_create(self, obj):
-        workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['manufacturing_order_no']),
+        workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['production_order_no']),
                                                       ('processing_panel', '=', obj['processing_panel']),
                                                       ('routing_type', '=', 'CNC加工')])
         vals = {

From be90cd933bc52bb85e6f9c81a8b2588a9c48a771 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 3 Jan 2023 15:05:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 48 ------------------------
 1 file changed, 48 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index cdffe09f..2dc88cc8 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -285,19 +285,6 @@ class ResMrpWorkOrder(models.Model):
         if self.state == 'waiting' or self.state == 'ready':
             self.ensure_one()
 
-            if self.routing_type == '获取CNC加工程序':
-                json = {
-                    'params': {
-                        'model_name': 'jikimo.process.order',
-                        'field_name': 'name',
-                        'default_code': 'PO-2022-1123-0014',
-                        'state': '加工中',
-                        'date_start': datetime.now(),
-                    },
-                }
-                url = 'https://bfm.cs.jikimo.com/api/get/state'
-                requests.post(url, json=json, data=None)
-
             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
@@ -343,41 +330,6 @@ class ResMrpWorkOrder(models.Model):
         else:
             raise ValidationError(_('请先完成上一步工单'))
 
-    #  重写完成按钮
-    def button_finish(self):
-        end_date = datetime.now()
-
-        if self.routing_type == '解除装夹':
-            json = {
-                'params': {
-                    'model_name': 'jikimo.process.order',
-                    'field_name': 'name',
-                    'default_code': 'PO-2022-1123-0014',
-                    'state': '加工中',
-                    'date_finishi': datetime.now(),
-                },
-            }
-            url = 'https://bfm.cs.jikimo.com/api/get/state'
-            requests.post(url, json=json, data=None)
-
-        for workorder in self:
-            if workorder.state in ('done', 'cancel'):
-                continue
-            workorder.end_all()
-            vals = {
-                'qty_produced': workorder.qty_produced or workorder.qty_producing or workorder.qty_production,
-                'state': 'done',
-                'date_finished': end_date,
-                'date_planned_finished': end_date,
-                'costs_hour': workorder.workcenter_id.costs_hour
-            }
-            if not workorder.date_start:
-                vals['date_start'] = end_date
-            if not workorder.date_planned_start or end_date < workorder.date_planned_start:
-                vals['date_planned_start'] = end_date
-            workorder.write(vals)
-        return True
-
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'

From 08efe7813dbfe8be57de27b629c43a9fcf6551a3 Mon Sep 17 00:00:00 2001
From: gqh <email@example.com472285236@qq.co>
Date: Wed, 4 Jan 2023 10:13:29 +0800
Subject: [PATCH 4/7] =?UTF-8?q?sf=E5=B7=A5=E5=8D=95=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8F=8A=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py              |  2 +-
 sf_manufacturing/models/__init__.py           |  1 +
 sf_manufacturing/models/mrp_workcenter.py     |  2 +
 sf_manufacturing/models/mrp_workorder.py      | 16 +++++
 sf_manufacturing/models/res_user.py           |  7 +++
 .../views/mrp_workcenter_views.xml            | 60 +++++++++++++------
 sf_manufacturing/views/mrp_workorder_view.xml | 32 ++++++++--
 7 files changed, 96 insertions(+), 24 deletions(-)
 create mode 100644 sf_manufacturing/models/res_user.py

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 2f73f417..a133d6f6 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -17,8 +17,8 @@
         'report/tray_report.xml',
         'views/mrp_maintenance_views.xml',
         'views/mrp_routing_workcenter_view.xml',
-        'views/mrp_workorder_view.xml',
         'views/mrp_workcenter_views.xml',
+        'views/mrp_workorder_view.xml',
         'views/tray_view.xml',
         'views/model_type_view.xml',
 
diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 8f632de7..419dee46 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -6,6 +6,7 @@ from . import mrp_routing_workcenter
 from . import mrp_workorder
 from . import model_type
 from . import stock
+from . import res_user
 
 
 
diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py
index ad7a0419..e853ab3f 100644
--- a/sf_manufacturing/models/mrp_workcenter.py
+++ b/sf_manufacturing/models/mrp_workcenter.py
@@ -7,6 +7,8 @@ class ResWorkcenter(models.Model):
     _inherit = "mrp.workcenter"
     machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
 
+    users_ids = fields.Many2many("res.users", 'users_workcenter')
+
     equipment_ids = fields.One2many(
         'maintenance.equipment', 'workcenter_id', string="Maintenance Equipment",
         check_company=True)
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 882f687f..e2b5033f 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -19,6 +19,7 @@ class ResMrpWorkOrder(models.Model):
     _order = 'sequence'
 
     workcenter_id = fields.Many2one('mrp.workcenter', required=False)
+    users_ids = fields.Many2many("res.users", 'users_workorder', related="workcenter_id.users_ids")
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
@@ -29,6 +30,21 @@ class ResMrpWorkOrder(models.Model):
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
     ], string="工序类型")
+
+    @api.onchange('users_ids')
+    def get_user_permissions(self):
+        uid = self.env.uid
+        for workorder in self:
+            if workorder.users_ids:
+                for item in workorder.users_ids:
+                    if item.id == uid:
+                        workorder.user_permissions = True
+                    else:
+                        workorder.user_permissions = False
+            else:workorder.user_permissions=False
+
+
+    user_permissions = fields.Boolean('用户权限', compute='get_user_permissions')
     cnc_worksheet = fields.Binary(
         '工作指令', readonly=True)
     material_center_point = fields.Char(string='配料中心点')
diff --git a/sf_manufacturing/models/res_user.py b/sf_manufacturing/models/res_user.py
new file mode 100644
index 00000000..d79313db
--- /dev/null
+++ b/sf_manufacturing/models/res_user.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+from odoo import SUPERUSER_ID, _, api, fields, models, registry
+
+class Users(models.Model):
+    _inherit = 'res.users'
+
+    workcenter_ids = fields.Many2many("mrp.workcenter", 'users_workcenter')
\ No newline at end of file
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 11777e58..186dce3c 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -24,14 +24,16 @@
         </field>
     </record>
 
-      <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
+    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
         <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
         <field name="model">mrp.workcenter</field>
         <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
         <field name="arch" type="xml">
             <!-- Desktop view -->
             <xpath expr="//div[@name='o_wo']" position="inside">
-                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}" title="Work orders" aria-label="Work orders"/>
+                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object"
+                        context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}"
+                        title="Work orders" aria-label="Work orders"/>
             </xpath>
         </field>
     </record>
@@ -39,25 +41,46 @@
     <!-- override to change the no content image -->
     <record id="mrp.action_work_orders" model="ir.actions.act_window">
         <field name="help" type="html">
-          <p class="o_view_nocontent_workorder">
-            No work orders to do!
-          </p><p>
-            Work orders are operations to do as part of a manufacturing order.
-            Operations are defined in the bill of materials or added in the manufacturing order directly.
-          </p><p>
-            Use the table work center control panel to register operations in the shop floor directly.
-            The tablet provides worksheets for your workers and allow them to scrap products, track time,
-            launch a maintenance request, perform quality tests, etc.
-          </p>
+            <p class="o_view_nocontent_workorder">
+                No work orders to do!
+            </p>
+            <p>
+                Work orders are operations to do as part of a manufacturing order.
+                Operations are defined in the bill of materials or added in the manufacturing order directly.
+            </p>
+            <p>
+                Use the table work center control panel to register operations in the shop floor directly.
+                The tablet provides worksheets for your workers and allow them to scrap products, track time,
+                launch a maintenance request, perform quality tests, etc.
+            </p>
+        </field>
+    </record>
+    <record id="mrp_workcenter_kanban_action1" model="ir.actions.act_window">
+        <field name="name">Work Centers Overview</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workcenter</field>
+        <field name="view_mode">kanban,form</field>
+        <field name="view_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="search_view_id" ref="mrp.view_mrp_workcenter_search"/>
+        <field name="domain">[('users_ids','in',uid)]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new work center
+            </p>
+            <p>
+                Manufacturing operations are processed at Work Centers. A Work Center can be composed of
+                workers and/or machines, they are used for costing, scheduling, capacity planning, etc.
+                They can be defined via the configuration menu.
+            </p>
         </field>
     </record>
 
     <menuitem id="menu_mrp_dashboard"
-        name="工作中心概述"
-        action="mrp.mrp_workcenter_kanban_action"
-        groups="mrp.group_mrp_routings"
-        parent="mrp.menu_mrp_root"
-        sequence="5"/>
+              name="工作中心概述"
+              action="mrp_workcenter_kanban_action1"
+              groups="mrp.group_mrp_routings"
+              parent="mrp.menu_mrp_root"
+              sequence="5"/>
 
     <!-- MRP.WORKCENTER -->
     <record model="ir.ui.view" id="view_mrp_workcenter_form_inherit_sf">
@@ -79,6 +102,9 @@
                     </field>
                 </page>
             </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="users_ids" widget="many2many_tags" string="可操作用户"/>
+            </xpath>
 
             <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
                 <field name="machine_tool_id"/>
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 9049f5d2..42d980df 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -7,10 +7,24 @@
         <field name="arch" type="xml">
             <field name="name" position="before">
                 <field name="sequence"/>
+                <field name = 'user_permissions'/>
             </field>
             <field name="name" position="after">
                 <field name="processing_panel"/>
             </field>
+            <xpath expr="//button[@name='button_start']" position="attributes">
+                    <attribute name="attrs">{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False),("user_permissions","=",False)]}</attribute>
+                </xpath>
+<!--             <button name="button_start" type="object" string="Start" class="btn-success"-->
+<!--                  attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}"/>-->
+<!--                <button name="button_pending" type="object" string="Pause" class="btn-warning"-->
+<!--                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>-->
+<!--                <button name="button_finish" type="object" string="Done" class="btn-success"-->
+<!--                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>-->
+            <tree position="attributes">
+                    <attribute name="multi_edit"></attribute>
+                    <attribute name="editable"></attribute>
+                </tree>
         </field>
     </record>
 
@@ -57,10 +71,16 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
+             <xpath expr="field[@name='is_user_working']" position="before">
+                    <field name = 'user_permissions' invisible="1"/>
+                </xpath>
+
+
             <xpath expr="//page[last()]" position="after">
-                <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
+                <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}' >
+
                     <div class="col-12 col-lg-6 o_setting_box">
-                        <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"/>
+                        <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"  attrs='{"invisible": [("user_permissions","=",False)]}' />
                     </div>
                 </page>
 
@@ -185,7 +205,7 @@
                     </div>
 
                     <div class="col-12 col-lg-6 o_setting_box">
-                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"/>
+                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位" attrs='{"invisible": [("user_permissions","=",False)]}'/>
                     </div>
 
                     <group>
@@ -227,7 +247,7 @@
                     </group>
                     <div class="col-12 col-lg-6 o_setting_box">
                             <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"
-                                    string="检测确认"/>
+                                    string="检测确认" attrs='{"invisible": [("user_permissions","=",False)]}'/>
                         </div>
                 </page>
             </xpath>
@@ -235,11 +255,11 @@
                 <page string="解除装夹" attrs='{"invisible": [("routing_type","!=","解除装夹")]}'>
 
                         <div class="col-12 col-lg-6 o_setting_box">
-                            <button type="object" class="oe_highlight" name="unbindtray" string="解除装夹"/>
+                            <button type="object" class="oe_highlight" name="unbindtray" string="解除装夹" attrs='{"invisible": [("user_permissions","=",False)]}'/>
                         </div>
                         <div class="col-12 col-lg-6 o_setting_box">
                             <button type="action" class="oe_highlight" name="sf_manufacturing.label_sf_tray_code1"
-                                    string="打印标签"/>
+                                    string="打印标签" attrs='{"invisible": [("user_permissions","=",False)]}'/>
                         </div>
 
                 </page>

From 0dbd941ed058e1177722ba0b1f18ef491bb2de63 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 6 Jan 2023 16:47:40 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AD=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E8=B7=9F=E8=B8=AA=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/__init__.py       |   1 -
 sf_bf_connect/models/process_status.py | 158 +++++++++++++++++++++++++
 2 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 sf_bf_connect/models/process_status.py

diff --git a/sf_bf_connect/models/__init__.py b/sf_bf_connect/models/__init__.py
index 1b8cfb6d..36ad6139 100644
--- a/sf_bf_connect/models/__init__.py
+++ b/sf_bf_connect/models/__init__.py
@@ -1,4 +1,3 @@
 from . import http
 from . import models
 
-
diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py
new file mode 100644
index 00000000..6ea3da99
--- /dev/null
+++ b/sf_bf_connect/models/process_status.py
@@ -0,0 +1,158 @@
+from odoo import api, fields, models, SUPERUSER_ID, _
+from odoo.exceptions import ValidationError
+from datetime import datetime
+import logging
+from odoo.exceptions import UserError
+import requests
+
+_logger = logging.getLogger(__name__)
+
+class StatusChange(models.Model):
+    _inherit = 'sale.order'
+
+    default_code = fields.Char(string='内部编码')
+
+    def action_confirm(self):
+        logging.info('函数已经执行=============')
+        if self._get_forbidden_state_confirm() & set(self.mapped('state')):
+            raise UserError(_(
+                "It is not allowed to confirm an order in the following states: %s",
+                ", ".join(self._get_forbidden_state_confirm()),
+            ))
+        logging.info('函数已经执行=============1')
+        for order in self:
+            if order.partner_id in order.message_partner_ids:
+                logging.info('函数已经执行=============2')
+                continue
+            order.message_subscribe([order.partner_id.id])
+        logging.info('函数已经执行=============3')
+        self.write(self._prepare_confirmation_values())
+
+        # Context key 'default_name' is sometimes propagated up to here.
+        # We don't need it and it creates issues in the creation of linked records.
+        context = self._context.copy()
+        context.pop('default_name', None)
+        logging.info('函数已经执行=============4')
+
+        self.with_context(context)._action_confirm()
+        if self.env.user.has_group('sale.group_auto_done_setting'):
+            logging.info('函数已经执行=============5')
+            self.action_done()
+        process_start_time = str(datetime.now())
+
+
+        default_code = self.env['product.template'].search([('default_code', '=', self)])
+        logging.info('函数已经执行=============default_code', default_code)
+        json1 = {
+                    'params': {
+                        'model_name': 'jikimo.process.order',
+                        'field_name': 'name',
+                        # 'default_code': 'PO-2022-1214-0022',
+                        'default_code': default_code,
+                        # 'default_code': self.name,
+                        'state': '加工中',
+                        'process_start_time': process_start_time,
+                    },
+                }
+        url1 = 'https://bfm.cs.jikimo.com/api/get/state/get_order'
+        requests.post(url1, json=json1, data=None)
+        logging.info('接口已经执行=============')
+
+        return True
+
+    def action_cancel(self):
+        """ Cancel SO after showing the cancel wizard when needed. (cfr `_show_cancel_wizard`)
+
+        For post-cancel operations, please only override `_action_cancel`.
+
+        note: self.ensure_one() if the wizard is shown.
+        """
+        logging.info('函数已经执行=============')
+        cancel_warning = self._show_cancel_wizard()
+        logging.info('函数已经执行=============2')
+        json1 = {
+            'params': {
+                'model_name': 'jikimo.process.order',
+                'field_name': 'name',
+                'default_code': 'PO-2022-1214-0022',
+                # 'default_code': self.name,
+                'state': '待派单',
+            },
+        }
+        url1 = 'https://bfm.cs.jikimo.com/api/get/state/cancel_order'
+        requests.post(url1, json=json1, data=None)
+        if cancel_warning:
+            logging.info('函数已经执行=============3')
+            self.ensure_one()
+            logging.info('函数已经执行=============4')
+            template_id = self.env['ir.model.data']._xmlid_to_res_id(
+                'sale.mail_template_sale_cancellation', raise_if_not_found=False
+            )
+            lang = self.env.context.get('lang')
+            template = self.env['mail.template'].browse(template_id)
+            if template.lang:
+                lang = template._render_lang(self.ids)[self.id]
+            ctx = {
+                'default_use_template': bool(template_id),
+                'default_template_id': template_id,
+                'default_order_id': self.id,
+                'mark_so_as_canceled': True,
+                'default_email_layout_xmlid': "mail.mail_notification_layout_with_responsible_signature",
+                'model_description': self.with_context(lang=lang).type_name,
+            }
+            return {
+                'name': _('Cancel %s', self.type_name),
+                'view_mode': 'form',
+                'res_model': 'sale.order.cancel',
+                'view_id': self.env.ref('sale.sale_order_cancel_view_form').id,
+                'type': 'ir.actions.act_window',
+                'context': ctx,
+                'target': 'new'
+            }
+        else:
+            return self._action_cancel()
+
+    # def action_cancel(self):
+    #     """ Cancel SO after showing the cancel wizard when needed. (cfr :meth:`_show_cancel_wizard`)
+    #
+    #     For post-cancel operations, please only override :meth:`_action_cancel`.
+    #
+    #     note: self.ensure_one() if the wizard is shown.
+    #     """
+    #     cancel_warning = self._show_cancel_wizard()
+    #     if cancel_warning:
+    #         self.ensure_one()
+    #         template_id = self.env['ir.model.data']._xmlid_to_res_id(
+    #             'sale.mail_template_sale_cancellation', raise_if_not_found=False
+    #         )
+    #         lang = self.env.context.get('lang')
+    #         template = self.env['mail.template'].browse(template_id)
+    #         if template.lang:
+    #             lang = template._render_lang(self.ids)[self.id]
+    #         ctx = {
+    #             'default_use_template': bool(template_id),
+    #             'default_template_id': template_id,
+    #             'default_order_id': self.id,
+    #             'mark_so_as_canceled': True,
+    #             'default_email_layout_xmlid': "mail.mail_notification_layout_with_responsible_signature",
+    #             'model_description': self.with_context(lang=lang).type_name,
+    #         }
+
+    #
+    #         return {
+    #             'name': _('Cancel %s', self.type_name),
+    #             'view_mode': 'form',
+    #             'res_model': 'sale.order.cancel',
+    #             'view_id': self.env.ref('sale.sale_order_cancel_view_form').id,
+    #             'type': 'ir.actions.act_window',
+    #             'context': ctx,
+    #             'target': 'new'
+    #         }
+    #     else:
+    #         return self._action_cancel()
+    #
+    # def _action_cancel(self):
+    #     inv = self.invoice_ids.filtered(lambda inv: inv.state == 'draft')
+    #     inv.button_cancel()
+    #     return self.write({'state': 'cancel'})
+

From 7c4baa4d91c98268a1cc95a2d96eeab334f7ff8c Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Sat, 7 Jan 2023 01:12:25 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/controllers/controllers.py | 15 ++++---
 sf_bf_connect/models/__init__.py         |  2 +-
 sf_bf_connect/models/process_status.py   | 52 +-----------------------
 3 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py
index 5227592f..ad85216f 100644
--- a/sf_bf_connect/controllers/controllers.py
+++ b/sf_bf_connect/controllers/controllers.py
@@ -8,7 +8,7 @@ from odoo.http import request
 
 class Sf_Bf_Connect(http.Controller):
 
-    @http.route('/api/bfm_process_order/list', type='http', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/api/bfm_process_order/list', type='http', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def get_bfm_process_order_list(self, **kw):
         """
@@ -19,6 +19,9 @@ class Sf_Bf_Connect(http.Controller):
         res = {'status': 1, 'factory_order_no': ''}
         logging.info('get_bfm_process_order_list:%s' % kw)
         try:
+            logging.info('get_bfm_process_order_list===================================:%s' % kw['order_number'])
+            # aa = request.env['sale.order'].sudo().get_default_code(kw['order_number'])
+            
             # datas = request.httprequest.data
             # ret = json.loads(datas)
             # ret = json.loads(ret['result'])
@@ -44,9 +47,7 @@ class Sf_Bf_Connect(http.Controller):
                 # else:
                 product = request.env['product.template'].sudo().product_create(product_id, item, order_id,
                                                                                 kw['order_number'], i)
-                # order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
-                logging.info('order_id:%s' % order_id)
-                logging.info('product:%s' % product)
+                i += 1
                 bom_data = request.env['mrp.bom'].with_user(request.env.ref("base.user_admin")).get_bom(product)
                 logging.info('bom_data:%s' % bom_data)
                 if bom_data:
@@ -102,8 +103,12 @@ class Sf_Bf_Connect(http.Controller):
                         product_bom_purchase.with_user(request.env.ref("base.user_admin")).bom_create_line_has(
                             purchase_embryo)
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
-            i += 1
             res['factory_order_no'] = order_id.name
+            aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
+            logging.info('get_bfm_process_or===================================:%s' % order_id.name)
+            aa.default_code = kw['order_number']
+            logging.info('get_bfm_process_order_listaaaaaaaaaaaaaaaaaaaaaaaaaaaa================:%s' % aa.default_code)
+
         except Exception as e:
             logging.info('get_bfm_process_order_list error:%s' % e)
             res['status'] = -1
diff --git a/sf_bf_connect/models/__init__.py b/sf_bf_connect/models/__init__.py
index 36ad6139..97a7ab84 100644
--- a/sf_bf_connect/models/__init__.py
+++ b/sf_bf_connect/models/__init__.py
@@ -1,3 +1,3 @@
 from . import http
 from . import models
-
+from . import process_status
diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py
index 6ea3da99..c89755ec 100644
--- a/sf_bf_connect/models/process_status.py
+++ b/sf_bf_connect/models/process_status.py
@@ -39,16 +39,12 @@ class StatusChange(models.Model):
             logging.info('函数已经执行=============5')
             self.action_done()
         process_start_time = str(datetime.now())
-
-
-        default_code = self.env['product.template'].search([('default_code', '=', self)])
-        logging.info('函数已经执行=============default_code', default_code)
         json1 = {
                     'params': {
                         'model_name': 'jikimo.process.order',
                         'field_name': 'name',
                         # 'default_code': 'PO-2022-1214-0022',
-                        'default_code': default_code,
+                        'default_code': self.default_code,
                         # 'default_code': self.name,
                         'state': '加工中',
                         'process_start_time': process_start_time,
@@ -74,7 +70,7 @@ class StatusChange(models.Model):
             'params': {
                 'model_name': 'jikimo.process.order',
                 'field_name': 'name',
-                'default_code': 'PO-2022-1214-0022',
+                'default_code': self.default_code,
                 # 'default_code': self.name,
                 'state': '待派单',
             },
@@ -112,47 +108,3 @@ class StatusChange(models.Model):
         else:
             return self._action_cancel()
 
-    # def action_cancel(self):
-    #     """ Cancel SO after showing the cancel wizard when needed. (cfr :meth:`_show_cancel_wizard`)
-    #
-    #     For post-cancel operations, please only override :meth:`_action_cancel`.
-    #
-    #     note: self.ensure_one() if the wizard is shown.
-    #     """
-    #     cancel_warning = self._show_cancel_wizard()
-    #     if cancel_warning:
-    #         self.ensure_one()
-    #         template_id = self.env['ir.model.data']._xmlid_to_res_id(
-    #             'sale.mail_template_sale_cancellation', raise_if_not_found=False
-    #         )
-    #         lang = self.env.context.get('lang')
-    #         template = self.env['mail.template'].browse(template_id)
-    #         if template.lang:
-    #             lang = template._render_lang(self.ids)[self.id]
-    #         ctx = {
-    #             'default_use_template': bool(template_id),
-    #             'default_template_id': template_id,
-    #             'default_order_id': self.id,
-    #             'mark_so_as_canceled': True,
-    #             'default_email_layout_xmlid': "mail.mail_notification_layout_with_responsible_signature",
-    #             'model_description': self.with_context(lang=lang).type_name,
-    #         }
-
-    #
-    #         return {
-    #             'name': _('Cancel %s', self.type_name),
-    #             'view_mode': 'form',
-    #             'res_model': 'sale.order.cancel',
-    #             'view_id': self.env.ref('sale.sale_order_cancel_view_form').id,
-    #             'type': 'ir.actions.act_window',
-    #             'context': ctx,
-    #             'target': 'new'
-    #         }
-    #     else:
-    #         return self._action_cancel()
-    #
-    # def _action_cancel(self):
-    #     inv = self.invoice_ids.filtered(lambda inv: inv.state == 'draft')
-    #     inv.button_cancel()
-    #     return self.write({'state': 'cancel'})
-

From d088bc1c8666d60c327e96aa881b95eaef0d2693 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Sun, 8 Jan 2023 16:51:24 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=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_workorder.py | 126 ++++++++++++++++-------
 1 file changed, 88 insertions(+), 38 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 512a0030..69271448 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -4,6 +4,7 @@ import math
 import requests
 import logging
 import base64
+import hashlib
 # import subprocess
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
@@ -36,20 +37,22 @@ class ResMrpWorkOrder(models.Model):
         uid = self.env.uid
         for workorder in self:
             if workorder.users_ids:
+                list_user_id=[]
                 for item in workorder.users_ids:
-                    if item.id == uid:
-                        workorder.user_permissions = True
-                    else:
-                        workorder.user_permissions = False
+                    list_user_id.append(item.id)
+                if uid in list_user_id:
+                    workorder.user_permissions = True
+                else:
+                    workorder.user_permissions = False
             else:workorder.user_permissions=False
 
-
     user_permissions = fields.Boolean('用户权限', compute='get_user_permissions')
     programming_no = fields.Char('编程单号')
-    is_programming = fields.Boolean('是否编程', default=False)
+    work_state = fields.Char('业务状态')
+    programming_state = fields.Char('编程状态')
     cnc_worksheet = fields.Binary(
         '工作指令', readonly=True)
-    material_center_point = fields.Char(string='胚料中心点')
+    material_center_point = fields.Char(string='配料中心点')
     X1_axis = fields.Float(default=0)
     Y1_axis = fields.Float(default=0)
     Z1_axis = fields.Float(default=0)
@@ -136,6 +139,7 @@ class ResMrpWorkOrder(models.Model):
             'name': 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),
             'date_planned_start': False,
             'date_planned_finished': False,
@@ -253,23 +257,34 @@ class ResMrpWorkOrder(models.Model):
         else:
             return True
 
+    def fetchCNCing(self):
+        return None
+
     # cnc程序获取
     def fetchCNC(self):
         cnc = self.env['mrp.workorder'].search(
             [('routing_type', '=', 'CNC加工'), ('production_id', '=', self.production_id.id)], limit=1)
-        res = {'model_code': cnc.product_id.barcode, 'production_no': self.production_id.name,
+        if cnc.product_id.upload_model_file:
+            attachment = cnc.product_id.upload_model_file[0]
+            base64_data = base64.b64encode(attachment.datas)
+            base64_datas = base64_data.decode('utf-8')
+            model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
+        res = {'model_code': '' if not cnc.product_id.upload_model_file else model_code,
+               'production_no': self.production_id.name,
                'machine_tool_code': cnc.workcenter_id.machine_tool_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,
                'user': self.env.user.name,
-               'model_file': base64.b64encode(cnc.product_id.model_file).decode('utf-8')
+               '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()
@@ -279,9 +294,16 @@ class ResMrpWorkOrder(models.Model):
         # res_str = json.dumps(res)
         ret = requests.post(config_url, json={}, data=res, headers=config_header)
         ret = ret.json()
-        result = json.loads(ret['result'])
-        if result['status'] == 1:
-            return self.write({'programming_no': result['programming_no'], 'is_programming': True})
+        if ret['status'] == 1:
+            self.write({'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
+            return {
+                'name': _("工单"),
+                'view_mode': 'form',
+                'res_model': 'mrp.workorder',
+                'res_id': self.id,
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
 
     def json_workorder_str1(self, k, production, route):
         workorders_values_str = [0, '', {
@@ -291,6 +313,7 @@ class ResMrpWorkOrder(models.Model):
             'name': 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),
             'date_planned_start': False,
             'date_planned_finished': False,
@@ -303,7 +326,6 @@ class ResMrpWorkOrder(models.Model):
     def button_start(self):
         if self.state == 'waiting' or self.state == 'ready':
             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
@@ -370,28 +392,39 @@ class CNCprocessing(models.Model):
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
 
     # mrs下发编程单创建CNC加工
-    def cnc_processing_create(self, obj):
-        workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['production_order_no']),
-                                                      ('processing_panel', '=', obj['processing_panel']),
-                                                      ('routing_type', '=', 'CNC加工')])
-        vals = {
-            'workorder_id': workorder.id,
-            'sequence_number': obj['sequence_number'],
-            'program_name': obj['program_name'],
-            'cutting_tool_name': obj['cutting_tool_name'],
-            'cutting_tool_no': obj['cutting_tool_no'],
-            'processing_type': obj['processing_type'],
-            'margin_x_y': obj['margin_x_y'],
-            'margin_z': obj['margin_z'],
-            'depth_of_processing_z': obj['depth_of_processing_z'],
-            'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-            'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-            'estimated_processing_time': obj['estimated_processing_time'],
-            'remark': obj['remark']
-        }
-        return self.env['sf.cnc.processing'].create(vals)
+    def cnc_processing_create(self, cncObj, production_order_no):
+        cnc_processing = self.env['mrp.workorder'].search([('production_id.name', '=', production_order_no),
+                                                           ('routing_type', '=', '获取CNC加工程序'),
+                                                           ('state', '=', 'progress')])
+        # cnc.workorder_id.state = 'done'
+        if cnc_processing:
+            for obj in cncObj:
+                workorder = self.env['mrp.workorder'].search([('production_id.name', '=', production_order_no),
+                                                              ('processing_panel', '=', obj['processing_panel']),
+                                                              ('routing_type', '=', 'CNC加工')])
+                self.env['sf.cnc.processing'].create({
+                    'workorder_id': workorder.id,
+                    'sequence_number': obj['sequence_number'],
+                    'program_name': obj['program_name'],
+                    'cutting_tool_name': obj['cutting_tool_name'],
+                    'cutting_tool_no': obj['cutting_tool_no'],
+                    'processing_type': obj['processing_type'],
+                    'margin_x_y': obj['margin_x_y'],
+                    'margin_z': obj['margin_z'],
+                    'depth_of_processing_z': obj['depth_of_processing_z'],
+                    'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
+                    'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
+                    'estimated_processing_time': obj['estimated_processing_time'],
+                    'remark': obj['remark']
+                })
+                cnc_processing.state = 'done'
+                cnc_processing.work_state = '已编程'
+                return True
+        else:
+            return False
+
+            # 创建附件(nc文件)
 
-    # 创建附件(nc文件)
     def attachment_create(self, name, data):
         attachment = self.env['ir.attachment'].create({
             'datas': base64.b64encode(data),
@@ -402,9 +435,9 @@ class CNCprocessing(models.Model):
         return attachment
 
     # 将FTP的nc文件下载到临时目录
-    def download_file_tmp(self, model_code, processing_panel):
-        remotepath = os.path.join('/', model_code, 'return', processing_panel)
-        serverdir = os.path.join('/tmp', model_code, 'return', processing_panel)
+    def download_file_tmp(self, production_no, processing_panel):
+        remotepath = os.path.join('/', production_no, 'return', processing_panel)
+        serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp = FtpController()
         ftp.download_file_tree(remotepath, serverdir)
         return serverdir
@@ -420,6 +453,20 @@ class CNCprocessing(models.Model):
         else:
             return False
 
+    # 将nc文件对应的excel清单转为pdf
+    # def to_pdf(self, excel_path, pdf_path):
+    #     """
+    #     需要在linux中下载好libreoffice
+    #     """
+    #     logging.info('pdf_path:%s' % pdf_path)
+    #     logging.info('pdf_path:%s' % excel_path)
+    #     # 注意cmd中的libreoffice要和linux中安装的一致
+    #     cmd = 'soffice --headless --convert-to pdf'.split() + [excel_path] + ['--outdir'] + [pdf_path]
+    #     p = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE, bufsize=1)
+    #     # p.wait(timeout=30)  # 停顿30秒等待转化
+    #     # stdout, stderr = p.communicate()
+    #     p.communicate()
+
 
 class SfWorkOrderBarcodes(models.Model):
     """
@@ -430,6 +477,9 @@ class SfWorkOrderBarcodes(models.Model):
 
     def on_barcode_scanned(self, barcode):
         tray_code = self.env['sf.tray'].search([('code', '=', barcode)])
-        self.tray_code = tray_code.code
+        # 在这里，用等号赋值只是一次性的，只是一种展示
+        # self.tray_code = tray_code.code
+        # 用write方法写入数据库是永久的
+        self.write({'tray_code': tray_code.code})
         workorder = self.env['mrp.workorder'].browse(self.ids)
         workorder.gettray_auto(barcode)