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

sf_manufacturing/controllers/controllers.py

@@ -667,7 +667,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('AGVDownProduct error:%s' % e)
         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="*")
     def AGVStationState(self, **kw):
         """

sf_manufacturing/models/agv_scheduling.py

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