From 45b9177da4179fce2e71c153923dc0427c9d1914 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 8 Aug 2024 16:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py   |  4 ++--
 sf_manufacturing/models/mrp_production.py     |  2 +-
 sf_manufacturing/models/mrp_workorder.py      |  2 +-
 .../views/mrp_production_addional_change.xml  | 22 +++++++++----------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 072cd222..f3597093 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -429,7 +429,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('LocationChange error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/AGVToProduct', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AGVToProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVToProduct(self, **kw):
         """
@@ -490,7 +490,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('AGVToProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/AGVDownProduct', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AGVDownProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVDownProduct(self, **kw):
         """
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index aca3e992..e1464f3f 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -869,7 +869,7 @@ class MrpProduction(models.Model):
                 if download_state is False:
                     raise UserError('编程单号为%s的CNC程序文件从FTP拉取失败' % (self.programming_no))
                 productions = self.env['mrp.production'].search(
-                    [('programming_no', '=', self.programming_no), ('state', 'not in', ('cancel', 'done', 'scrap'))])
+                    [('programming_no', '=', self.programming_no), ('state', 'not in', ('cancel', 'done'))])
                 if productions:
                     for production in productions:
                         panel_workorder = production.workorder_ids.filtered(lambda
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index a38f5f77..51c416d7 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -907,7 +907,7 @@ class ResMrpWorkOrder(models.Model):
                                 workorder.state = 'waiting'
                     elif workorder.routing_type == '解除装夹' and workorder.state not in ['done', 'rework', 'cancel']:
                         if cnc_workorder:
-                            if not cnc_workorder_pending:
+                            if not cnc_workorder_pending or unclamp_workorder.test_results == '报废':
                                 workorder.state = 'waiting'
                     # else:
                     #     if workorder.production_id.is_rework is True:
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 06cb74e4..42a64f75 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -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': [
                         '|',