diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/CurrTaskController.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/CurrTaskController.java
index e00049b..820812a 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/CurrTaskController.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/CurrTaskController.java
@@ -132,7 +132,7 @@ public class CurrTaskController extends BaseController {
             //currTaskById.setSheetNo(sheetNo);
             //currTaskService.updateCurrTaskById(currTaskById);
             //生成详细任务中的检验结果数据在apms推送生产单结果时创建
-            return successful(0,"创建成功，任务添加至等待执行队列。","");
+            return successful(0,"创建成功，任务添加至等待执行队列。详情请在订单加工管理下当前任务列表查看","");
         //}
         //else
         //{
@@ -256,7 +256,7 @@ public class CurrTaskController extends BaseController {
             //}
             //i++;
         }
-        return successful(0,"操作成功,任务加入待执行队列","");
+        return successful(0,"操作成功,任务加入待执行队列,详情请在订单加工管理下当前任务列表查看！","");
     }
 
     @PostMapping(value = "mainCurrentTaskNow")
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java
index b0751b5..40f5e6f 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java
@@ -165,7 +165,7 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
         BeanUtils.copyProperties(byId, build);
         R<OrderInfoVo> info = getTaskInfoByIdenCardNum(build.getIdenCardNum());
         build.setFinishWeight(info.getData().getFinishWeight());
-        build.setFinishQuantity(info.getData().getQuantity());
+        build.setFinishQuantity(info.getData().getFinishQuantity());
         build.setWaitWeight(info.getData().getWaitWeight());
         build.setWaitQuantity(info.getData().getWaitQuantity());
         build.setReProcessQuantity(info.getData().getReProcessQuantity());
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
index a27bc5e..9fe913d 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
@@ -1390,9 +1390,9 @@ public class AsynRunTaskService extends BaseService {
                 //获取RGV1当前位置
                 Double rgv1CurrPosition = RGVCurrPosition(1);
                 //两辆小车是否冲突
-                Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, currTask.getStartPosition(), currTask.getTargetPosition(), rgv1CurrPosition);
+                Boolean conflictBoolean = taskDistanceUtils.conflictForVehicle(vehicleId, startPosition, targetPosition, rgv1CurrPosition);
                 if (conflictBoolean){
-                    Integer status = moveRgv(1, currTaskId,  39,0);
+                    Integer status = moveRgv(1, currTaskId,  12,0);
                     logger.info(status.toString());
                     if (status!=1){
                         logger.info("===执行任务："+currTaskId+" 时车辆位置冲突，执行车辆位移任务，车辆"+anotherVehicleId+"移动到点位12，执行失败===");