jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source
This commit is contained in:
jinling.yang
2024-08-21 16:54:11 +08:00
parent f64c21dacd 2a45cdd53a
commit 335c79e618
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/controllers/controllers.py
View File

@@ -667,7 +667,7 @@ class Manufacturing_Connect(http.Controller):
logging.info('AGVDownProduct error:%s' % e) logging.info('AGVDownProduct error:%s' % e)
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
@http.route('/AutoDeviceApi/GetAgvStationState', type='json', auth='none', methods=['GET', 'POST'], csrf=False, @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*") cors="*")
def AGVStationState(self, **kw): def AGVStationState(self, **kw):
""" """

2
sf_manufacturing/models/agv_scheduling.py
View File

@@ -226,7 +226,7 @@ class AgvScheduling(models.Model):
if rec.state != '待下发': if rec.state != '待下发':
return False return False
_logger.info('AGV任务调度：下发调度任务，路线为%s' % agv_task_route) _logger.info('AGV任务调度：下发调度任务，路线为%s' % agv_task_route)
# rec._delivery_avg() rec._delivery_avg()
rec.state = '配送中' rec.state = '配送中'
rec.task_delivery_time = fields.Datetime.now() rec.task_delivery_time = fields.Datetime.now()
rec.site_state = '空闲' rec.site_state = '空闲'