From 27da7639b22f729bdeee5356f0b320803bf014c6 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 19 Sep 2024 09:04:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E7=A0=81=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      | 10 ++++++++--
 sf_manufacturing/views/mrp_workorder_view.xml | 12 ++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 23fd8c79..98b902b3 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -603,6 +603,8 @@ class ResMrpWorkOrder(models.Model):
             print("(%.2f,%.2f)" % (x, y))
             self.material_center_point = ("(%.2f,%.2f,%.2f)" % (x, y, z))
             self.X_deviation_angle = jdz
+            logging.info("坯料中心点坐标：(%.2f,%.2f)" % (x, y))
+            logging.info("X轴偏差度数:%.2f" % jdz)
             # 将补偿值写入CNC加工工单
             workorder = self.env['mrp.workorder'].browse(self.ids)
             work = workorder.production_id.workorder_ids
@@ -1183,8 +1185,10 @@ class ResMrpWorkOrder(models.Model):
                 if not record.rfid_code and record.is_rework is False:
                     raise UserError("请扫RFID码进行绑定")
                 if record.is_rework is False:
-                    if not record.material_center_point or record.X_deviation_angle <= 0:
-                        raise UserError("坯料中心点为空或X偏差角度小于等于0")
+                    if not record.material_center_point:
+                        raise UserError("坯料中心点为空，请检查")
+                    if record.X_deviation_angle <= 0:
+                        raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
                 record.process_state = '待加工'
                 # record.write({'process_state': '待加工'})
                 record.production_id.process_state = '待加工'
@@ -1565,6 +1569,8 @@ class SfWorkOrderBarcodes(models.Model):
 
     def on_barcode_scanned(self, barcode):
         logging.info('Rfid:%s' % barcode)
+        if 'O-CMD' in barcode:
+            return None
         workorder = self.env['mrp.workorder'].browse(self.ids)
         # workorder_preset = self.env['mrp.workorder'].search(
         #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index bb451f51..d6d251fa 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -479,10 +479,10 @@
 
                     <div class="col-12 col-lg-6 o_setting_box">
                         <field name="data_state" invisible="1"/>
-                        <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
-                                attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/>
-                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"
-                                attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/>
+<!--                         <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据" -->
+<!--                                 attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/> -->
+<!--                         <button type="object" class="oe_highlight" name="getcenter" string="计算定位" -->
+<!--                                 attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/> -->
                     </div>
 
                     <group>
@@ -514,8 +514,8 @@
             </xpath>
 
             <xpath expr="//form//header" position="inside">
-                <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
-                attrs='{"invisible": [("state","!=","progress")]}'/>
+                <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
+                string="获取数据" attrs='{"invisible": [("state","!=","progress")]}'/>
             </xpath>