Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -109,11 +109,19 @@ class WorkpieceDeliveryWizard(models.TransientModel):
             )
             # 如果关联了工件配送单，则修改状态为已下发
             if self.delivery_ids:
-                self.delivery_ids.write({
+                val = {
                     'status': '已下发',
                     'agv_scheduling_id': scheduling.id,
                     'feeder_station_start_id': scheduling.start_site_id.id,
-                })
+                }
+                # 如果agv任务已经下发，则修改工件配送单信息
+                if scheduling.state == '配送中':
+                    val.update({
+                        'feeder_station_destination_id': scheduling.end_site_id.id,
+                        'route_id': scheduling.agv_route_id.id,
+                        'task_delivery_time': fields.Datetime.now()
+                    })
+                self.delivery_ids.write(val)
 
             # 如果是解除装夹工单，则需要处理工单逻辑
             for item in self.workorder_ids: