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 == '装夹预调':