diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java index 4fb6ec70..a3e89868 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java @@ -133,16 +133,16 @@ public class ContainerMainController { @PostMapping("/containerBind") @Operation(summary = "器具绑定") @PreAuthorize("@ss.hasPermission('wms:container-main:create')") - public CommonResult pdaBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { - ContainerBindRecordMainRespVO containerBindRecordMainRespVO = containerMainService.pdaBind(createReqVO); - return success(containerBindRecordMainRespVO); + public CommonResult pdaBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { + String result = containerMainService.pdaBind(createReqVO); + return success(result); } @PostMapping("/containerUnBind") @Operation(summary = "器具解绑") @PreAuthorize("@ss.hasPermission('wms:container-main:create')") - public CommonResult pdaUnBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { - ContainerUnbindRecordMainRespVO result = containerMainService.pdaUnBind(createReqVO); + public CommonResult pdaUnBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { + String result = containerMainService.pdaUnBind(createReqVO); return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java index 683d3d19..c1230835 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java @@ -91,14 +91,14 @@ public interface ContainerMainService { * @param createReqVO 请求参数 * @return 编号 */ - ContainerBindRecordMainRespVO pdaBind(ContainerMainCreateReqVO createReqVO); + String pdaBind(ContainerMainCreateReqVO createReqVO); /** * 解绑数据 * @param createReqVO 请求参数 * @return 编号 */ - ContainerUnbindRecordMainRespVO pdaUnBind(ContainerMainCreateReqVO createReqVO); + String pdaUnBind(ContainerMainCreateReqVO createReqVO); /** * 器具维修 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java index 11eacdd9..51ac817d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java @@ -199,7 +199,7 @@ public class ContainerMainServiceImpl implements ContainerMainService { @Transactional @Override - public ContainerBindRecordMainRespVO pdaBind(ContainerMainCreateReqVO createReqVO) { + public String pdaBind(ContainerMainCreateReqVO createReqVO) { if(StringUtils.isEmpty(createReqVO.getNumber())){ throw exception(CONTAINER_BIND_RECORD_NUMBER_NOT_EXISTS); } @@ -224,12 +224,12 @@ public class ContainerMainServiceImpl implements ContainerMainService { subList.add(containerBindRecordDetailRespVO); } containerBindRecordMainRespVO.setSubList(subList); - return containerBindRecordMainRespVO; + return containerBindRecordMainDO.getNumber(); } @Transactional @Override - public ContainerUnbindRecordMainRespVO pdaUnBind(ContainerMainCreateReqVO createReqVO) { + public String pdaUnBind(ContainerMainCreateReqVO createReqVO) { if(StringUtils.isEmpty(createReqVO.getNumber())){ throw exception(CONTAINER_BIND_RECORD_NUMBER_NOT_EXISTS); } @@ -253,7 +253,7 @@ public class ContainerMainServiceImpl implements ContainerMainService { } BeanUtils.copyProperties(containerUnbindRecordMainDO,containerUnbindRecordMainRespVO); containerUnbindRecordMainRespVO.setSubList(subList); - return containerUnbindRecordMainRespVO; + return containerUnbindRecordMainDO.getNumber(); } @Transactional