增加取消订单其他功能

This commit is contained in:
mgw
2025-02-14 17:29:33 +08:00
parent 3ac096e9a7
commit e98a9a3788
2 changed files with 152 additions and 11 deletions

View File

@@ -701,14 +701,14 @@ class MrpProduction(models.Model):
config_url = configsettings['sf_url'] + url
res['token'] = configsettings['token']
# res_str = json.dumps(res)
ret = requests.post(config_url, json={}, data=res, headers=config_header)
ret = ret.json()
logging.info('fetchCNC-ret:%s' % ret)
if ret['status'] == 1:
self.write(
{'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
else:
raise UserError(ret['message'])
# ret = requests.post(config_url, json={}, data=res, headers=config_header)
# ret = ret.json()
# logging.info('fetchCNC-ret:%s' % ret)
# if ret['status'] == 1:
# self.write(
# {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
# else:
# raise UserError(ret['message'])
except Exception as e:
logging.info('fetchCNC error:%s' % e)
raise UserError("cnc程序获取编程单失败,请联系管理员")
@@ -1704,7 +1704,7 @@ class sf_programming_record(models.Model):
programming_method = fields.Selection([
('auto', '自动'),
('manual operation', '人工')], string="编程方式")
current_programming_count = fields.Integer('当前编程次数')
current_programming_count = fields.Integer('重新编程次数')
target_production_id = fields.Char('目标制造单号')
apply_time = fields.Datetime('申请时间')
send_time = fields.Datetime('下发时间')