From 4399700c3d3c86f519110a41e7366ee48b989f4c Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 8 Aug 2024 17:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E5=BA=9F=E5=90=91?=
 =?UTF-8?q?=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_production_addional_change.xml  | 33 ++++++++++---------
 sf_manufacturing/wizard/production_wizard.py  | 11 +++++--
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 42a64f75..be887cc5 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -7,10 +7,10 @@
             <field name="model">mrp.production</field>
             <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
             <field name="arch" type="xml">
-<!--                <xpath expr="//button[@name='do_unreserve']" position="after">-->
-<!--                    <button name="do_update_program" type="object" string="更新程序"-->
-<!--                            groups="sf_base.group_sf_mrp_user"/>-->
-<!--                </xpath>-->
+                <!--                <xpath expr="//button[@name='do_unreserve']" position="after">-->
+                <!--                    <button name="do_update_program" type="object" string="更新程序"-->
+                <!--                            groups="sf_base.group_sf_mrp_user"/>-->
+                <!--                </xpath>-->
                 <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"/>
@@ -70,7 +70,7 @@
                     <!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
                     <!--                     </attribute>                -->
                     <attribute name="statusbar_visible">
-                        confirmed,pending_cam,progress,done
+                        confirmed,pending_cam,progress,rework,scrapdone
                     </attribute>
                 </xpath>
                 <xpath expr="//sheet//group//group[2]//label" position="before">
@@ -121,17 +121,17 @@
                             string="验证" type="object" data-hotkey="g"
                             groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
-<!--                <xpath expr="(//header//button[@name='button_scrap'])" position="replace">-->
-<!--                    <button name="button_scrap" invisible="1"/>-->
-<!--                    <button name="do_update_program" string="更新程序" type="object" groups="sf_base.group_sf_mrp_user"-->
-<!--                            confirm="是否确认更新程序"-->
-<!--                            attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>-->
-<!--                    <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"-->
-<!--                            attrs="{'invisible': ['|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程')]}"/>-->
-<!--                    <button name="%(sf_manufacturing.action_sf_production_wizard)d" string="报废" type="action"-->
-<!--                            groups="sf_base.group_sf_mrp_user"-->
-<!--                            attrs="{'invisible': [('is_scrap', '=', False)]}"/>-->
-<!--                </xpath>-->
+                <xpath expr="(//header//button[@name='button_scrap'])" position="replace">
+                    <button name="button_scrap" invisible="1"/>
+                    <button name="do_update_program" string="更新程序" type="object" groups="sf_base.group_sf_mrp_user"
+                            confirm="是否确认更新程序"
+                            attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>
+                    <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"
+                            attrs="{'invisible': ['|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程')]}"/>
+                    <button name="%(sf_manufacturing.action_sf_production_wizard)d" string="报废" type="action"
+                            groups="sf_base.group_sf_mrp_user"
+                            attrs="{'invisible': [('is_scrap', '=', False)]}"/>
+                </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[3]" position="replace">
                     <button name="button_mark_done" attrs="{'invisible': [
                         '|',
@@ -460,6 +460,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='filter_in_progress']" position="before">
                     <filter string="返工" name="filter_rework" domain="[('state', '=', 'rework')]"/>
+                    <filter string="报废" name="filter_scrap" domain="[('state', '=', 'scrap')]"/>
                 </xpath>
                 <xpath expr="//filter[@name='planning_issues']" position="before">
                     <separator/>
diff --git a/sf_manufacturing/wizard/production_wizard.py b/sf_manufacturing/wizard/production_wizard.py
index c00ed37d..51a79464 100644
--- a/sf_manufacturing/wizard/production_wizard.py
+++ b/sf_manufacturing/wizard/production_wizard.py
@@ -17,5 +17,12 @@ class ProductionWizard(models.TransientModel):
     def confirm(self):
         if self.is_reprogramming is True:
             self.production_id.update_programming_state()
-            self.production_id.action_cancel()
-
+        self.production_id.action_cancel()
+        self.production_id.detection_result_ids.write({'handle_result': '已处理'})
+        self.production_id.write({'scrap_ids': [(0, 0, {
+            'product_id': self.production_id.product_id.id,
+            'scrap_qty': 1,
+            'lot_id': self.production_id.move_line_raw_ids.lot_id.id,
+            'location_id': self.production_id.move_raw_ids.filtered(lambda x: x.state not in (
+                'done', 'cancel')) and self.production_id.location_src_id.id or self.production_id.location_dest_id.id,
+            'scrap_location_id': self.env['stock.scrap']._get_default_scrap_location_id(), 'state': 'done'})]})