Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java

@@ -186,8 +186,11 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
                     }else if (currTask1.getIsCache()==1){
                         nowStep=currTask.getLocationName();
                     }
-                    if (currTaskInfoVo.getInStockInfoVoList().size()>0){
-                        nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName();
+                    if (currTaskInfoVo.getInStockInfoVoList()!=null){
+                        if (currTaskInfoVo.getCurrTaskVoList().size()>0){
+
+                            nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName();
+                        }
                     }
                     allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
                 }

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java

@@ -286,6 +286,7 @@ public class AsynRunTaskService extends BaseService {
         CurrTask currTask = currTaskServiceBiz.getById(currTaskId);
         //Location location = locationServiceBiz.getById(currTask.getLocationId());
         VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId);
+        KilnInfo kilnInfo = kilnInfoServiceBiz.getById(currTask.getKilnId());
         //检查车辆是否冲突，冲突则避让
         rgvStatus(vehicleId, currTask,currTask.getStartPosition(),location.getCode());
         //新建一条执行任务的关系表存放任务执行信息,终点为缓存区空闲库位
@@ -305,7 +306,7 @@ public class AsynRunTaskService extends BaseService {
         inStockInfo.setTaskId(currTask.getId());
         inStockInfo.setTaskCode(currTask.getTaskCode());
         inStockInfo.setKilnId(currTask.getKilnId());
-        inStockInfo.setKilnName(currTask.getKilnName());
+        inStockInfo.setKilnName(kilnInfo.getKilnName());
         inStockInfo.setLocationId(location.getId());
         inStockInfo.setLocationName(location.getLocationNameAlias());
         inStockInfo.setType(1);

6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java

@@ -135,17 +135,22 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
     /**
      * 是否自动执行：	0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务
      */
-    @TableField("is_auto")
+    @ApiModelProperty("is_auto")
     private Integer isAuto;
 
     /**
      * 任务流程ID，关联流程表：t_auto_exe_task
      */
-    @TableField("auto_exe_task_id")
+    @ApiModelProperty("auto_exe_task_id")
     private Long autoExeTaskId;
     /**
      * currid
      */
-    @TableField("auto_exe_task_id")
+    @ApiModelProperty("auto_exe_task_id")
     private Long taskId;
+    /**
+     * 工艺id
+     */
+    @ApiModelProperty("auto_exe_task_id")
+    private Long craftCodeId;
 }