From 73fb454284cd75d219582d8f826488abde9ca36a Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Dec 2023 11:50:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7/=E4=BB=BB=E5=8A=A1/=E8=AE=B0=E5=BD=95=20=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=88=9B=E5=BB=BA=E8=80=85=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobDetailController.java | 8 ++++- .../InventorymoveJobMainController.java | 28 +++++++++------- .../vo/InventorymoveJobDetailExcelVO.java | 2 +- .../vo/InventorymoveJobMainExcelVO.java | 19 ++++++----- .../InventorymoveRecordDetailController.java | 8 ++++- .../InventorymoveRecordMainController.java | 33 +++++++++---------- .../vo/InventorymoveRecordDetailExcelVO.java | 6 ++-- .../InventorymoveRecordDetailExportReqVO.java | 2 ++ .../InventorymoveRecordDetailPageReqVO.java | 2 ++ .../vo/InventorymoveRecordMainExcelVO.java | 12 +++---- .../InventorymoveRequestMainController.java | 6 ++-- .../InventorymoveJobMainConvert.java | 2 +- .../InventorymoveRecordMainConvert.java | 3 +- .../InventorymoveJobDetailDO.java | 1 + .../InventorymoveRecordDetailDO.java | 1 + .../InventorymoveRecordMainDO.java | 5 --- .../InventorymoveRecordDetailMapper.java | 2 ++ .../InventorymoveRecordMainMapper.java | 3 -- .../InventorymoveJobMainServiceImpl.java | 16 +++++++-- .../InventorymoveRequestMainServiceImpl.java | 1 - 20 files changed, 94 insertions(+), 66 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java index 9777ad0f..8a8098ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java @@ -3,6 +3,7 @@ package com.win.module.wms.controller.inventorymoveJob; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -88,7 +89,12 @@ public class InventorymoveJobDetailController { @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')") public CommonResult> getInventorymoveJobDetailPage(@Valid InventorymoveJobDetailPageReqVO pageVO) { PageResult pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO); - return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveJobDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得库存转移任务子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index 5f604aa5..d8cf1436 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -107,9 +107,9 @@ public class InventorymoveJobMainController { PageResult result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveJobMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -122,9 +122,9 @@ public class InventorymoveJobMainController { PageResult result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveJobMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -154,16 +154,17 @@ public class InventorymoveJobMainController { } private List getExcelVo(List list, Map mapDropDown) { - String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS); - mapDropDown.put(8, requestStatus); + String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(2, trueFalse); + String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STATUS); + mapDropDown.put(6, requestStatus); String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); - mapDropDown.put(12, locationType); - mapDropDown.put(15, locationType); - String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); - mapDropDown.put(27, inventoryStatus); - mapDropDown.put(33, inventoryStatus); + mapDropDown.put(17, locationType); + mapDropDown.put(18, locationType); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(42, uom); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(49, inventoryStatus); List resultList = new ArrayList<>(); // 导出 for(InventorymoveJobMainDO mainDO : list) { @@ -172,8 +173,13 @@ public class InventorymoveJobMainController { InventorymoveJobMainExcelVO vo = InventorymoveJobMainConvert.INSTANCE.convert(mainDO, detailDO); vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname()); - vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname()); - vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname()); + if(!"".equals(mainDO.getAcceptUserId()) && mainDO.getAcceptUserId() != null){ + vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname()); + + } + if(!"".equals(mainDO.getCompleteUserId()) && mainDO.getCompleteUserId() != null){ + vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname()); + } vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname()); resultList.add(vo); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java index bff001ed..5a496b35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java @@ -48,7 +48,7 @@ public class InventorymoveJobDetailExcelVO { private String remark; @ExcelProperty("创建时间") - private LocalDateTime createtime; + private LocalDateTime createTime; @ExcelProperty("创建者Id") private String creator; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java index 7db34fc0..feb44fe7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java @@ -28,6 +28,9 @@ import com.win.framework.excel.core.convert.DictConvert; public class InventorymoveJobMainExcelVO { //主表数据 + @ExcelProperty("单据号") + private String number; + @ExcelProperty("申请单号") private String requestNumber; @@ -61,9 +64,10 @@ public class InventorymoveJobMainExcelVO { @ExcelProperty("最后更新者Id") private String updater; - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String jobStageStatus; + //TODO 该字段为弃用字段后续再进行整体清理 +// @ExcelProperty(value = "状态", converter = DictConvert.class) +// @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 +// private String jobStageStatus; @ExcelProperty("优先级") private Integer priority; @@ -96,9 +100,6 @@ public class InventorymoveJobMainExcelVO { @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String toLocationTypes; - @ExcelProperty("单据号") - private String number; - @ExcelProperty("业务类型") private String businessType; @@ -111,9 +112,9 @@ public class InventorymoveJobMainExcelVO { @ExcelProperty("创建者id") private String creator; - - @ExcelProperty("创建者用户名") - private String creatorName; + //TODO 该字段为弃用字段后续再进行整体清理 +// @ExcelProperty("创建者用户名") +// private String creatorName; @ExcelProperty("到仓库代码") private String toWarehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java index e138ae9e..26005b2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java @@ -91,7 +91,13 @@ public class InventorymoveRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')") public CommonResult> getInventorymoveRecordDetailPage(@Valid InventorymoveRecordDetailPageReqVO pageVO) { PageResult pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailPage(pageVO); - return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java index 5fa1a8a7..33e69a60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java @@ -107,8 +107,8 @@ public class InventorymoveRecordMainController { PageResult result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRecordMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); } return success(result); } @@ -121,8 +121,8 @@ public class InventorymoveRecordMainController { PageResult result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRecordMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); } return success(result); } @@ -134,17 +134,14 @@ public class InventorymoveRecordMainController { HttpServletResponse response) throws IOException { List list = inventorymoveRecordMainService.getInventorymoveRecordMainList(exportReqVO); // 导出 Excel - List datas = InventorymoveRecordMainConvert.INSTANCE.convertList02(list); - for(InventorymoveRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "库存转移记录主.xls", "数据", InventorymoveRecordMainExcelVO.class, datas); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库存转移申请.xlsx", "库存转移申请数据", InventorymoveRecordMainExcelVO.class, resultList, mapDropDown); } @GetMapping("/export-excel-senior") - @Operation(summary = "导出库存转移申请 Excel") + @Operation(summary = "导出库存转移记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:export')") @OperateLog(type = EXPORT) public void exportInventorymoveRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { @@ -158,27 +155,27 @@ public class InventorymoveRecordMainController { private List getExcelVo(List list, Map mapDropDown) { String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(3, trueFalse); - mapDropDown.put(23, trueFalse); + mapDropDown.put(22, trueFalse); String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); mapDropDown.put(11, interfaceType); - mapDropDown.put(48, interfaceType); + mapDropDown.put(46, interfaceType); String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); - mapDropDown.put(18, locationType); - mapDropDown.put(21, locationType); + mapDropDown.put(17, locationType); + mapDropDown.put(20, locationType); String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); - mapDropDown.put(32, inventoryStatus); - mapDropDown.put(40, inventoryStatus); + mapDropDown.put(31, inventoryStatus); + mapDropDown.put(39, inventoryStatus); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(46, uom); + mapDropDown.put(45, uom); List resultList = new ArrayList<>(); // 导出 for(InventorymoveRecordMainDO mainDO : list) { List subList = inventorymoveRecordDetailService.selectList(mainDO.getId()); for(InventorymoveRecordDetailDO detailDO : subList) { InventorymoveRecordMainExcelVO vo = InventorymoveRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname()); vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); resultList.add(vo); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java index ba471a31..b0d0fd94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java @@ -90,9 +90,9 @@ public class InventorymoveRecordDetailExcelVO { @ExcelProperty(value = "计量单位", converter = DictConvert.class) @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; - - @ExcelProperty("代码") - private String code; + //TODO 弃用字段后续统一清理 +// @ExcelProperty("代码") +// private String code; @ExcelProperty(value = "接口类型", converter = DictConvert.class) @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java index 0d990af3..28f2a071 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java @@ -109,4 +109,6 @@ public class InventorymoveRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java index 073e0eb2..16c8c503 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java @@ -111,4 +111,6 @@ public class InventorymoveRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java index b2e5a129..0a29b9e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java @@ -66,9 +66,9 @@ public class InventorymoveRecordMainExcelVO { @ExcelProperty(value = "接口类型", converter = DictConvert.class) @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String interfaceType; - - @ExcelProperty("代码") - private String code; +//TODO 弃用字段后续统一清理 +// @ExcelProperty("代码") +// private String code; @ExcelProperty("业务类型") private String businessType; @@ -178,9 +178,9 @@ public class InventorymoveRecordMainExcelVO { @ExcelProperty(value = "计量单位", converter = DictConvert.class) @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; - - @ExcelProperty("代码") - private String codeDetail; +//TODO 弃用字段后续统一清理 +// @ExcelProperty("代码") +// private String codeDetail; @ExcelProperty(value = "接口类型", converter = DictConvert.class) @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java index 3dabd578..550e3378 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java @@ -102,9 +102,9 @@ public class InventorymoveRequestMainController { PageResult result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRequestMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -117,9 +117,9 @@ public class InventorymoveRequestMainController { PageResult result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRequestMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -165,11 +165,11 @@ public class InventorymoveRequestMainController { List subList = inventorymoveRequestDetailService.selectList(mainDO.getId()); for(InventorymoveRequestDetailDO detailDO : subList) { InventorymoveRequestMainExcelVO vo = InventorymoveRequestMainConvert.INSTANCE.convert(mainDO, detailDO); + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname()); vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname()); vo.setUpdaterDetail(userApi.getUser(Long.valueOf(detailDO.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); resultList.add(vo); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java index 14b3683b..b824f50c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java @@ -44,10 +44,10 @@ public interface InventorymoveJobMainConvert { @Mapping(source = "mainDO.remark", target = "remark"), @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), - @Mapping(source = "mainDO.creatorName", target = "creatorName"), @Mapping(source = "mainDO.updateTime", target = "updateTime"), @Mapping(source = "mainDO.updater", target = "updater"), @Mapping(source = "detailDO.creator", target = "creatorDetail"), + @Mapping(source = "detailDO.createTime", target = "createTimeDetail"), }) InventorymoveJobMainExcelVO convert(InventorymoveJobMainDO mainDO, InventorymoveJobDetailDO detailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java index e0e1152b..3279a352 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java @@ -42,7 +42,8 @@ public interface InventorymoveRecordMainConvert { @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), @Mapping(source = "mainDO.interfaceType", target = "interfaceType"), - @Mapping(source = "mainDO.code", target = "code"), + @Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"), + @Mapping(source = "detailDO.createTime", target = "createTimeDetail"), }) InventorymoveRecordMainExcelVO convert(InventorymoveRecordMainDO mainDO, InventorymoveRecordDetailDO detailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java index 75dbbcbb..6611f6f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.inventorymoveJob; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java index 23a4ff93..b286bbd9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.inventorymoveRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java index c583a420..769baffc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java @@ -146,9 +146,4 @@ public class InventorymoveRecordMainDO extends BaseDO { * 是否可用 */ private String available; - /** - * 主表id - */ - private String masterId; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java index ddd45259..aecf28b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java @@ -23,6 +23,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX selectPage(InventorymoveRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) @@ -61,6 +62,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX selectList(InventorymoveRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java index 169653ff..563cc42c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java @@ -10,7 +10,6 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; -import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; import org.apache.ibatis.annotations.Mapper; /** @@ -24,7 +23,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX selectPage(InventorymoveRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) - .eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation()) .eqIfPresent(InventorymoveRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType()) @@ -55,7 +53,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX selectList(InventorymoveRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index e7da0d6e..31294698 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -18,6 +18,7 @@ import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetail import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper; @@ -27,6 +28,7 @@ import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.expectout.ExpectoutService; +import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.recordsetting.RecordsettingService; import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; @@ -87,6 +89,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ private ExpectinService expectinService; @Resource private TransactionService transactionService; + @Resource + private LocationService locationService; @Override public Long createInventorymoveJobMain(InventorymoveJobMainCreateReqVO createReqVO) { @@ -244,12 +248,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId())); inventorymoveJobMainDO.setCompleteUserName(userRespDTO.getNickname()); //更新任务表状态 - int result = inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO); + inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO); //创建客户收货记录主表 InventorymoveRecordMainDO inventorymoveRecordMainDO = new InventorymoveRecordMainDO(); BeanUtils.copyProperties(inventorymoveJobMainDO, inventorymoveRecordMainDO); inventorymoveRecordMainDO.setJobNumber(inventorymoveJobMainDO.getNumber()); inventorymoveRecordMainDO.setId(null); + inventorymoveRecordMainDO.setCreateTime(null); inventorymoveRecordMainDO.setAvailable("TRUE"); inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now()); inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now()); @@ -295,7 +300,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveRecordDetailDO.setJobDetailId(DetailUpdateItem.getId().toString()); inventorymoveRecordDetailDO.setId(null); inventorymoveRecordDetailDO.setCreator(null); - inventorymoveRecordDetailDO.setCreateTime(null); + inventorymoveRecordDetailDO.setCreateTime(LocalDateTime.now()); inventorymoveRecordDetailDO.setUpdater(null); inventorymoveRecordDetailDO.setUpdateTime(null); inventorymoveRecordDetailDO.setNumber(inventorymoveRecordMainDO.getNumber()); @@ -306,12 +311,19 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber")==null?"":recordLstItem.get("toContainerNumber")); inventorymoveRecordDetailDO.setToBatch(recordLstItem.get("toBatch")==null?"":recordLstItem.get("toBatch")); inventorymoveRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode")); + LocationDO toLocationDO = locationService.selectLocation(recordLstItem.get("toLocationCode")); + inventorymoveRecordDetailDO.setToAreaCode(toLocationDO.getAreaCode()); + inventorymoveRecordDetailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode()); + LocationDO fromLocationDO = locationService.selectLocation(inventorymoveRecordDetailDO.getFromLocationCode()); + inventorymoveRecordDetailDO.setFromAreaCode(fromLocationDO.getAreaCode()); + inventorymoveRecordDetailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode()); inventorymoveRecordDetailDO.setToInventoryStatus(recordLstItem.get("toInventoryStatus")); inventorymoveRecordDetailDO.setFromPackingNumber(DetailUpdateItem.getPackingNumber()); inventorymoveRecordDetailDO.setFromContainerNumber(DetailUpdateItem.getContainerNumber()); inventorymoveRecordDetailDO.setFromAreaCode(inventorymoveJobMainDO.getFromAreaCodes()); inventorymoveRecordDetailDO.setToAreaCode(inventorymoveJobMainDO.getToAreaCodes()); inventorymoveRecordDetailDO.setFromBatch(DetailUpdateItem.getBatch()); + inventorymoveRecordDetailDO.setInterfaceType(inventorymoveRecordMainDO.getInterfaceType()); inventorymoveRecordDetailDO.setFromInventoryStatus(DetailUpdateItem.getInventoryStatus()); inventorymoveRecordDetailDOList.add(inventorymoveRecordDetailDO); //添加库存事务list diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index 08fca917..c6530318 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -87,7 +87,6 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest private InventorymoveJobDetailMapper inventorymoveJobDetailMapper; @Resource private Validator validator; - @Resource private ItembasicService itembasicService; @Resource