From 4a648fbd7ba5fe2d9236877c54988c092a0482a4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 11:45:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1,=E4=BF=AE=E5=A4=8D=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=9A=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=BC=A0=E8=A3=85=E5=A4=B9=E5=B7=A5=E5=8D=95=E6=9C=AA=E5=B0=B1?=
 =?UTF-8?q?=E7=BB=AA=E6=98=AF=EF=BC=8C=E7=8A=B6=E6=80=81=E9=9C=80=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=BE=85=E5=8A=A0=E5=B7=A5;=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90=E5=90=8E,=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=9C=80=E4=B8=BA=EF=BC=9A=E5=AE=8C=E6=88=90;2.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA=E4=BA=A7=E5=93=81=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E6=9C=AA=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=A4=9A=E4=B8=AA=E7=BC=96=E7=A8=8B=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=983.=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E5=8E=BB=E6=8E=89=E9=9D=9E=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml       | 12 ++++++------
 sf_manufacturing/models/mrp_production.py       |  9 +++++----
 sf_manufacturing/models/mrp_workorder.py        | 17 +----------------
 sf_manufacturing/models/stock.py                |  7 ++++---
 .../views/mrp_production_addional_change.xml    |  6 +++---
 sf_manufacturing/views/mrp_workorder_view.xml   |  5 +----
 6 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 55036c8d..7496df0f 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -5,10 +5,10 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
-           <xpath expr="//header" position="inside">-->
-               <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
-                                   ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
-           </xpath>
+<!--           <xpath expr="//header" position="inside">&ndash;&gt;-->
+<!--               <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
+<!--                                   ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
+<!--           </xpath>-->
             <xpath expr="//page//field[@name='cnc_ids']" position="before">
                 <group>
                     <group>
@@ -17,8 +17,8 @@
                     </group>
                     <div>
                         <div>
-                            <field name="button_compensation_state" attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+<!--                            <field name="button_compensation_state" attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
                             <!--                                <span>&#32;</span>-->
 <!--                            <button name="button_send_program_again" type="object" string="重新下发NC程序"-->
 <!--                                    class="btn-primary"-->
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index f2876350..c60eb5c3 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -102,7 +102,7 @@ class MrpProduction(models.Model):
             elif not production.workorder_ids and float_compare(production.qty_producing, production.product_qty,
                                                                 precision_rounding=production.product_uom_id.rounding) >= 0:
                 production.state = 'to_close'
-            elif any(wo_state in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
+            elif any(wo_state in ('progress') for wo_state in production.workorder_ids.mapped('state')):
                 production.state = 'progress'
             elif production.product_uom_id and not float_is_zero(production.qty_producing,
                                                                  precision_rounding=production.product_uom_id.rounding):
@@ -119,6 +119,10 @@ class MrpProduction(models.Model):
                 production.state = 'confirmed'
             # if production.schedule_state == '已完成':
             #     production.state = 'completed'
+            elif production.workorder_ids and production.workorder_ids[0].state == 'ready':
+                production.state = 'confirmed'
+            elif all(wo_state in ('done') for wo_state in production.workorder_ids.mapped('state')):
+                production.state = 'done'
             elif any(wo_state in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
                 production.state = 'progress'
             elif production.product_uom_id and not float_is_zero(production.qty_producing,
@@ -128,9 +132,6 @@ class MrpProduction(models.Model):
                                        precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
                      for move in production.move_raw_ids):
                 production.state = 'progress'
-
-
-
             # if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待装夹':
             #     # production.state = 'pending_processing'
             #     production.state = 'pending_cam'
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 09270dae..882510cf 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -136,11 +136,6 @@ class ResMrpWorkOrder(models.Model):
 
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
     equipment_id = fields.Many2one('maintenance.equipment', string='加工设备', tracking=True)
-    is_ok = fields.Boolean(string='是否合格')
-    # 加工人
-    processing_user_id = fields.Many2one('res.users', string='加工人')
-    # 检测人
-    inspection_user_id = fields.Many2one('res.users', string='检测人')
     # 保存名称
     save_name = fields.Char(string='检测文件保存名称', compute='_compute_save_name')
     # 获取数据状态
@@ -234,16 +229,6 @@ class ResMrpWorkOrder(models.Model):
         ids = [t[0] for t in self.env.cr.fetchall()]
         return [('id', 'in', ids)]
 
-    @api.onchange('is_ok')
-    def _onchange_inspection_user_id(self):
-        """
-        检测is_ok(是否合格)被修改的话，就将当前用户赋值给inspection_user_id
-        """
-        if not self.inspection_user_id:
-            self.inspection_user_id = self.env.user.id
-        else:
-            self.inspection_user_id = False
-
     @api.onchange('functional_fixture_id')
     def _onchange_functional_fixture_id(self):
         if self.functional_fixture_id:
@@ -1036,7 +1021,7 @@ class ResMrpWorkOrder(models.Model):
                     if raw_move:
                         raw_move.write({'state': 'done'})
                 record.production_id.button_mark_done1()
-                record.production_id.state = 'done'
+                # record.production_id.state = 'done'
 
     # 将FTP的检测报告文件下载到临时目录
     def download_reportfile_tmp(self, workorder, reportpath):
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index ee24b72c..08350af2 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -261,13 +261,14 @@ class StockRule(models.Model):
                         'product_id': production.product_id.id,
                         'state': 'draft',
                     })
-            grouped_product_ids = {k: list(g) for k, g in groupby(productions, key=lambda x: x.product_id.id)}
+            all_production = productions
+            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
             # 初始化一个字典来存储每个product_id对应的生产订单名称列表
             product_id_to_production_names = {}
             # 对于每个product_id，获取其所有生产订单的名称
-            for product_id, productions in grouped_product_ids.items():
+            for product_id, all_production in grouped_product_ids.items():
                 # 为同一个product_id创建一个生产订单名称列表
-                product_id_to_production_names[product_id] = [production.name for production in productions]
+                product_id_to_production_names[product_id] = [production.name for production in all_production]
             for production_item in productions:
                 if production_item.product_id.id in product_id_to_production_names:
                     #     # 同一个产品多个制造订单对应一个编程单和模型库
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index e0cddf21..3b27170f 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -5,7 +5,7 @@
             <field name="name">custom.mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">product_uom_category_id
                 <xpath expr="//field[@name='product_id']" position="replace"/>
                 <xpath expr="//field[@name='product_qty']" position="replace"/>
                 <xpath expr="//field[@name='product_uom_id']" position="replace"/>
@@ -281,9 +281,9 @@
             <field name="arch" type="xml">
                 <xpath expr="//tree//button[@name='button_start']" position="replace">
                     <field name="routing_type" invisible="True"/>
-                    <button name="button_start" type="object" string="开始" class="btn-success"
+                    <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始?"
                             attrs="{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user" confirm="是否确认开始?"/>
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="Pause" class="btn-warning"
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 196e019b..30f6ffa4 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -183,7 +183,7 @@
                 </page>
             </xpath>
             <xpath expr="//label[1]" position="before">
-                <field name='routing_type'/>
+                <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
@@ -575,9 +575,6 @@
                 </div>
             </xpath>
             <xpath expr="//form//sheet//group//group//div[3]" position="after">
-                <field name="is_ok" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
-                <field name="processing_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
-                <field name="inspection_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
                 <field name="save_name" widget="CopyClipboardChar"
                        attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
                 <label for="material_length" string="物料尺寸"/>

From 56adaddefcf7241bbf52eaeb37ea862d0579b25a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 12:01:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B2.?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95rfid=E6=8E=92=E6=94=BE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  3 +-
 .../views/mrp_production_addional_change.xml  |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 37 +++++--------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index c60eb5c3..544f6587 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -53,7 +53,8 @@ class MrpProduction(models.Model):
     active = fields.Boolean(string='已归档', default=True)
     programming_no = fields.Char('编程单号')
     work_state = fields.Char('业务状态')
-    programming_state = fields.Char('编程状态', tracking=True)
+    programming_state = fields.Selection(
+        [('编程中', '编程中'), ('已编程', '已编程')], string='编程状态', tracking=True)
     glb_file = fields.Binary("glb模型文件")
     production_line_id = fields.Many2one('sf.production.line', string='生产线', tracking=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间')
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 3b27170f..889830eb 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -78,7 +78,7 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="programming_state" readonly="1"/>
+                    <field name="programming_state" readonly="1" options="{'classes': { '编程中':'primary','已编程':'warning'}}"/>
                     <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 30f6ffa4..93725221 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -124,7 +124,7 @@
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
-<!--                <field name='is_send_program_again' invisible="1"/>-->
+                <!--                <field name='is_send_program_again' invisible="1"/>-->
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
@@ -160,11 +160,11 @@
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
                 <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
-<!--                <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"-->
-<!--                        confirm="是否确认重新下发NC程序？"-->
-<!--                        groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"-->
-<!--                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',-->
-<!--                                                                                                   'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>-->
+                <!--                <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"-->
+                <!--                        confirm="是否确认重新下发NC程序？"-->
+                <!--                        groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"-->
+                <!--                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',-->
+                <!--                                                                                                   'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>-->
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
@@ -185,6 +185,9 @@
             <xpath expr="//label[1]" position="before">
                 <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
+                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
@@ -239,23 +242,6 @@
                 <!--                <field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',-->
                 <!--                '前置三元定位检测','后置三元质量检测','解除装夹'))]}"/>-->
             </field>
-
-            <xpath expr="//page[1]" position="before">
-                <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
-                    <group>
-                        <field name="programming_no" readonly="1"
-                               attrs='{"invisible": [("programming_no","=",False)]}'/>
-                        <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>-->
-                </page>
-            </xpath>
             <!--            <page string="Components" name="components">-->
             <xpath expr="//page[1]" position="before">
                 <!--                <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>-->
@@ -589,9 +575,6 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
-                <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
-                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
         </field>
     </record>
@@ -726,7 +709,7 @@
             </search>
         </field>
     </record>
-、
+    、
     <record id="sf_workpiece_delivery_act" model="ir.actions.act_window">
         <field name="name">工件配送</field>
         <field name="res_model">sf.workpiece.delivery</field>

From b23cb9af6efafa1836d24ce92d163e5bd9116321 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 12:09:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_production_addional_change.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 889830eb..11dbcede 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -78,7 +78,8 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="programming_state" readonly="1" options="{'classes': { '编程中':'primary','已编程':'warning'}}"/>
+                    <field name="programming_state" readonly="1" decoration-success="programming_state == '已编程'"
+                           decoration-warning="programming_state =='编程中'"/>
                     <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">