rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -242,7 +242,7 @@ } Task task = new Task(); task.setTaskCode(ruleCode) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setTaskType(TaskType.TASK_TYPE_EMPTY_IN.type) .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh待修改 .setTargLoc(targetLoc) rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -274,7 +274,7 @@ if (Cools.isEmpty(loc)){ throw new CoolException("未查询到符合条件的托盘"); } //生成盘点任务参数 //生成任务参数 LocToTaskParams locToTaskParams = new LocToTaskParams(); locToTaskParams.setType(Constants.TASK_TYPE_OUT_STOCK_EMPTY) .setSiteNo(basStation.getStationName()) rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -31,6 +31,8 @@ import com.vincent.rsf.server.manager.service.impl.LocServiceImpl; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.manager.enums.LocStsType; import com.vincent.rsf.server.system.entity.User; import com.vincent.rsf.server.system.service.impl.UserServiceImpl; import com.vincent.rsf.server.system.utils.SerialRuleUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -82,6 +84,8 @@ private RestTemplate restTemplate; @Autowired private RemotesInfoProperties.RcsApi rcsApi; @Autowired private UserServiceImpl userService; @Override @@ -201,7 +205,7 @@ String targetSite, String sourceSiteNo, Long loginUserId) { Task task = new Task(); task.setTaskCode(ruleCode) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setTaskType(TaskType.TASK_TYPE_IN.type) .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.val) .setTargLoc(targetLoc) @@ -1011,7 +1015,13 @@ GenerateTaskParams taskParams = new GenerateTaskParams(); taskParams.setWaitPakins(waitPakins) .setSiteId(basStation.getId()); R r = taskService.generateTasksWcs(taskParams, 111L,params.getRowList());//lsh待修改 WCS用户信息 User wcs = userService.getByUsername("wcs", 1L); Long wcsId = 1111L; if (!Cools.isEmpty(wcs)) { wcsId = wcs.getId(); } R r = taskService.generateTasksWcs(taskParams, wcsId,params.getRowList()); if (r.get("msg").equals("任务生成完毕！")) { one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode())); InTaskWcsReportParam inTaskWcsReportParam = new InTaskWcsReportParam(); @@ -1075,7 +1085,7 @@ } if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_COMPLETE.event)){ if (!Cools.isEmpty(one)) { one.setTaskStatus(TaskStsType.GENERATE_IN.id); one.setTaskStatus(TaskStsType.MISSION_INITIAL.id); one.setOrgSite(one.getTargSite()); if (!taskService.updateById(one)) { // throw new CoolException("完成任务失败"); rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
@@ -380,7 +380,7 @@ continue; } String shallowLoc = LocUtils.getDeepLoc(locMast1.getCode()); if ((ioType == TaskStsType.GENERATE_IN.id && deviceBind.getBeSimilar().equals("1"))) { if ((ioType == TaskStsType.MISSION_INITIAL.id && deviceBind.getBeSimilar().equals("1"))) { //相似物料打开，判断深库位有没有货，没货就放深库位，有货就不操作 Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>() .eq(Loc::getCode, shallowLoc) rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
@@ -51,7 +51,7 @@ public void genReCheck() { List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>() .select(Task::getId) .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id) .eq(Task::getTaskStatus, TaskStsType.MISSION_INITIAL.id) .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type)); if (tasks.isEmpty()) { return; rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -296,7 +296,7 @@ .setTargSite(checkItem.getSiteNo()) .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val) .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type) .setTaskStatus(TaskStsType.GENERATE_OUT.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setCreateTime(new Date()) .setUpdateBy(loginUserId) .setUpdateTime(new Date()) rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -98,7 +98,7 @@ .setCreateBy(loginUserId) .setCreateTime(new Date()) .setUpdateTime(new Date()) .setTaskStatus(TaskStsType.GENERATE_OUT.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setBarcode(loc.getBarcode()) .setMemo(map.getMemo()); @@ -177,7 +177,7 @@ //增加对备货单得判断 Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val) ? TaskStsType.MISSION_INITIAL.id:TaskStsType.GENERATE_OUT.id; ? TaskStsType.MISSION_INITIAL.id:TaskStsType.MISSION_INITIAL.id; Task moveTask = new Task(); String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null); @@ -411,7 +411,7 @@ .setUpdateBy(loginUserId) .setSort(Constants.TASK_SORT_DEFAULT_VALUE) .setUpdateTime(new Date()) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setBarcode(orgLoc.getBarcode()) .setMemo(map.getMemo());
@@ -150,7 +150,7 @@ } Task task = new Task(); task.setTaskCode(ruleCode) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setTaskType(TaskType.TASK_TYPE_IN.type) .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val) .setTargLoc(targetLoc) @@ -366,7 +366,7 @@ } Task task = new Task(); task.setTaskCode(ruleCode) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setTaskStatus(TaskStsType.MISSION_INITIAL.id) .setTaskType(TaskType.TASK_TYPE_IN.type) .setResource(TaskResouceType.TASK_RESOUCE_PAKIN_TYPE.val) .setTargLoc(targetLoc) @@ -776,7 +776,7 @@ @Override @Transactional(rollbackFor = Exception.class) public Task taskToTop(Long id, Long loginUserId) throws Exception { List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id); Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs)); if (Objects.isNull(tasks)) { throw new CoolException("任务已处执行状态不可一键置顶！！"); @@ -800,7 +800,7 @@ @Override @Transactional(rollbackFor = Exception.class) public Task operateComplete(Long id, Long loginUserId) { List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id); Task task = taskService.getOne(new LambdaQueryWrapper<Task>() .eq(Task::getId, id) .in(Task::getTaskStatus, longs)); @@ -1071,7 +1071,7 @@ @Override @Transactional(rollbackFor = Exception.class) public R removeTask(Long[] ids, Long loginUserId) { List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id); List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPTY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPTY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type); @@ -1084,7 +1084,7 @@ } for (Task task : tasks) { //取消移库任务 if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) { if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.MISSION_INITIAL.id)) { if (!locService.update(new LambdaUpdateWrapper<Loc>() .eq(Loc::getCode, task.getOrgLoc()) .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) { @@ -1312,7 +1312,7 @@ task.setTaskCode(ruleCode) .setTaskType(type) .setBarcode(task.getBarcode()) .setTaskStatus(TaskStsType.GENERATE_IN.id); .setTaskStatus(TaskStsType.MISSION_INITIAL.id); TaskInParam param = new TaskInParam(); param.setSourceStaNo(task.getTargSite()) @@ -1693,7 +1693,7 @@ if (Objects.isNull(ids) || ids.isEmpty()) { return R.error("任务编码不能为空！！"); } List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); List<Integer> integers = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id); List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>() .in(Task::getId, ids) .in(Task::getTaskStatus, integers)
