From 9df62129b76b83cced57791d502ab32f60491d86 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 15 Apr 2024 13:39:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=98=BE=E9=9A=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/models/mrp_workorder.py | 4 ++++
sf_manufacturing/views/mrp_workorder_view.xml | 7 +++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index c4396d38..631b9823 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -118,6 +118,8 @@ class ResMrpWorkOrder(models.Model):
inspection_user_id = fields.Many2one('res.users', string='检测人')
# 保存名称
save_name = fields.Char(string='检测文件保存名称', compute='_compute_save_name')
+ # 获取数据状态
+ data_state = fields.Boolean(string='获取数据状态', default=False)
@api.depends('production_id')
def _compute_save_name(self):
@@ -326,6 +328,8 @@ class ResMrpWorkOrder(models.Model):
else:
raise UserError('PT10点未测或数据错误')
+ self.data_state = True
+
return True
# ftp.download_file('three_check_datas.xls', '/home/ftpuser/three_check_datas.xls')
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 4c3955e5..8a76fe71 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -403,12 +403,11 @@
+
-
-
+ attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/>
+ attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/>
From 028eb18dd8edccd0527075d3e451328c9d59533e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 15 Apr 2024 21:14:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E7=82=B9?=
=?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=8C=B9=E9=85=8D=EF=BC=8C=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8A=9B=E5=87=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/models/mrp_workorder.py | 65 ++++++++++++------------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 631b9823..99061895 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -268,63 +268,63 @@ class ResMrpWorkOrder(models.Model):
# 检查是否存在PT1等键
if 'PT1' in pt_coordinates and pt_coordinates['PT1']:
- self.X1_axis = pt_coordinates['PT1'][0]['X']
- self.Y1_axis = pt_coordinates['PT1'][1]['Y']
- self.Z1_axis = pt_coordinates['PT1'][2]['Z']
+ self.X1_axis = pt_coordinates['PT3'][0]['X']
+ self.Y1_axis = pt_coordinates['PT3'][1]['Y']
+ self.Z1_axis = pt_coordinates['PT3'][2]['Z']
else:
raise UserError('PT1点未测或数据错误')
if 'PT2' in pt_coordinates and pt_coordinates['PT2']:
- self.X2_axis = pt_coordinates['PT2'][0]['X']
- self.Y2_axis = pt_coordinates['PT2'][1]['Y']
- self.Z2_axis = pt_coordinates['PT2'][2]['Z']
+ self.X2_axis = pt_coordinates['PT4'][0]['X']
+ self.Y2_axis = pt_coordinates['PT4'][1]['Y']
+ self.Z2_axis = pt_coordinates['PT4'][2]['Z']
else:
raise UserError('PT2点未测或数据错误')
if 'PT3' in pt_coordinates and pt_coordinates['PT3']:
- self.X3_axis = pt_coordinates['PT3'][0]['X']
- self.Y3_axis = pt_coordinates['PT3'][1]['Y']
- self.Z3_axis = pt_coordinates['PT3'][2]['Z']
+ self.X3_axis = pt_coordinates['PT5'][0]['X']
+ self.Y3_axis = pt_coordinates['PT5'][1]['Y']
+ self.Z3_axis = pt_coordinates['PT5'][2]['Z']
else:
raise UserError('PT3点未测或数据错误')
if 'PT4' in pt_coordinates and pt_coordinates['PT4']:
- self.X4_axis = pt_coordinates['PT4'][0]['X']
- self.Y4_axis = pt_coordinates['PT4'][1]['Y']
- self.Z4_axis = pt_coordinates['PT4'][2]['Z']
+ self.X4_axis = pt_coordinates['PT6'][0]['X']
+ self.Y4_axis = pt_coordinates['PT6'][1]['Y']
+ self.Z4_axis = pt_coordinates['PT6'][2]['Z']
else:
raise UserError('PT4点未测或数据错误')
if 'PT5' in pt_coordinates and pt_coordinates['PT5']:
- self.X5_axis = pt_coordinates['PT5'][0]['X']
- self.Y5_axis = pt_coordinates['PT5'][1]['Y']
- self.Z5_axis = pt_coordinates['PT5'][2]['Z']
+ self.X5_axis = pt_coordinates['PT7'][0]['X']
+ self.Y5_axis = pt_coordinates['PT7'][1]['Y']
+ self.Z5_axis = pt_coordinates['PT7'][2]['Z']
else:
raise UserError('PT5点未测或数据错误')
if 'PT6' in pt_coordinates and pt_coordinates['PT6']:
- self.X6_axis = pt_coordinates['PT6'][0]['X']
- self.Y6_axis = pt_coordinates['PT6'][1]['Y']
- self.Z6_axis = pt_coordinates['PT6'][2]['Z']
+ self.X6_axis = pt_coordinates['PT8'][0]['X']
+ self.Y6_axis = pt_coordinates['PT8'][1]['Y']
+ self.Z6_axis = pt_coordinates['PT8'][2]['Z']
else:
raise UserError('PT6点未测或数据错误')
if 'PT7' in pt_coordinates and pt_coordinates['PT7']:
- self.X7_axis = pt_coordinates['PT7'][0]['X']
- self.Y7_axis = pt_coordinates['PT7'][1]['Y']
- self.Z7_axis = pt_coordinates['PT7'][2]['Z']
+ self.X7_axis = pt_coordinates['PT9'][0]['X']
+ self.Y7_axis = pt_coordinates['PT9'][1]['Y']
+ self.Z7_axis = pt_coordinates['PT9'][2]['Z']
else:
raise UserError('PT7点未测或数据错误')
if 'PT8' in pt_coordinates and pt_coordinates['PT8']:
- self.X8_axis = pt_coordinates['PT8'][0]['X']
- self.Y8_axis = pt_coordinates['PT8'][1]['Y']
- self.Z8_axis = pt_coordinates['PT8'][2]['Z']
+ self.X8_axis = pt_coordinates['PT10'][0]['X']
+ self.Y8_axis = pt_coordinates['PT10'][1]['Y']
+ self.Z8_axis = pt_coordinates['PT10'][2]['Z']
else:
raise UserError('PT8点未测或数据错误')
if 'PT9' in pt_coordinates and pt_coordinates['PT9']:
- self.X9_axis = pt_coordinates['PT9'][0]['X']
- self.Y9_axis = pt_coordinates['PT9'][1]['Y']
- self.Z9_axis = pt_coordinates['PT9'][2]['Z']
+ self.X9_axis = pt_coordinates['PT1'][0]['X']
+ self.Y9_axis = pt_coordinates['PT1'][1]['Y']
+ self.Z9_axis = pt_coordinates['PT1'][2]['Z']
else:
raise UserError('PT9点未测或数据错误')
if 'PT10' in pt_coordinates and pt_coordinates['PT10']:
- self.X10_axis = pt_coordinates['PT10'][0]['X']
- self.Y10_axis = pt_coordinates['PT10'][1]['Y']
- self.Z10_axis = pt_coordinates['PT10'][2]['Z']
+ self.X10_axis = pt_coordinates['PT2'][0]['X']
+ self.Y10_axis = pt_coordinates['PT2'][1]['Y']
+ self.Z10_axis = pt_coordinates['PT2'][2]['Z']
else:
raise UserError('PT10点未测或数据错误')
@@ -387,8 +387,9 @@ class ResMrpWorkOrder(models.Model):
work.compensation_value_x = eval(self.material_center_point)[0]
work.compensation_value_y = eval(self.material_center_point)[1]
workorder.button_finish()
- except:
- raise UserError("参数计算有误")
+ except Exception as e:
+ # 重新抛出捕获到的异常信息
+ raise UserError(str(e))
def button_workpiece_delivery(self):
if self.routing_type == '装夹预调':