From 47c73ae66e83a64cdeba7182aa35fefd76fa0f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 17 Jan 2025 15:20:50 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=82=E6=95=B0=E8=AF=B4=E6=98=8E=E7=9A=84=E7=B2=BE?=
 =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 73837271..31681932 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -130,7 +130,10 @@ class ReSaleOrder(models.Model):
             'order_id': self.id,
             'product_id': product.id,
             'name': '%s/%s/%s/%s/%s/%s' % (
-                product.model_long, product.model_width, product.model_height, product.model_volume,
+                self.format_float(product.model_long),
+                self.format_float(product.model_width),
+                self.format_float(product.model_height), 
+                self.format_float(product.model_volume),
                 machining_accuracy_name,
                 product.materials_id.name),
             'price_unit': product.list_price,
@@ -143,6 +146,20 @@ class ReSaleOrder(models.Model):
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
+    def format_float(self, value):
+        # 将浮点数转换为字符串
+        value_str = str(value)
+        # 检查小数点的位置
+        if '.' in value_str:
+            # 获取小数部分
+            decimal_part = value_str.split('.')[1]
+            # 判断小数位数是否超过2位
+            if len(decimal_part) > 2:
+                # 超过2位则保留2位小数
+                return "{:.2f}".format(value)
+        # 否则保持原来的位数
+        return float(value_str)
+
     @api.constrains('order_line')
     def check_order_line(self):
         for item in self:

From 9e2704f726a0fef35c91bb688b66c6ed0011e0fc Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 10:34:32 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E9=80=81=E6=A3=80=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E9=9A=90=E8=97=8F=E5=AE=8C=E6=88=90=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 505d0c41..5b409e38 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -182,7 +182,7 @@
                 <button name="button_pending" type="object" string="暂停" 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="完成" class="btn-success" confirm="是否确认完工"
-                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|',('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False),'&amp;','&amp;',('state', 'in', ('progress')), ('is_inspect', '=', True), ('routing_type','!=','CNC加工')]}"/>
 
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"

From a96a9f5b75b02f087c3a94c8681ab68475e2b6e6 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 12:47:11 +0800
Subject: [PATCH 3/9] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E5=8F=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B2=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8D=95=E5=AE=8C=E6=88=90=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=AE=8C=E6=88=90=E5=B7=A5=E5=8D=95=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B3=E3=80=81=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E9=85=8D=E7=BD=AE=E5=90=8E=E7=BD=AE=E4=B8=89?=
 =?UTF-8?q?=E5=85=83=E6=A3=80=E6=B5=8B=E7=9A=84=E5=B7=A5=E5=8D=95=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E8=B4=A8=E6=A3=80=E5=8D=95=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=AD=97=E6=AE=B5=E3=80=81=E9=A1=B5=E7=AD=BE=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml |  2 +-
 sf_quality/models/quality.py                  |  8 +++--
 sf_quality/views/quality_check_view.xml       | 32 ++++++++++++-------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 5b409e38..971a39ad 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -533,7 +533,7 @@
                 <page string="后置三元检测" attrs='{"invisible": [("individuation_page_PTD", "=", False)]}'>
                     <group>
                         <field name="test_results"
-                               attrs='{"readonly":[("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True)],
+                               attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
                                "invisible":[("results","!=",False)]}'/>
                         <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
                         <!--                        <field name="is_fetchcnc"-->
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index 55b831cc..f3163896 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -62,7 +62,9 @@ class QualityCheck(models.Model):
     def do_pass(self):
         self.ensure_one()
         super().do_pass()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if self.test_results in ['返工', '报废']:
                 raise ValidationError('请重新选择【判定结果】-【检测结果】')
@@ -74,7 +76,9 @@ class QualityCheck(models.Model):
     def do_fail(self):
         self.ensure_one()
         super().do_fail()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if not self.test_results:
                 raise ValidationError('请填写【判定结果】里的信息')
diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
index 19f272f4..61309737 100644
--- a/sf_quality/views/quality_check_view.xml
+++ b/sf_quality/views/quality_check_view.xml
@@ -9,22 +9,24 @@
                 <field name="production_id" invisible="1"/>
                 <field name="work_state" invisible="1"/>
                 <field name="individuation_page_PTD" invisible="1"/>
-                <field name="production_line_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="equipment_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <field name="production_line_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="equipment_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
-                       attrs="{'invisible': ['|', '|',('model_file', '=', False), ('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': ['|',('model_file', '=', False), ('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="processing_panel" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <field name="processing_panel" attrs="{'invisible': [('production_id', '=', False)]}"/>
+<!--                <field name="production_id" string="制造订单" readonly="1"-->
+<!--                       attrs="{'invisible': [('production_id', '=', False)]}"/>-->
                 <field name="workorder_id" string="工单号" readonly="1"
-                       attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="is_inspect" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="is_inspect" attrs="{'invisible': [('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//page[@name='notes']" position="before">
-                <page string="检测报告" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="检测报告" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="detection_report" string="" widget="pdf_viewer"/>
                 </page>
-                <page string="判定结果" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="判定结果" attrs="{'invisible': [('production_id', '=', False)]}">
                     <group>
                         <group>
                             <field name="test_results" attrs="{'readonly': [('quality_state','in', ['pass', 'fail'])]}"/>
@@ -35,25 +37,33 @@
                         </group>
                     </group>
                 </page>
-                <page string="2D图纸" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="2D图纸" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="machining_drawings" string="" widget="adaptive_viewer"/>
                 </page>
-                <page string="客户质量标准" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="客户质量标准" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="quality_standard" string="" widget="adaptive_viewer"/>
                 </page>
                 <page string="其他"
-                      attrs="{'invisible': ['|','|', ('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False),('individuation_page_PTD', '=', False)]}">
+                      attrs="{'invisible': ['|',('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False)]}">
                     <group>
                         <field name="write_uid" widget='many2one_avatar_user' string="判定人" readonly="1"/>
                         <field name="write_date" string="判定时间" readonly="1"/>
                     </group>
                 </page>
             </xpath>
+            <xpath expr="//header//button[@name='do_pass'][1]" position="attributes">
+                <attribute name="string">合格</attribute>
+            </xpath>
             <xpath expr="//header//button[@name='do_pass'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'fail'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">合格</attribute>
+            </xpath>
+            <xpath expr="//header//button[@name='do_fail'][1]" position="attributes">
+                <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">不合格</attribute>
             </xpath>
         </field>
     </record>

From 0bf701e743fa46965bce7a120506e5a9fa44f212 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 12:55:12 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_quality/models/quality.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index f3163896..201103f1 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -48,7 +48,7 @@ class QualityCheck(models.Model):
     @api.depends('point_id.is_inspect')
     def _compute_quality_state(self):
         for qc in self:
-            if qc.point_id.is_inspect and qc.quality_state == 'none':
+            if qc.point_id.is_inspect and qc.quality_state == 'none' and qc.workorder_id.state != 'to be detected':
                 qc.quality_state = 'waiting'
             elif not qc.point_id.is_inspect and qc.quality_state == 'waiting':
                 qc.quality_state = 'none'

From dc843588e9346d544bef2a0b39fc9224fdd93ee3 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 20 Jan 2025 14:09:23 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=88=B6=E9=80=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E7=A8=8B=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index d71ba4a5..aaeff8c8 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -74,7 +74,9 @@
                 <xpath expr="//field[@name='production_real_duration']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
-
+                <xpath expr="//field[@name='state']" position="after">
+                     <field name="programming_state" optional="hide"/>
+                </xpath>
             </field>
         </record>
 

From 8e788d3745525f44b4ed77bf89263c5e3794d4d3 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 14:18:02 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=A4=84=E7=90=86CNC=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=B8=8A?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=B8=8B=E4=BA=A7=E7=BA=BF=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E4=B8=BA=E5=BE=85=E6=A3=80=E6=B5=8B=E6=97=B6=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E8=B4=A8=E6=A3=80=E5=8D=95=E8=BF=98=E6=98=AF=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 1980ae1a..b0615197 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1543,7 +1543,15 @@ class ResMrpWorkOrder(models.Model):
         # 修改工单状态
         self.write({'state': 'to be detected'})
         # 若关联的【质量检查_需送检】=true，则质量检查单的状态从“等待”更新为“待处理”
-        self.check_ids.filtered(lambda ch: ch.is_inspect is True).write({'quality_state': 'none'})
+        self.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
+            {'quality_state': 'none'})
+
+    @api.onchange('state')
+    def _onchange_state_quality(self):
+        for wm in self:
+            if wm.routing_type == 'CNC加工' and wm.state == 'to be detected' and wm.check_ids:
+                wm.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
+                    {'quality_state': 'none'})
 
 
 class CNCprocessing(models.Model):

From 955b6a6213c31c8f38dca3bdac14ebe9f4ffd120 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 14:47:09 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index b0615197..f9648d43 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1549,8 +1549,8 @@ class ResMrpWorkOrder(models.Model):
     @api.onchange('state')
     def _onchange_state_quality(self):
         for wm in self:
-            if wm.routing_type == 'CNC加工' and wm.state == 'to be detected' and wm.check_ids:
-                wm.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
+            if wm.routing_type == 'CNC加工' and wm.state == 'to be detected':
+                wm.check_ids.filtered(lambda ch: ch.quality_state == 'waiting').write(
                     {'quality_state': 'none'})
 
 

From 32255af3a3a8bbb9882e121834d5fe510a09f2a8 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 20 Jan 2025 14:53:26 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 1bfa5f07..d7c6d53d 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1674,13 +1674,13 @@ class MrpProduction(models.Model):
             url = '/api/intelligent_programming/reset_state_again'
             config_url = configsettings['sf_url'] + url
             ret = requests.post(config_url, json=res, data=None, headers=config_header)
-            ret = ret.json()
-            result = json.loads(ret['result'])
-            logging.info('update_programming_state-ret:%s' % result)
-            if result['status'] == 1:
-                self.write({'is_rework': True})
-            else:
-                raise UserError(ret['message'])
+            # ret = ret.json()
+            # result = json.loads(ret['result'])
+            # logging.info('update_programming_state-ret:%s' % result)
+            # if result['status'] == 1:
+            #     self.write({'is_rework': True})
+            # else:
+            #     raise UserError(ret['message'])
         except Exception as e:
             logging.info('update_programming_state error:%s' % e)
             raise UserError("更新编程单状态失败,请联系管理员")

From 8f9b7b2fb013057c8c071044459bba1979895e96 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 15:39:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E4=BA=A7=E7=BA=BF=EF=BC=8C=E4=BF=AE=E6=94=B9CNC?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=B7=A5=E5=8D=95=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E5=BE=85=E6=A3=80=E6=B5=8B=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94=E8=B4=A8=E6=A3=80=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=BE=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py | 3 +++
 sf_manufacturing/models/mrp_workorder.py    | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 2a5e4d3e..64a981ad 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -596,6 +596,9 @@ class Manufacturing_Connect(http.Controller):
                                                 if panel_workorder:
                                                     panel_workorder.write({'production_line_state': '已下产线'})
                                                     workorder.write({'state': 'to be detected'})
+                                                    workorder.check_ids.filtered(
+                                                        lambda ch: ch.quality_state == 'waiting').write(
+                                                        {'quality_state': 'none'})
                                     else:
                                         res = {'Succeed': False, 'ErrorCode': 204,
                                                'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index f9648d43..f8197783 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1546,13 +1546,6 @@ class ResMrpWorkOrder(models.Model):
         self.check_ids.filtered(lambda ch: ch.is_inspect is True and ch.quality_state == 'waiting').write(
             {'quality_state': 'none'})
 
-    @api.onchange('state')
-    def _onchange_state_quality(self):
-        for wm in self:
-            if wm.routing_type == 'CNC加工' and wm.state == 'to be detected':
-                wm.check_ids.filtered(lambda ch: ch.quality_state == 'waiting').write(
-                    {'quality_state': 'none'})
-
 
 class CNCprocessing(models.Model):
     _name = 'sf.cnc.processing'