diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 23be7d38..376101c9 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -620,12 +620,12 @@ class Manufacturing_Connect(http.Controller):
# if is_free is True:
# delivery_workpiece._delivery_avg()
# logging.info('agv下发下产线任务下发完成')
- if ret['IsComplete'] is True:
- # 向AGV任务调度下发下产线任务
- workorders = request.env['mrp.workorder'].browse(workorder_ids)
- request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
- else:
- res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
+ # if ret['IsComplete'] is True:
+ # # 向AGV任务调度下发下产线任务
+ # workorders = request.env['mrp.workorder'].browse(workorder_ids)
+ # request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
+ # else:
+ # res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
except RepeatTaskException as e:
logging.info('AGVToProduct error:%s' % e)
except Exception as e:
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 8e1f7199..964f34fe 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -241,7 +241,10 @@ class MrpProduction(models.Model):
res = {'programming_no': programming_no_str}
logging.info('res=%s:' % res)
configsettings = self.env['res.config.settings'].get_values()
- config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+ configsettings['token'] = 'ba301c9b-2216-11ef-9d97-f8b54deb92c1'
+ # configsettings['sf_secret_key'] = 'rAalgsVOhDpxIWzR'
+ # configsettings['sf_url'] = 'http://localhost:7069'
+ # config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
url = '/api/intelligent_programming/get_state'
config_url = configsettings['sf_url'] + url
ret = requests.post(config_url, json=res, data=None, headers=config_header)
@@ -808,8 +811,8 @@ class MrpProduction(models.Model):
'target': 'new',
'context': {
'default_production_id': self.id,
- 'default_programming_state': '编程中' if cloud_programming[
- 'programming_state'] != '已下发' else '已下发',
+ 'default_reprogramming_num': cloud_programming['reprogramming_num'],
+ 'default_programming_state': cloud_programming['programming_state'],
'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
}
}
diff --git a/sf_manufacturing/wizard/production_wizard.py b/sf_manufacturing/wizard/production_wizard.py
index 5700ea68..323db518 100644
--- a/sf_manufacturing/wizard/production_wizard.py
+++ b/sf_manufacturing/wizard/production_wizard.py
@@ -13,6 +13,7 @@ class ProductionWizard(models.TransientModel):
_description = '制造订单向导'
production_id = fields.Many2one('mrp.production', string='制造订单号')
+ reprogramming_num = fields.Integer('重新编程次数', default=0)
is_reprogramming = fields.Boolean(string='申请重新编程', default=False)
is_remanufacture = fields.Boolean(string='重新生成制造订单', default=True)
programming_state = fields.Selection(
diff --git a/sf_manufacturing/wizard/production_wizard_views.xml b/sf_manufacturing/wizard/production_wizard_views.xml
index 1efef116..b6619811 100644
--- a/sf_manufacturing/wizard/production_wizard_views.xml
+++ b/sf_manufacturing/wizard/production_wizard_views.xml
@@ -12,6 +12,17 @@
重新生成制造订单