修复coding问题,增加机床类型返回
This commit is contained in:
@@ -1154,7 +1154,7 @@ class ResMrpWorkOrder(models.Model):
|
||||
def button_finish(self):
|
||||
for record in self:
|
||||
if record.routing_type == '装夹预调':
|
||||
if not record.material_center_point and record.X_deviation_angle > 0:
|
||||
if not record.material_center_point or record.X_deviation_angle <= 0:
|
||||
raise UserError("请对前置三元检测定位参数进行计算定位")
|
||||
if not record.rfid_code and record.is_rework is False:
|
||||
raise UserError("请扫RFID码进行绑定")
|
||||
@@ -1257,15 +1257,14 @@ class ResMrpWorkOrder(models.Model):
|
||||
|
||||
# 解绑托盘
|
||||
def unbind_tray(self):
|
||||
self.write({
|
||||
self.production_id.workorder_ids.write({
|
||||
'rfid_code': False,
|
||||
'tray_serial_number': False,
|
||||
'tray_product_id': False,
|
||||
'tray_brand_id': False,
|
||||
'tray_type_id': False,
|
||||
'tray_model_id': False,
|
||||
'is_trayed': False
|
||||
})
|
||||
'is_trayed': False})
|
||||
|
||||
# 将FTP的检测报告文件下载到临时目录
|
||||
def download_reportfile_tmp(self, workorder, reportpath):
|
||||
|
||||
Reference in New Issue
Block a user