mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
李广豪
2022-09-09 23:17:39 +08:00
parent 8643ca11d7 5711a2acf6
commit 5e54011371
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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