制造订单的编程记录修改
This commit is contained in:
@@ -636,13 +636,17 @@ class MrpProduction(models.Model):
|
||||
# 增加触发时间参数
|
||||
def update_programming_state(self, trigger_time=None, reprogramming_reason=None):
|
||||
try:
|
||||
reason = ""
|
||||
manufacturing_type = None
|
||||
if self.is_scrap:
|
||||
manufacturing_type = 'scrap'
|
||||
reason = "报废"
|
||||
elif self.tool_state == '2':
|
||||
manufacturing_type = 'invalid_tool_rework'
|
||||
reason = "无效功能刀具"
|
||||
elif self.is_rework:
|
||||
manufacturing_type = 'rework'
|
||||
reason = "返工"
|
||||
res = {'programming_no': self.programming_no,
|
||||
'manufacturing_type': manufacturing_type,
|
||||
'trigger_time': trigger_time,
|
||||
@@ -657,6 +661,16 @@ class MrpProduction(models.Model):
|
||||
result = json.loads(ret['result'])
|
||||
logging.info('update_programming_state-ret:%s' % result)
|
||||
if result['status'] == 1:
|
||||
self.programming_record_ids.create({
|
||||
'number': len(self.programming_record_ids) + 1,
|
||||
'production_id': self.id,
|
||||
'reason': reason,
|
||||
'programming_method': False,
|
||||
'current_programming_count': False,
|
||||
'target_production_id': False,
|
||||
'apply_time': fields.Datetime.now(),
|
||||
'send_time': False,
|
||||
})
|
||||
self.write({'is_rework': True})
|
||||
else:
|
||||
raise UserError(ret['message'])
|
||||
@@ -787,6 +801,17 @@ class MrpProduction(models.Model):
|
||||
if ret['status'] == 1:
|
||||
self.write(
|
||||
{'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
|
||||
# 生成编程记录
|
||||
self.programming_record_ids.create({
|
||||
'number': len(self.programming_record_ids) + 1,
|
||||
'production_id': self.id,
|
||||
'reason': '首次下发',
|
||||
'programming_method': False,
|
||||
'current_programming_count': False,
|
||||
'target_production_id': False,
|
||||
'apply_time': fields.Datetime.now(),
|
||||
'send_time': False,
|
||||
})
|
||||
else:
|
||||
raise UserError(ret['message'])
|
||||
except Exception as e:
|
||||
@@ -1772,7 +1797,6 @@ class MrpProduction(models.Model):
|
||||
"""
|
||||
检查前置条件:制造订单【状态】=“待排程、待加工”,制造订单的【编程状态】=“已编程”。
|
||||
"""
|
||||
print('申请编程')
|
||||
if len(self) > 1:
|
||||
raise UserError('仅支持选择单个制造订单进行编程申请,请重新选择')
|
||||
for production in self:
|
||||
@@ -1841,6 +1865,7 @@ class sf_programming_record(models.Model):
|
||||
target_production_id = fields.Char('目标制造单号')
|
||||
apply_time = fields.Datetime('申请时间')
|
||||
send_time = fields.Datetime('下发时间')
|
||||
apply_uid = fields.Many2one('res.users', '申请人', default=lambda self: self.env.user)
|
||||
|
||||
|
||||
class sf_detection_result(models.Model):
|
||||
|
||||
Reference in New Issue
Block a user