diff --git a/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java b/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java index 6cc058d..55193ab 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java @@ -168,7 +168,7 @@ public class WcsTaskController { } - @Log(title = "扫码处入库申请", businessType = BusinessType.UPDATE) + @Log(title = "扫码处入库申请测试接口", businessType = BusinessType.UPDATE) @PostMapping("/toWzWcs/wcsIncomingTaskRequest") @RepeatSubmit public WcsResponseVo wcsIncomingTaskRequest(WcsIncomingTaskRequestDto dto) { @@ -177,6 +177,16 @@ public class WcsTaskController { return vo; } + @Log(title = "生产区入库校验测试接口", businessType = BusinessType.UPDATE) + @PostMapping("/toWzWcs/wcsIncomingTrayCheck") + @RepeatSubmit + public WcsResponseVo wcsIncomingTrayCheck(WcsIncomingTrayCheckBody dto) { + + WcsResponseVo vo = wcsUtil.wcsIncomingTrayCheck(dto); + return vo; + } + + } diff --git a/shkj-wms/src/main/java/com/shkj/wcs/third/rcs/RCSUtil.java b/shkj-wms/src/main/java/com/shkj/wcs/third/rcs/RCSUtil.java index 43c7c3d..7b87b54 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/third/rcs/RCSUtil.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/third/rcs/RCSUtil.java @@ -186,19 +186,15 @@ public class RCSUtil { */ public Result moveByAGV(AGVMoveBo bo) { RcsCreateTaskDto dto = new RcsCreateTaskDto(); - dto.setMapId(1); - dto.setTaskType(bo.getTaskType()); - dto.setTaskId(bo.getTaskId().toString()); + dto.setTaskType(String.valueOf(bo.getTaskType())); //库位编号 List idList = new ArrayList<>(); List points = bo.getPoints(); for (String point : points) { RcsIdList rcsIdList = new RcsIdList(); - rcsIdList.setId(point); log.error(point); idList.add(rcsIdList); } - dto.setTargets(idList); return rcsCreateTask(dto); // return Result.ok(); } diff --git a/shkj-wms/src/main/java/com/shkj/wcs/third/workbinWcs/dto/WcsIncomingTrayCheckDto.java b/shkj-wms/src/main/java/com/shkj/wcs/third/workbinWcs/dto/WcsIncomingTrayCheckDto.java new file mode 100644 index 0000000..bd35edb --- /dev/null +++ b/shkj-wms/src/main/java/com/shkj/wcs/third/workbinWcs/dto/WcsIncomingTrayCheckDto.java @@ -0,0 +1,21 @@ +package com.shkj.wcs.third.workbinWcs.dto; + + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + *生产区入库校验实体 + */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +public class WcsIncomingTrayCheckDto implements Serializable { + + private WcsCreateTaskHeader header; + private List body; +}