From 4609ec442aa395fa1285f397f0ff07e6a457155d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 20 Sep 2024 16:50:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=80=E5=85=B7=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=E4=BC=98=E5=8C=96=EF=BC=8C=E6=95=B4=E4=BD=93=E5=BC=8F?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E4=BA=A7=E5=93=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9B=E5=88=80=E5=85=B7=E5=90=8C=E6=AD=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=9B2=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BB=84=E8=A3=85=E5=8D=95=E6=89=AB=E6=8F=8F=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E7=BB=84=E8=A3=85=E5=92=8C=E8=8E=B7=E5=8F=96=E6=B5=8B?=
 =?UTF-8?q?=E9=87=8F=E5=80=BC=E5=8A=9F=E8=83=BD=EF=BC=9B=E7=BB=84=E8=A3=85?=
 =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=8D=A2=E7=89=A9=E6=96=99=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py                      | 3 ++-
 sf_base/static/src/js/custom_barcode_handlers.js           | 1 +
 sf_base/views/tool_basic_param.xml                         | 3 +++
 sf_base/views/tool_views.xml                               | 1 +
 .../views/product_template_management_view.xml             | 2 ++
 sf_manufacturing/models/product_template.py                | 6 ++++--
 sf_mrs_connect/models/sync_common.py                       | 4 ++++
 sf_tool_management/models/base.py                          | 4 +++-
 sf_tool_management/models/stock.py                         | 4 ++--
 sf_tool_management/views/stock.xml                         | 7 +++++--
 sf_tool_management/views/tool_base_views.xml               | 4 ++--
 11 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index f67e69fd..5bd597ae 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -22,7 +22,8 @@ class ToolMaterialsBasicParameters(models.Model):
     handle_diameter = fields.Float('柄部直径(mm)')
     handle_length = fields.Float('柄部长度(mm)')
     blade_tip_diameter = fields.Integer('刀尖直径(mm)')
-    blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角度)', size=20)
+    blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    tip_r_size = fields.Float('刀尖R角(mm)')
     blade_tip_taper = fields.Integer('刀尖锥度(°)')
     blade_diameter = fields.Float('刃部直径(mm)')
     blade_length = fields.Float('刃部长度(mm)')
diff --git a/sf_base/static/src/js/custom_barcode_handlers.js b/sf_base/static/src/js/custom_barcode_handlers.js
index 220d2cbb..18db64e7 100644
--- a/sf_base/static/src/js/custom_barcode_handlers.js
+++ b/sf_base/static/src/js/custom_barcode_handlers.js
@@ -30,6 +30,7 @@ patch(barcodeGenericHandlers, "start", {
             "O-CMD.PAGER-FIRST": () => updatePager("first"),
             "O-CMD.PAGER-LAST": () => updatePager("last"),
             "O-CMD.CONFIRM": () => customClickOnButton(".jikimo_button_confirm"),
+            "O-CMD.FLUSHED": () => customClickOnButton(".jikimo_button_flushed"),
         };
 
         barcode.bus.addEventListener("barcode_scanned", (ev) => {
diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
index d138eeb8..06bb80bb 100644
--- a/sf_base/views/tool_basic_param.xml
+++ b/sf_base/views/tool_basic_param.xml
@@ -15,6 +15,7 @@
                     <field name="handle_length"/>
                     <field name="blade_tip_diameter"/>
                     <field name="blade_tip_working_size"/>
+                    <field name="tip_r_size"/>
                     <field name="blade_tip_taper"/>
                     <field name="blade_diameter"/>
                     <field name="blade_length"/>
@@ -95,6 +96,7 @@
                     <field name="handle_length"/>
                     <field name="blade_tip_diameter"/>
                     <field name="blade_tip_working_size"/>
+                    <field name="tip_r_size"/>
                     <field name="blade_tip_taper"/>
                     <field name="blade_diameter"/>
                     <field name="blade_length"/>
@@ -139,6 +141,7 @@
                             </group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                 <field name="blade_tip_working_size"/>
+                                <field name="tip_r_size"/>
                                 <field name="blade_tip_diameter" class="diameter"/>
                                 <field name="blade_tip_taper"/>
                                 <field name="blade_helix_angle"/>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index b90d1a5c..8b429f89 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -222,6 +222,7 @@
                                         <field name="handle_diameter" class="diameter"/>
                                         <field name="handle_length"/>
                                         <field name="blade_tip_working_size" class="du"/>
+                                        <field name="tip_r_size"/>
                                         <field name="blade_tip_diameter" class="diameter"/>
                                         <field name="blade_tip_taper" class="du"/>
                                         <field name="blade_helix_angle" class="du"/>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index caefcb34..f53c5e2b 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -191,6 +191,8 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_working_size"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_blade_tip_r_size"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 071f1167..48cabaf7 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -90,7 +90,8 @@ class ResProductMo(models.Model):
     cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
     cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
     cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    cutting_tool_blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    cutting_tool_blade_tip_r_size = fields.Float('刀尖R角(mm)')
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image',
                                          '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
@@ -236,7 +237,8 @@ class ResProductMo(models.Model):
                 self.cutting_tool_blade_tip_diameter = self.specification_id.blade_tip_diameter
                 self.cutting_tool_blade_tip_taper = self.specification_id.blade_tip_taper
                 self.cutting_tool_blade_helix_angle = self.specification_id.blade_helix_angle
-                self.cutting_tool_blade_tip_working_size = self.specification_id.blade_tip_working_size
+                self.cutting_tool_blade_tip_working_size = self.specification_id.tip_r_size
+                self.cutting_tool_blade_tip_r_size = self.specification_id.blade_tip_working_size
                 self.cutting_tool_pitch = self.specification_id.pitch
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_blade_depth = self.specification_id.blade_depth
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index e106bbf2..25d30333 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -2438,6 +2438,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2459,6 +2460,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2789,6 +2791,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2810,6 +2813,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index d9ab1536..cbdc1d22 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -357,6 +357,8 @@ class FunctionalToolAssembly(models.Model):
         """
         智能工厂组装单处扫码校验刀具物料
         """
+        if 'O-CMD' in barcode:
+            return ''
         for record in self:
             tool_assembly_id = self.env['sf.functional.tool.assembly'].browse(self.ids)
             lot_ids = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
@@ -835,7 +837,7 @@ class FunctionalToolAssembly(models.Model):
 
         if options == '刀柄+整体式刀具':
             if not integral_ids:
-                raise ValidationError('功能刀具清单的BOM未配置[刀柄]信息，请先配置BOM再开始组装！')
+                raise ValidationError('功能刀具清单的BOM未配置[整体式刀具]信息，请先配置BOM再开始组装！')
             return {'options': options, 'handle_ids': handle_ids, 'integral_ids': integral_ids}
         elif options == '刀柄+刀杆+刀片':
             if not blade_ids:
diff --git a/sf_tool_management/models/stock.py b/sf_tool_management/models/stock.py
index 32719520..9f0d9f82 100644
--- a/sf_tool_management/models/stock.py
+++ b/sf_tool_management/models/stock.py
@@ -298,8 +298,8 @@ class SfShelfLocationLot(models.Model):
     brand_id = fields.Many2one('sf.machine.brand', '品牌', related='product_id.brand_id')
 
     cutting_tool_blade_diameter = fields.Float('刃部直径(mm)', related='product_id.cutting_tool_blade_diameter')
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖R角(mm)',
-                                                      related='product_id.cutting_tool_blade_tip_working_size')
+    cutting_tool_blade_tip_working_size = fields.Float('刀尖R角(mm)',
+                                                       related='product_id.cutting_tool_blade_tip_r_size')
     cutting_tool_blade_radius = fields.Char('刀尖圆弧半径(mm)',
                                             related='product_id.cutting_tool_blade_tip_circular_arc_radius')
     cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)',
diff --git a/sf_tool_management/views/stock.xml b/sf_tool_management/views/stock.xml
index c0942282..60e94886 100644
--- a/sf_tool_management/views/stock.xml
+++ b/sf_tool_management/views/stock.xml
@@ -18,8 +18,7 @@
         <field name="arch" type="xml">
             <tree create="0" export_xlsx="0" delete="0">
                 <header>
-                    <button string="确认" name="set_tool_material" type="object"
-                            class="treeHeaderBtn"/>
+                    <button string="确认" name="set_tool_material" type="object" class="treeHeaderBtn"/>
                 </header>
                 <field name="name"/>
                 <field name="cutting_tool_type_id"/>
@@ -62,6 +61,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
@@ -86,6 +86,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
@@ -111,6 +112,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
@@ -135,6 +137,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 2a68ce8e..130936d8 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -478,9 +478,9 @@
                                 class="btn-primary"/>
                         <button string="确认组装" name="functional_tool_assembly" type="object"
                                 attrs="{'invisible': [('assemble_status', 'not in', ['01'])]}"
-                                class="btn-primary"/>
+                                class="btn-primary jikimo_button_confirm"/>
                         <button name="get_tool_preset_parameter" string="获取测量值"
-                                type="object" class="btn-primary"
+                                type="object" class="btn-primary jikimo_button_flushed"
                                 attrs="{'invisible': [('assemble_status', 'in', ['0','1','2'])]}"
                         />
                         <field name="assemble_status" widget="statusbar" statusbar_visible="0,01,1"/>