From 79a753b6090ec8d726829bcae9f4de0c629f11b1 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 15 Oct 2024 11:55:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=93=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_quality/views/quality_cnc_test_view.xml | 56 +++++++++-------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/sf_quality/views/quality_cnc_test_view.xml b/sf_quality/views/quality_cnc_test_view.xml
index 4a6008ae..a9bceffe 100644
--- a/sf_quality/views/quality_cnc_test_view.xml
+++ b/sf_quality/views/quality_cnc_test_view.xml
@@ -54,7 +54,7 @@
         <field name="context">{ 'search_default_filter_waiting':1}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
-                请先创建一个加工质检单
+                暂无加工质检单
             </p>
         </field>
     </record>
@@ -125,44 +125,33 @@
         <field name="name">quality.cnc.test.view.kanban</field>
         <field name="model">quality.cnc.test</field>
         <field name="arch" type="xml">
-            <kanban class="oe_background_grey o_kanban_dashboard o_quality_kanban" create="0">
+            <kanban sample="1" class="o_kanban_product_template">
                 <templates>
                     <t t-name="kanban-box">
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click">
-                                <div class="add_flex">
-                                    <div class="o_kanban_card_header">
-                                        <div class="o_kanban_card_header_title">
+                        <div class="oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_kanban_details">
+                                <div class="o_kanban_record_top mb-0">
+                                    <div class="o_kanban_record_headings">
+                                        <strong class="o_kanban_record_title">
                                             <field name="name"/>
-                                        </div>
-                                    </div>
-                                    <!-- 内容 -->
-                                    <div class="container o_kanban_card_content">
-                                        <div>
-                                            <field name="production_id"/>
-                                        </div>
-                                        <div>
-                                            <field name="processing_panel"/>
-                                        </div>
-                                        <div>
-                                            <field name="state"
-                                                   widget="label_selection"
-                                                   options="{'classes': {'waiting': 'warning', 'done': 'success'}}"/>
-                                        </div>
+                                        </strong>
+                                    </div>
+                                </div>
+                                <div>
+                                    <div>
+                                        <field name="production_id"/>
+                                    </div>
+                                    <div>
+                                        <field name="processing_panel"/>
+                                    </div>
+                                    <div>
+                                        <field name="test_results"
+                                               widget="label_selection"
+                                               options="{'classes': {'合格': 'success', '返工': 'warning', '报废': 'danger'}}"/>
                                     </div>
                                 </div>
-                                <!--                                <div class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click-->
-                                <!--                        ">-->
-                                <!--                                    <div t-attf-class="#{record.result.raw_value == 'pass' ? 'color_1' : ''}"></div>-->
-                                <!--                                    <div t-attf-class="#{record.result.raw_value == 'fail' ? 'color_2' : ''}"></div>-->
-                                <!--                                    <p class="o_kanban_record_bottom"-->
-                                <!--                                       t-attf-class="#{record.result.raw_value == 'pass' ? 'font_color_1' : ''}-->
-                                <!--                        #{record.state.result == 'fail' ? 'font_color_2' : ''}}">-->
-                                <!--                                        <field name="result"/>-->
-                                <!--                                    </p>-->
-                                <!--                                </div>-->
                             </div>
-                        </t>
+                        </div>
                     </t>
                 </templates>
             </kanban>
@@ -186,6 +175,7 @@
         <field name="view_id" ref="quality_cnc_test_view_kanban"/>
         <field name="search_view_id" ref="quality_cnc_test_search"/>
         <field name="domain">[]</field>
+        <field name="context">{ 'search_default_filter_waiting':1}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 暂无加工质检单

From 939f3d58f434e377ecac1360b4ab8fdc3e29ea84 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Wed, 16 Oct 2024 11:41:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B0=E5=A2=9E2D?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=9B=BE=E7=BA=B8,=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm_management/views/product_template_management_view.xml | 2 ++
 sf_manufacturing/models/product_template.py                  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index f53c5e2b..69c1a8b0 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -16,6 +16,8 @@
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
                     <field name='part_number' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
+                    <field name='machining_drawings' attrs="{'invisible': [('categ_type', '!=', '成品')]}" widget="image"/>
+                    <field name='quality_standard' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                     <field name='manual_quotation' attrs="{'invisible':[('upload_model_file', '=', [])]}"/>
                     <field name="upload_model_file"
                            widget="many2many_binary"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 7f4dc2b8..8e81d076 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -774,6 +774,8 @@ class ResProductMo(models.Model):
     # bfm下单
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
     part_number = fields.Char(string='零件图号', readonly=True)
+    machining_drawings = fields.Binary('2D加工图纸', readonly=True)
+    quality_standard = fields.Binary('质检标准', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -873,6 +875,8 @@ class ResProductMo(models.Model):
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',
             'active': True,
+            'machining_drawings':  '' if not item['machining_drawings'] else base64.b64decode(item['machining_drawings']),
+            'quality_standard':  '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
         }
         tax_id = self.env['account.tax'].sudo().search(
             [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])