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 06e05d42..4fb6ec70 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 @@ -8,6 +8,8 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.container.vo.*; +import com.win.module.wms.controller.containerBind.vo.ContainerBindRecordMainRespVO; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordMainRespVO; import com.win.module.wms.convert.container.ContainerMainConvert; import com.win.module.wms.dal.dataobject.container.ContainerMainDO; import com.win.module.wms.service.container.ContainerMainService; @@ -131,16 +133,16 @@ public class ContainerMainController { @PostMapping("/containerBind") @Operation(summary = "器具绑定") @PreAuthorize("@ss.hasPermission('wms:container-main:create')") - public CommonResult pdaBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { - String result = containerMainService.pdaBind(createReqVO); - return success(result); + public CommonResult pdaBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { + ContainerBindRecordMainRespVO containerBindRecordMainRespVO = containerMainService.pdaBind(createReqVO); + return success(containerBindRecordMainRespVO); } @PostMapping("/containerUnBind") @Operation(summary = "器具解绑") @PreAuthorize("@ss.hasPermission('wms:container-main:create')") - public CommonResult pdaUnBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { - String result = containerMainService.pdaUnBind(createReqVO); + public CommonResult pdaUnBind(@Valid @RequestBody ContainerMainCreateReqVO createReqVO) { + ContainerUnbindRecordMainRespVO result = containerMainService.pdaUnBind(createReqVO); return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerUnbind/vo/ContainerUnbindRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerUnbind/vo/ContainerUnbindRecordMainRespVO.java index 8caf7017..cec7ee2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerUnbind/vo/ContainerUnbindRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerUnbind/vo/ContainerUnbindRecordMainRespVO.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 器具解绑记录主 Response VO") @Data @@ -19,4 +20,7 @@ public class ContainerUnbindRecordMainRespVO extends ContainerUnbindRecordMainBa @Schema(description = "创建时间") private LocalDateTime createTime; + @Schema(description = "子表") + private List subList; + } 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 87e04557..683d3d19 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 @@ -5,6 +5,8 @@ import javax.validation.*; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.container.vo.*; +import com.win.module.wms.controller.containerBind.vo.ContainerBindRecordMainRespVO; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordMainRespVO; import com.win.module.wms.dal.dataobject.container.ContainerMainDO; import com.win.framework.common.pojo.PageResult; @@ -89,14 +91,14 @@ public interface ContainerMainService { * @param createReqVO 请求参数 * @return 编号 */ - String pdaBind(ContainerMainCreateReqVO createReqVO); + ContainerBindRecordMainRespVO pdaBind(ContainerMainCreateReqVO createReqVO); /** * 解绑数据 * @param createReqVO 请求参数 * @return 编号 */ - String pdaUnBind(ContainerMainCreateReqVO createReqVO); + ContainerUnbindRecordMainRespVO 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 3055b609..11eacdd9 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 @@ -7,21 +7,38 @@ import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.container.vo.*; +import com.win.module.wms.controller.containerBind.vo.ContainerBindRecordDetailExportReqVO; +import com.win.module.wms.controller.containerBind.vo.ContainerBindRecordDetailRespVO; +import com.win.module.wms.controller.containerBind.vo.ContainerBindRecordMainRespVO; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordDetailExportReqVO; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordDetailRespVO; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordMainRespVO; import com.win.module.wms.convert.container.ContainerDetailConvert; import com.win.module.wms.convert.container.ContainerMainConvert; +import com.win.module.wms.convert.containerBind.ContainerBindRecordDetailConvert; +import com.win.module.wms.convert.containerUnbind.ContainerUnbindRecordDetailConvert; import com.win.module.wms.dal.dataobject.container.ContainerDetailDO; import com.win.module.wms.dal.dataobject.container.ContainerMainDO; +import com.win.module.wms.dal.dataobject.containerBind.ContainerBindRecordDetailDO; +import com.win.module.wms.dal.dataobject.containerBind.ContainerBindRecordMainDO; import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordDetailDO; import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordMainDO; +import com.win.module.wms.dal.dataobject.containerUnbind.ContainerUnbindRecordDetailDO; +import com.win.module.wms.dal.dataobject.containerUnbind.ContainerUnbindRecordMainDO; import com.win.module.wms.dal.dataobject.containerinit.ContainerInitRecordDetailDO; import com.win.module.wms.dal.dataobject.containerinit.ContainerInitRecordMainDO; import com.win.module.wms.dal.mysql.container.ContainerDetailMapper; import com.win.module.wms.dal.mysql.container.ContainerMainMapper; +import com.win.module.wms.dal.mysql.containerBind.ContainerBindRecordDetailMapper; +import com.win.module.wms.dal.mysql.containerBind.ContainerBindRecordMainMapper; import com.win.module.wms.dal.mysql.containerRepair.ContainerRepairRecordDetailMapper; import com.win.module.wms.dal.mysql.containerRepair.ContainerRepairRecordMainMapper; +import com.win.module.wms.dal.mysql.containerUnbind.ContainerUnbindRecordDetailMapper; +import com.win.module.wms.dal.mysql.containerUnbind.ContainerUnbindRecordMainMapper; import com.win.module.wms.dal.mysql.containerinit.ContainerInitRecordDetailMapper; import com.win.module.wms.dal.mysql.containerinit.ContainerInitRecordMainMapper; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -64,6 +81,14 @@ public class ContainerMainServiceImpl implements ContainerMainService { private ContainerRepairRecordMainMapper containerRepairRecordMainMapper; @Resource private ContainerRepairRecordDetailMapper containerRepairRecordDetailMapper; + @Resource + private ContainerBindRecordMainMapper containerBindRecordMainMapper; + @Resource + private ContainerBindRecordDetailMapper containerBindRecordDetailMapper; + @Resource + private ContainerUnbindRecordMainMapper containerUnbindRecordMainMapper; + @Resource + private ContainerUnbindRecordDetailMapper containerUnbindRecordDetailMapper; @Transactional @@ -174,7 +199,7 @@ public class ContainerMainServiceImpl implements ContainerMainService { @Transactional @Override - public String pdaBind(ContainerMainCreateReqVO createReqVO) { + public ContainerBindRecordMainRespVO pdaBind(ContainerMainCreateReqVO createReqVO) { if(StringUtils.isEmpty(createReqVO.getNumber())){ throw exception(CONTAINER_BIND_RECORD_NUMBER_NOT_EXISTS); } @@ -186,12 +211,25 @@ public class ContainerMainServiceImpl implements ContainerMainService { containerDetailService.createContainerDetail(containerDetailCreateReqVO); } } - return containerMainDO.getNumber(); + // 返回绑定记录 + ContainerBindRecordMainRespVO containerBindRecordMainRespVO = new ContainerBindRecordMainRespVO(); + ContainerBindRecordMainDO containerBindRecordMainDO = containerBindRecordMainMapper.queryByContainerNumber(containerMainDO.getNumber()); + BeanUtils.copyProperties(containerBindRecordMainDO,containerBindRecordMainRespVO); + ContainerBindRecordDetailExportReqVO reqVO = new ContainerBindRecordDetailExportReqVO(); + reqVO.setMasterId(containerBindRecordMainDO.getId()); + List childList = containerBindRecordDetailMapper.selectList(reqVO); + List subList = new ArrayList<>(); + for(ContainerBindRecordDetailDO containerBindRecordDetailDO:childList){ + ContainerBindRecordDetailRespVO containerBindRecordDetailRespVO = ContainerBindRecordDetailConvert.INSTANCE.convert(containerBindRecordDetailDO); + subList.add(containerBindRecordDetailRespVO); + } + containerBindRecordMainRespVO.setSubList(subList); + return containerBindRecordMainRespVO; } @Transactional @Override - public String pdaUnBind(ContainerMainCreateReqVO createReqVO) { + public ContainerUnbindRecordMainRespVO pdaUnBind(ContainerMainCreateReqVO createReqVO) { if(StringUtils.isEmpty(createReqVO.getNumber())){ throw exception(CONTAINER_BIND_RECORD_NUMBER_NOT_EXISTS); } @@ -203,7 +241,19 @@ public class ContainerMainServiceImpl implements ContainerMainService { containerDetailService.deleteContainerDetail(containerDetailDO.getId()); } } - return containerMainDO.getNumber(); + ContainerUnbindRecordMainRespVO containerUnbindRecordMainRespVO = new ContainerUnbindRecordMainRespVO(); + ContainerUnbindRecordMainDO containerUnbindRecordMainDO = containerUnbindRecordMainMapper.queryByContainerNumber(containerMainDO.getNumber()); + ContainerUnbindRecordDetailExportReqVO reqVO = new ContainerUnbindRecordDetailExportReqVO(); + reqVO.setMasterId(containerUnbindRecordMainDO.getId()); + List list = containerUnbindRecordDetailMapper.selectList(reqVO); + List subList = new ArrayList<>(); + for(ContainerUnbindRecordDetailDO containerUnbindRecordDetailDO:list){ + ContainerUnbindRecordDetailRespVO containerUnbindRecordDetailRespVO = ContainerUnbindRecordDetailConvert.INSTANCE.convert(containerUnbindRecordDetailDO); + subList.add(containerUnbindRecordDetailRespVO); + } + BeanUtils.copyProperties(containerUnbindRecordMainDO,containerUnbindRecordMainRespVO); + containerUnbindRecordMainRespVO.setSubList(subList); + return containerUnbindRecordMainRespVO; } @Transactional