jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测点位置匹配，优化错误抛出方式

Browse Source
This commit is contained in:
mgw
2024-04-15 21:14:12 +08:00
parent 9df62129b7
commit 028eb18dd8
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
sf_manufacturing/models/mrp_workorder.py
View File

@@ -268,63 +268,63 @@ class ResMrpWorkOrder(models.Model):
# 检查是否存在PT1等键 # 检查是否存在PT1等键
if 'PT1' in pt_coordinates and pt_coordinates['PT1']: if 'PT1' in pt_coordinates and pt_coordinates['PT1']:
self.X1_axis = pt_coordinates['PT1'][0]['X'] self.X1_axis = pt_coordinates['PT3'][0]['X']
self.Y1_axis = pt_coordinates['PT1'][1]['Y'] self.Y1_axis = pt_coordinates['PT3'][1]['Y']
self.Z1_axis = pt_coordinates['PT1'][2]['Z'] self.Z1_axis = pt_coordinates['PT3'][2]['Z']
else: else:
raise UserError('PT1点未测或数据错误') raise UserError('PT1点未测或数据错误')
if 'PT2' in pt_coordinates and pt_coordinates['PT2']: if 'PT2' in pt_coordinates and pt_coordinates['PT2']:
self.X2_axis = pt_coordinates['PT2'][0]['X'] self.X2_axis = pt_coordinates['PT4'][0]['X']
self.Y2_axis = pt_coordinates['PT2'][1]['Y'] self.Y2_axis = pt_coordinates['PT4'][1]['Y']
self.Z2_axis = pt_coordinates['PT2'][2]['Z'] self.Z2_axis = pt_coordinates['PT4'][2]['Z']
else: else:
raise UserError('PT2点未测或数据错误') raise UserError('PT2点未测或数据错误')
if 'PT3' in pt_coordinates and pt_coordinates['PT3']: if 'PT3' in pt_coordinates and pt_coordinates['PT3']:
self.X3_axis = pt_coordinates['PT3'][0]['X'] self.X3_axis = pt_coordinates['PT5'][0]['X']
self.Y3_axis = pt_coordinates['PT3'][1]['Y'] self.Y3_axis = pt_coordinates['PT5'][1]['Y']
self.Z3_axis = pt_coordinates['PT3'][2]['Z'] self.Z3_axis = pt_coordinates['PT5'][2]['Z']
else: else:
raise UserError('PT3点未测或数据错误') raise UserError('PT3点未测或数据错误')
if 'PT4' in pt_coordinates and pt_coordinates['PT4']: if 'PT4' in pt_coordinates and pt_coordinates['PT4']:
self.X4_axis = pt_coordinates['PT4'][0]['X'] self.X4_axis = pt_coordinates['PT6'][0]['X']
self.Y4_axis = pt_coordinates['PT4'][1]['Y'] self.Y4_axis = pt_coordinates['PT6'][1]['Y']
self.Z4_axis = pt_coordinates['PT4'][2]['Z'] self.Z4_axis = pt_coordinates['PT6'][2]['Z']
else: else:
raise UserError('PT4点未测或数据错误') raise UserError('PT4点未测或数据错误')
if 'PT5' in pt_coordinates and pt_coordinates['PT5']: if 'PT5' in pt_coordinates and pt_coordinates['PT5']:
self.X5_axis = pt_coordinates['PT5'][0]['X'] self.X5_axis = pt_coordinates['PT7'][0]['X']
self.Y5_axis = pt_coordinates['PT5'][1]['Y'] self.Y5_axis = pt_coordinates['PT7'][1]['Y']
self.Z5_axis = pt_coordinates['PT5'][2]['Z'] self.Z5_axis = pt_coordinates['PT7'][2]['Z']
else: else:
raise UserError('PT5点未测或数据错误') raise UserError('PT5点未测或数据错误')
if 'PT6' in pt_coordinates and pt_coordinates['PT6']: if 'PT6' in pt_coordinates and pt_coordinates['PT6']:
self.X6_axis = pt_coordinates['PT6'][0]['X'] self.X6_axis = pt_coordinates['PT8'][0]['X']
self.Y6_axis = pt_coordinates['PT6'][1]['Y'] self.Y6_axis = pt_coordinates['PT8'][1]['Y']
self.Z6_axis = pt_coordinates['PT6'][2]['Z'] self.Z6_axis = pt_coordinates['PT8'][2]['Z']
else: else:
raise UserError('PT6点未测或数据错误') raise UserError('PT6点未测或数据错误')
if 'PT7' in pt_coordinates and pt_coordinates['PT7']: if 'PT7' in pt_coordinates and pt_coordinates['PT7']:
self.X7_axis = pt_coordinates['PT7'][0]['X'] self.X7_axis = pt_coordinates['PT9'][0]['X']
self.Y7_axis = pt_coordinates['PT7'][1]['Y'] self.Y7_axis = pt_coordinates['PT9'][1]['Y']
self.Z7_axis = pt_coordinates['PT7'][2]['Z'] self.Z7_axis = pt_coordinates['PT9'][2]['Z']
else: else:
raise UserError('PT7点未测或数据错误') raise UserError('PT7点未测或数据错误')
if 'PT8' in pt_coordinates and pt_coordinates['PT8']: if 'PT8' in pt_coordinates and pt_coordinates['PT8']:
self.X8_axis = pt_coordinates['PT8'][0]['X'] self.X8_axis = pt_coordinates['PT10'][0]['X']
self.Y8_axis = pt_coordinates['PT8'][1]['Y'] self.Y8_axis = pt_coordinates['PT10'][1]['Y']
self.Z8_axis = pt_coordinates['PT8'][2]['Z'] self.Z8_axis = pt_coordinates['PT10'][2]['Z']
else: else:
raise UserError('PT8点未测或数据错误') raise UserError('PT8点未测或数据错误')
if 'PT9' in pt_coordinates and pt_coordinates['PT9']: if 'PT9' in pt_coordinates and pt_coordinates['PT9']:
self.X9_axis = pt_coordinates['PT9'][0]['X'] self.X9_axis = pt_coordinates['PT1'][0]['X']
self.Y9_axis = pt_coordinates['PT9'][1]['Y'] self.Y9_axis = pt_coordinates['PT1'][1]['Y']
self.Z9_axis = pt_coordinates['PT9'][2]['Z'] self.Z9_axis = pt_coordinates['PT1'][2]['Z']
else: else:
raise UserError('PT9点未测或数据错误') raise UserError('PT9点未测或数据错误')
if 'PT10' in pt_coordinates and pt_coordinates['PT10']: if 'PT10' in pt_coordinates and pt_coordinates['PT10']:
self.X10_axis = pt_coordinates['PT10'][0]['X'] self.X10_axis = pt_coordinates['PT2'][0]['X']
self.Y10_axis = pt_coordinates['PT10'][1]['Y'] self.Y10_axis = pt_coordinates['PT2'][1]['Y']
self.Z10_axis = pt_coordinates['PT10'][2]['Z'] self.Z10_axis = pt_coordinates['PT2'][2]['Z']
else: else:
raise UserError('PT10点未测或数据错误') raise UserError('PT10点未测或数据错误')
@@ -387,8 +387,9 @@ class ResMrpWorkOrder(models.Model):
work.compensation_value_x = eval(self.material_center_point)[0] work.compensation_value_x = eval(self.material_center_point)[0]
work.compensation_value_y = eval(self.material_center_point)[1] work.compensation_value_y = eval(self.material_center_point)[1]
workorder.button_finish() workorder.button_finish()
except: except Exception as e:
raise UserError("参数计算有误") # 重新抛出捕获到的异常信息
raise UserError(str(e))
def button_workpiece_delivery(self): def button_workpiece_delivery(self):
if self.routing_type == '装夹预调': if self.routing_type == '装夹预调':