From 0e8bda3369313bd609a5ba4881cdc55413bf97e9 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 17 Oct 2024 09:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=B7=A5=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py |  4 ++--
 sf_quality/models/quality_cnc_test.py       | 22 +++++++++++++++------
 sf_quality/views/quality_cnc_test_view.xml  | 16 +++++++++------
 sf_sale/models/quick_easy_order.py          |  4 ++--
 sf_sale/models/quick_easy_order_old.py      |  4 ++--
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 2a1bfdd2..8e81d076 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
 
 
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_quality/models/quality_cnc_test.py b/sf_quality/models/quality_cnc_test.py
index 9d8e7ce6..0905eb05 100644
--- a/sf_quality/models/quality_cnc_test.py
+++ b/sf_quality/models/quality_cnc_test.py
@@ -30,22 +30,32 @@ class SfQualityCncTest(models.Model):
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")
     detailed_reason = fields.Text('详细原因')
+
     # machining_drawings = fields.Binary(related='workorder_id.machining_drawings', string='2D加工图纸', readonly=True)
     # quality_standard = fields.Binary(related='workorder_id.quality_standard', string='质检标准', readonly=True)
 
     def submit_pass(self):
+        if self.test_results in ['返工', '报废']:
+            raise UserError(_('请重新选择【判定结果】-【检测结果】'))
         self.write({'result': 'pass', 'test_results': '合格', 'state': 'done'})
         self.workorder_id.write({'test_results': self.test_results})
         self.workorder_id.button_finish()
 
     def submit_fail(self):
-        if not self.reason and not self.detailed_reason and not self.test_results:
+        if not self.test_results:
             raise UserError(_('请填写【判定结果】里的信息'))
-        else:
-            self.write({'result': 'fail', 'test_results': self.test_results, 'state': 'done'})
-            self.workorder_id.write(
-                {'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason})
-            self.workorder_id.button_finish()
+        if self.test_results == '合格':
+            raise UserError(_('请重新选择【判定结果】-【检测结果】'))
+        self.write({'result': 'fail', 'test_results': self.test_results, 'state': 'done'})
+        self.workorder_id.write(
+            {'test_results': self.test_results, 'reason': self.reason, 'detailed_reason': self.detailed_reason})
+        self.workorder_id.button_finish()
+
+    @api.onchange('test_results')
+    def _onchange_test_results(self):
+        if self.test_results == '合格':
+            self.reason = False
+            self.detailed_reason = False
 
 
 class SfQualityWorkOrder(models.Model):
diff --git a/sf_quality/views/quality_cnc_test_view.xml b/sf_quality/views/quality_cnc_test_view.xml
index b0aad55d..967ef585 100644
--- a/sf_quality/views/quality_cnc_test_view.xml
+++ b/sf_quality/views/quality_cnc_test_view.xml
@@ -20,8 +20,12 @@
                 <field name="product_id"/>
                 <field name="part_number"/>
                 <field name="number"/>
-                <field name="state"/>
-                <field name="result"/>
+                <field name="state" widget="badge"
+                       decoration-success="state == 'done'"
+                       decoration-warning="state == 'waiting'"/>
+                <field name="result" widget="badge"
+                       decoration-success="result == 'pass'"
+                       decoration-danger="result == 'fail'"/>
                 <field name="write_uid" widget='many2one_avatar_user' string="判定人" optional="hide"/>
                 <field name="write_date" string="判定时间" optional="hide"/>
             </tree>
@@ -99,9 +103,9 @@
                             <group>
                                 <field name="test_results" attrs="{'readonly': [('state','=', 'done')]}"/>
                                 <field name="reason"
-                                       attrs="{'readonly': [('state','=', 'done')],'required': [('test_results','in', ['返工','报废'])]}"/>
+                                       attrs="{'readonly': [('state','=', 'done')],'required': [('test_results','in', ['返工','报废'])],'invisible': [('test_results','in', ['合格',False])]}"/>
                                 <field name="detailed_reason"
-                                       attrs="{'readonly': [('state','=', 'done')],'required': [('reason','!=', False)]}"/>
+                                       attrs="{'readonly': [('state','=', 'done')],'required': [('reason','!=', False)],'invisible': [('test_results','in', ['合格',False])]}"/>
                             </group>
                         </page>
                         <page string="2D图纸">
@@ -110,7 +114,7 @@
                         <page string="客户质量标准">
                             <!--                            <field name="quality_standard" string=""/>-->
                         </page>
-                        <page string="其他" attrs="{'readonly': [('state','=', 'done')]}">
+                        <page string="其他" attrs="{'invisible': [('state','=', 'waiting')]}">
                             <group>
                                 <field name="write_uid" widget='many2one_avatar_user' string="判定人" readonly="1"/>
                                 <field name="write_date" string="判定时间" readonly="1"/>
@@ -172,7 +176,7 @@
         <field name="name">驾驶舱</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">quality.cnc.test</field>
-        <field name="view_mode">kanban,form</field>
+        <field name="view_mode">kanban,tree,form</field>
         <field name="view_id" ref="quality_cnc_test_view_kanban"/>
         <field name="search_view_id" ref="quality_cnc_test_search"/>
         <field name="domain">[]</field>
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index cb1886a1..081807a4 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 9bd61132..4756a2c5 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path