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 1/2] =?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 e108e2d5d62e798c68597e5e88b59133ec4ca4d6 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 22 Apr 2024 10:58:04 +0800
Subject: [PATCH 2/2] =?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