From 3fd6fca2a085d604b2f38b7e07a8a7ccd44961c5 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 16 Nov 2023 16:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=8A=E6=9E=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 2 + .../inspectJob/InspectJobMainController.java | 11 +- .../InspectRecordMainController.java | 6 +- .../InspectRequestMainController.java | 22 +- .../PurchasereceiptJobMainController.java | 20 +- .../PurchasereceiptRecordMainController.java | 6 +- .../PurchasereceiptRequestMainController.java | 31 +-- .../PutawayJobDetailController.java | 95 ++----- .../putawayJob/PutawayJobMainController.java | 181 +++++++------ .../putawayJob/vo/PutawayJobMainExcelVO.java | 125 +++++---- .../vo/PutawayJobMainUpdateReqVO.java | 9 +- .../PutawayRecordDetailController.java | 106 ++------ .../PutawayRecordMainController.java | 139 +++++----- .../vo/PutawayRecordMainExcelVO.java | 105 ++++++-- .../putawayJob/PutawayJobMainConvert.java | 12 + .../PutawayRecordMainConvert.java | 20 +- .../putawayJob/PutawayJobDetailMapper.java | 11 +- .../PutawayRecordDetailMapper.java | 11 +- .../PutawayRecordMainMapper.java | 11 +- .../inspectJob/InspectJobMainService.java | 4 +- .../inspectJob/InspectJobMainServiceImpl.java | 7 +- .../InspectRecordMainService.java | 3 +- .../PurchasereceiptJobMainService.java | 2 +- .../PurchasereceiptJobMainServiceImpl.java | 2 +- .../putawayJob/PutawayJobDetailService.java | 63 ++--- .../PutawayJobDetailServiceImpl.java | 65 +---- .../putawayJob/PutawayJobMainService.java | 71 +++--- .../putawayJob/PutawayJobMainServiceImpl.java | 237 ++++++++++++++---- .../PutawayRecordDetailService.java | 55 +--- .../PutawayRecordDetailServiceImpl.java | 53 +--- .../PutawayRecordMainService.java | 58 +---- .../PutawayRecordMainServiceImpl.java | 65 +---- 32 files changed, 783 insertions(+), 825 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 17da0f2d..a2e83a74 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -482,12 +482,14 @@ public interface ErrorCodeConstants { ErrorCode PUTAWAY_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_081_008, "到货检验申请状态不支持审批拒绝"); //上架任务主ErrorCode ErrorCode PUTAWAY_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_082_000, "上架任务主不存在"); + ErrorCode PUTAWAY_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_082_001, "上架任务状态错误"); //上架任务子ErrorCode ErrorCode PUTAWAY_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_083_001, "上架任务子不存在"); //上架记录主ErrorCode ErrorCode PUTAWAY_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_084_000, "上架记录主不存在"); //上架记录子ErrorCode ErrorCode PUTAWAY_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_084_001, "上架记录子不存在"); + //备料计划主ErrorCode ErrorCode PREPARETOISSUE_MAIN_NOT_EXISTS = new ErrorCode(1_000_085_000, "备料计划主不存在"); //备料计划子ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index ce9b7367..8d075f8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -82,10 +82,10 @@ public class InspectJobMainController { List list = inspectJobMainService.getInspectJobMainList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "检验任务主.xls", "检验任务数据", InspectJobMainExcelVO.class, resultList, mapDropDown); } - @GetMapping("/export-excel-senior") + @PostMapping("/export-excel-senior") @Operation(summary = "导出检验任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')") @OperateLog(type = EXPORT) @@ -93,11 +93,10 @@ public class InspectJobMainController { List list = inspectJobMainService.getInspectJobMainList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "检验任务主.xls", "检验任务数据", InspectJobMainExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { - //组装vo String[] status = JobStatusEnum.getStatusNameArray(); mapDropDown.put(6, status); String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); @@ -210,8 +209,8 @@ public class InspectJobMainController { @Operation(summary = "执行任务") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')") - public CommonResult excuteInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { - Integer count = inspectJobMainService.excuteInspectJobMain(updateReqVO); + public CommonResult executeInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { + Integer count = inspectJobMainService.executeInspectJobMain(updateReqVO); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java index e5b5ef74..2ac832f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java @@ -80,10 +80,10 @@ public class InspectRecordMainController { List list = inspectRecordMainService.getInspectRecordMainList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "检验记录主.xls", "检验记录数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); } - @GetMapping("/export-excel-senior") + @PostMapping("/export-excel-senior") @Operation(summary = "导出检验记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')") @OperateLog(type = EXPORT) @@ -91,7 +91,7 @@ public class InspectRecordMainController { List list = inspectRecordMainService.getInspectRecordMainList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "检验记录主.xls", "检验记录数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 0f40ef6b..6f1fd3d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -115,10 +115,10 @@ public class InspectRequestMainController { List list = inspectRequestMainService.getInspectRequestMainList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息列表", InspectRequestMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息", InspectRequestMainExcelVO.class, resultList, mapDropDown); } - @GetMapping("/export-excel-senior") + @PostMapping("/export-excel-senior") @Operation(summary = "导出检验申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')") @OperateLog(type = EXPORT) @@ -126,7 +126,7 @@ public class InspectRequestMainController { List list = inspectRequestMainService.getInspectRequestMainList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息列表", InspectRequestMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "到货检验申请主.xls", "检验申请信息", InspectRequestMainExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { @@ -165,12 +165,22 @@ public class InspectRequestMainController { // 手动创建导出 demo List list = new ArrayList<>(); Map mapDropDown = new HashMap<>(); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(6, locationType); + String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS); + mapDropDown.put(11, requestStatus); + String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE); + mapDropDown.put(15, inspectType); + String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION); + mapDropDown.put(16, nextAction); + String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD); + mapDropDown.put(17, sampleMethod); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(8, uom); + mapDropDown.put(18, uom); String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); - mapDropDown.put(9, inventoryStatus); + mapDropDown.put(28, inventoryStatus); // 输出 - ExcelUtils.write(response, "检验申请信息导入模板.xlsx", "检验申请信息列表", InspectRequestImportVO.class, list, mapDropDown); + ExcelUtils.write(response, "检验申请信息导入模板.xlsx", "检验申请信息", InspectRequestImportVO.class, list, mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 42365120..238550c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -84,15 +84,14 @@ public class PurchasereceiptJobMainController { @Operation(summary = "导出采购收货任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:export')") @OperateLog(type = EXPORT) - public void exportPurchasereceiptJobMainExcel(@Valid PurchasereceiptJobMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportPurchasereceiptJobMainExcel(@Valid PurchasereceiptJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "采购收货任务主.xlsx", "数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "采购收货任务主.xlsx", "采购收货任务数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); } - @GetMapping("/export-excel-senior") + @PostMapping("/export-excel-senior") @Operation(summary = "导出采购收货任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:export')") @OperateLog(type = EXPORT) @@ -100,18 +99,14 @@ public class PurchasereceiptJobMainController { List list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "采购收货任务主.xlsx", "数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "采购收货任务主.xlsx", "采购收货任务数据", PurchasereceiptJobMainExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { - //组装vo String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); mapDropDown.put(6, transferMode); String[] status = JobStatusEnum.getStatusNameArray(); mapDropDown.put(12, status); - String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); - mapDropDown.put(22, locationType); - mapDropDown.put(23, locationType); String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(27, trueFalse); mapDropDown.put(30, trueFalse); @@ -123,6 +118,9 @@ public class PurchasereceiptJobMainController { mapDropDown.put(36, trueFalse); mapDropDown.put(37, trueFalse); mapDropDown.put(38, trueFalse); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(22, locationType); + mapDropDown.put(23, locationType); String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); mapDropDown.put(46, inventoryStatus); String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); @@ -193,8 +191,8 @@ public class PurchasereceiptJobMainController { @Operation(summary = "执行采购收货任务主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')") - public CommonResult excutePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { - Integer count = purchasereceiptJobMainService.excutePurchasereceiptJobMain(updateReqVO); + public CommonResult executePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { + Integer count = purchasereceiptJobMainService.executePurchasereceiptJobMain(updateReqVO); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java index 9f800048..07504ea1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java @@ -80,10 +80,10 @@ public class PurchasereceiptRecordMainController { List list = purchasereceiptRecordMainService.getPurchasereceiptRecordMainList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "采购收货记录主.xls", "数据", PurchasereceiptRecordMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "采购收货记录主.xls", "采购收货记录数据", PurchasereceiptRecordMainExcelVO.class, resultList, mapDropDown); } - @GetMapping("/export-excel-senior") + @PostMapping("/export-excel-senior") @Operation(summary = "导出采购收货记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:export')") @OperateLog(type = EXPORT) @@ -91,7 +91,7 @@ public class PurchasereceiptRecordMainController { List list = purchasereceiptRecordMainService.getPurchasereceiptRecordMainList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "采购收货记录主.xls", "数据", PurchasereceiptRecordMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "采购收货记录主.xls", "采购收货记录数据", PurchasereceiptRecordMainExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index c876f5f9..7b484be4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -65,15 +65,6 @@ public class PurchasereceiptRequestMainController { return success(result > 0); } -// @DeleteMapping("/delete") -// @Operation(summary = "删除采购收货申请主") -// @Parameter(name = "id", description = "编号", required = true) -// @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:delete')") -// public CommonResult deletePurchasereceiptRequestMain(@RequestParam("id") Long id) { -// Integer result = purchasereceiptRequestMainService.deletePurchasereceiptRequestMain(id); -// return success(result > 0); -// } - @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')") @@ -124,7 +115,7 @@ public class PurchasereceiptRequestMainController { Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); // 导出 Excel - ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "采购收货申请主.xlsx", "采购收货申请数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") @@ -137,7 +128,7 @@ public class PurchasereceiptRequestMainController { Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); // 导出 Excel - ExcelUtils.write(response, "采购收货申请主.xlsx", "数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "采购收货申请主.xlsx", "采购收货申请数据", PurchasereceiptRequestMainExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { @@ -175,10 +166,20 @@ public class PurchasereceiptRequestMainController { // 手动创建导出 demo List list = new ArrayList<>(); Map mapDropDown = new HashMap<>(); -// String[] purchaseReturnReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PURCHASE_RETURN_REASON); -// mapDropDown.put(16, purchaseReturnReason); -// String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); -// mapDropDown.put(25, uom); + String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); + mapDropDown.put(4, transferMode); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(7, locationType); + mapDropDown.put(8, locationType); + String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS); + mapDropDown.put(18, requestStatus); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(31, inventoryStatus); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(36, packUnit); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(38, uom); + mapDropDown.put(47, uom); // 输出 ExcelUtils.write(response, "采购收货申请信息导入模板.xlsx", "采购收货申请信息列表", PurchasereceiptRequestMainImportVO.class, list, mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java index 665836e2..e7da76eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java @@ -1,36 +1,26 @@ package com.win.module.wms.controller.putawayJob; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.putawayJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; +import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailRespVO; +import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; +import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; +import com.win.module.wms.service.putawayJob.PutawayJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; +import javax.annotation.Resource; +import javax.validation.Valid; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.putawayJob.vo.*; -import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; -import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; -import com.win.module.wms.service.putawayJob.PutawayJobDetailService; - @Tag(name = "管理后台 - 上架任务子") @RestController @RequestMapping("/wms/putaway-job-detail") @@ -43,48 +33,6 @@ public class PutawayJobDetailController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建上架任务子") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:create')") - public CommonResult createPutawayJobDetail(@Valid @RequestBody PutawayJobDetailCreateReqVO createReqVO) { - return success(putawayJobDetailService.createPutawayJobDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新上架任务子") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:update')") - public CommonResult updatePutawayJobDetail(@Valid @RequestBody PutawayJobDetailUpdateReqVO updateReqVO) { - putawayJobDetailService.updatePutawayJobDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除上架任务子") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:delete')") - public CommonResult deletePutawayJobDetail(@RequestParam("id") Long id) { - putawayJobDetailService.deletePutawayJobDetail(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得上架任务子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") - public CommonResult getPutawayJobDetail(@RequestParam("id") Long id) { - PutawayJobDetailDO putawayJobDetail = putawayJobDetailService.getPutawayJobDetail(id); - return success(PutawayJobDetailConvert.INSTANCE.convert(putawayJobDetail)); - } - - @GetMapping("/list") - @Operation(summary = "获得上架任务子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") - public CommonResult> getPutawayJobDetailList(@RequestParam("ids") Collection ids) { - List list = putawayJobDetailService.getPutawayJobDetailList(ids); - return success(PutawayJobDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得上架任务子分页") @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") @@ -92,6 +40,7 @@ public class PutawayJobDetailController { PageResult pageResult = putawayJobDetailService.getPutawayJobDetailPage(pageVO); return success(PutawayJobDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") @@ -105,21 +54,5 @@ public class PutawayJobDetailController { } return success(result); } - @GetMapping("/export-excel") - @Operation(summary = "导出上架任务子 Excel") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:export')") - @OperateLog(type = EXPORT) - public void exportPutawayJobDetailExcel(@Valid PutawayJobDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = putawayJobDetailService.getPutawayJobDetailList(exportReqVO); - // 导出 Excel - List datas = PutawayJobDetailConvert.INSTANCE.convertList02(list); - for(PutawayJobDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "上架任务子.xls", "数据", PutawayJobDetailExcelVO.class, datas); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index 24be863a..6d5c7053 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java @@ -1,38 +1,41 @@ package com.win.module.wms.controller.putawayJob; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.framework.excel.core.util.ExcelUtils; +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.putawayJob.vo.*; import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; +import com.win.module.wms.convert.putawayJob.PutawayJobMainConvert; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; +import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.service.putawayJob.PutawayJobDetailService; +import com.win.module.wms.service.putawayJob.PutawayJobMainService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import jodd.util.StringUtil; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; -import com.win.module.wms.convert.putawayJob.PutawayJobMainConvert; -import com.win.module.wms.service.putawayJob.PutawayJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 上架任务主") @RestController @@ -42,19 +45,19 @@ public class PutawayJobMainController { @Resource private PutawayJobMainService putawayJobMainService; - @Resource private PutawayJobDetailService putawayJobDetailService; - @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建上架任务主") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:create')") - public CommonResult createPutawayJobMain(@Valid @RequestBody PutawayJobMainCreateReqVO createReqVO) { - return success(putawayJobMainService.createPutawayJobMain(createReqVO)); + @GetMapping("/page") + @Operation(summary = "获得上架任务主分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:query')") + public CommonResult> getPutawayJobMainPage(@Valid PutawayJobMainPageReqVO pageVO) { + PageResult pageResult = putawayJobMainService.getPutawayJobMainPage(pageVO); + return success(PutawayJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PutawayJobMain:query')") @@ -68,64 +71,61 @@ public class PutawayJobMainController { } return success(result); } - @PutMapping("/update") - @Operation(summary = "更新上架任务主") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:update')") - public CommonResult updatePutawayJobMain(@Valid @RequestBody PutawayJobMainUpdateReqVO updateReqVO) { - putawayJobMainService.updatePutawayJobMain(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除上架任务主") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:delete')") - public CommonResult deletePutawayJobMain(@RequestParam("id") Long id) { - putawayJobMainService.deletePutawayJobMain(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得上架任务主") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:query')") - public CommonResult getPutawayJobMain(@RequestParam("id") Long id) { - PutawayJobMainDO putawayJobMain = putawayJobMainService.getPutawayJobMain(id); - return success(PutawayJobMainConvert.INSTANCE.convert(putawayJobMain)); - } - - @GetMapping("/list") - @Operation(summary = "获得上架任务主列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:query')") - public CommonResult> getPutawayJobMainList(@RequestParam("ids") Collection ids) { - List list = putawayJobMainService.getPutawayJobMainList(ids); - return success(PutawayJobMainConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @Operation(summary = "获得上架任务主分页") - @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:query')") - public CommonResult> getPutawayJobMainPage(@Valid PutawayJobMainPageReqVO pageVO) { - PageResult pageResult = putawayJobMainService.getPutawayJobMainPage(pageVO); - return success(PutawayJobMainConvert.INSTANCE.convertPage(pageResult)); - } @GetMapping("/export-excel") @Operation(summary = "导出上架任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:export')") @OperateLog(type = EXPORT) - public void exportPutawayJobMainExcel(@Valid PutawayJobMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportPutawayJobMainExcel(@Valid PutawayJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = putawayJobMainService.getPutawayJobMainList(exportReqVO); - // 导出 Excel - List datas = PutawayJobMainConvert.INSTANCE.convertList02(list); - for(PutawayJobMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "上架任务主.xls", "上架任务数据", PutawayJobMainExcelVO.class, resultList, mapDropDown); + } + + @PostMapping("/export-excel-senior") + @Operation(summary = "导出上架任务主 Excel") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:export')") + @OperateLog(type = EXPORT) + public void exportPutawayJobMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = putawayJobMainService.getPutawayJobMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "上架任务主.xls", "上架任务数据", PutawayJobMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + //组装vo + String[] status = JobStatusEnum.getStatusNameArray(); + mapDropDown.put(5, status); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(15, locationType); + mapDropDown.put(16, locationType); + String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(22, trueFalse); + mapDropDown.put(23, trueFalse); + mapDropDown.put(24, trueFalse); + mapDropDown.put(25, trueFalse); + mapDropDown.put(26, trueFalse); + mapDropDown.put(27, trueFalse); + mapDropDown.put(28, trueFalse); + mapDropDown.put(29, trueFalse); + mapDropDown.put(30, trueFalse); + mapDropDown.put(31, trueFalse); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(35, inventoryStatus); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(46, uom); + List resultList = new ArrayList<>(); + // 导出 + for(PutawayJobMainDO mainDO : list) { + List subList = putawayJobDetailService.selectList(mainDO.getId()); + for(PutawayJobDetailDO detailDO : subList) { + PutawayJobMainExcelVO vo = PutawayJobMainConvert.INSTANCE.convert(mainDO, detailDO); + resultList.add(vo); + } } - ExcelUtils.write(response, "上架任务主.xls", "数据", PutawayJobMainExcelVO.class, datas); + return resultList; } @GetMapping("/getPutawayJobById") @@ -172,4 +172,29 @@ public class PutawayJobMainController { return success(countByStatus); } + @Operation(summary = "承接任务") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:accept')") + @PostMapping(value = "/accept/{id}") + public CommonResult acceptPutawayJobMain(@PathVariable("id") Long id) { + int result = putawayJobMainService.acceptPutawayJobMain(id); + return success(result > 0); + } + + @Operation(summary = "取消承接任务") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:cancel-accept')") + @PostMapping(value = "/cancelAccept/{id}") + public CommonResult cancelAcceptPutawayJobMain(@PathVariable("id") Long id) { + int result = putawayJobMainService.cancelAcceptPutawayJobMain(id); + return success(result > 0); + } + + @PutMapping("/execute") + @Operation(summary = "执行采购收货任务主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')") + public CommonResult executePutawayJobMain(@Valid @RequestBody PutawayJobMainUpdateReqVO updateReqVO) { + Integer count = putawayJobMainService.executePutawayJobMain(updateReqVO); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java index 9f057c2b..f0f2012f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java @@ -1,19 +1,14 @@ package com.win.module.wms.controller.putawayJob.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; - import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.enums.job.JobStatusConverter; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -39,26 +34,15 @@ public class PutawayJobMainExcelVO { @ExcelProperty("要求截止时间") private LocalDateTime requestDueTime; - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("job_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @ExcelProperty(value = "状态", converter = JobStatusConverter.class) private String status; @ExcelProperty("过期时间") private LocalDateTime expiredTime; - @ExcelProperty("最后更新时间") - private LocalDateTime updateTime; - - @ExcelProperty("最后更新者Id") - private String updater; - @ExcelProperty("并发乐观锁") private String concurrencyStamp; - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String jobStageStatus; - @ExcelProperty("优先级") private Integer priority; @@ -81,11 +65,11 @@ public class PutawayJobMainExcelVO { private LocalDateTime completeTime; @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String fromLocationTypes; @ExcelProperty(value = "到库位类型范围", converter = DictConvert.class) - @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.LOCATION_TYPE) private String toLocationTypes; @ExcelProperty("单据号") @@ -94,15 +78,6 @@ public class PutawayJobMainExcelVO { @ExcelProperty("业务类型") private String businessType; - @ExcelProperty("备注") - private String remark; - - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者id") - private String creator; - @ExcelProperty("到仓库代码") private String toWarehouseCode; @@ -113,43 +88,105 @@ public class PutawayJobMainExcelVO { private String toAreaCodes; @ExcelProperty(value = "自动完成", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String autoComplete; @ExcelProperty(value = "允许修改库位", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyLocation; @ExcelProperty(value = "允许修改数量", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyQty; @ExcelProperty(value = "允许大于推荐数量", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowBiggerQty; @ExcelProperty(value = "允许小于推荐数量", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowSmallerQty; @ExcelProperty(value = "允许修改库存状态", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyInventoryStatus; @ExcelProperty(value = "允许连续扫描", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowContinuousScanning; @ExcelProperty(value = "允许部分完成", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowPartialComplete; @ExcelProperty(value = "允许修改批次", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyBatch; @ExcelProperty(value = "允许修改箱码", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String allowModifyPackingNumber; + @ExcelProperty("包装号") + private String packingNumber; + + @ExcelProperty("器具号") + private String containerNumber; + + @ExcelProperty("批次") + private String batch; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INVENTORY_STATUS) + private String inventoryStatus; + + @ExcelProperty("订单号") + private String poNumber; + + @ExcelProperty("订单行") + private String poLine; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("到库位代码") + private String toLocationCode; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemdesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("数量") + private BigDecimal qty; + + @ExcelProperty(value = "计量单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.UOM) + private String uom; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + 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/putawayJob/vo/PutawayJobMainUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainUpdateReqVO.java index a7d9095c..b7c23934 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainUpdateReqVO.java @@ -1,7 +1,12 @@ package com.win.module.wms.controller.putawayJob.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.validation.Valid; +import java.util.List; @Schema(description = "管理后台 - 上架任务主更新 Request VO") @Data @@ -9,4 +14,6 @@ import lombok.*; @ToString(callSuper = true) public class PutawayJobMainUpdateReqVO extends PutawayJobMainBaseVO { + @Schema(description = "子表数据") + private List<@Valid PutawayJobDetailUpdateReqVO> subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java index d1cf0ed0..b5e55563 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java @@ -1,35 +1,26 @@ package com.win.module.wms.controller.putawayRecord; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; +import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailRespVO; +import com.win.module.wms.convert.putawayRecord.PutawayRecordDetailConvert; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; +import com.win.module.wms.service.putawayRecord.PutawayRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; +import javax.annotation.Resource; +import javax.validation.Valid; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.putawayRecord.vo.*; -import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; -import com.win.module.wms.convert.putawayRecord.PutawayRecordDetailConvert; -import com.win.module.wms.service.putawayRecord.PutawayRecordDetailService; - @Tag(name = "管理后台 - 上架记录子") @RestController @RequestMapping("/wms/putaway-record-detail") @@ -42,29 +33,14 @@ public class PutawayRecordDetailController { @Resource private AdminUserApi userApi; - @PostMapping("/create") - @Operation(summary = "创建上架记录子") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:create')") - public CommonResult createPutawayRecordDetail(@Valid @RequestBody PutawayRecordDetailCreateReqVO createReqVO) { - return success(putawayRecordDetailService.createPutawayRecordDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新上架记录子") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:update')") - public CommonResult updatePutawayRecordDetail(@Valid @RequestBody PutawayRecordDetailUpdateReqVO updateReqVO) { - putawayRecordDetailService.updatePutawayRecordDetail(updateReqVO); - return success(true); + @GetMapping("/page") + @Operation(summary = "获得上架记录子分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") + public CommonResult> getPutawayRecordDetailPage(@Valid PutawayRecordDetailPageReqVO pageVO) { + PageResult pageResult = putawayRecordDetailService.getPutawayRecordDetailPage(pageVO); + return success(PutawayRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - @DeleteMapping("/delete") - @Operation(summary = "删除上架记录子") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:delete')") - public CommonResult deletePutawayRecordDetail(@RequestParam("id") Long id) { - putawayRecordDetailService.deletePutawayRecordDetail(id); - return success(true); - } @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") @@ -79,48 +55,4 @@ public class PutawayRecordDetailController { return success(result); } - @GetMapping("/get") - @Operation(summary = "获得上架记录子") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") - public CommonResult getPutawayRecordDetail(@RequestParam("id") Long id) { - PutawayRecordDetailDO putawayRecordDetail = putawayRecordDetailService.getPutawayRecordDetail(id); - return success(PutawayRecordDetailConvert.INSTANCE.convert(putawayRecordDetail)); - } - - @GetMapping("/list") - @Operation(summary = "获得上架记录子列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") - public CommonResult> getPutawayRecordDetailList(@RequestParam("ids") Collection ids) { - List list = putawayRecordDetailService.getPutawayRecordDetailList(ids); - return success(PutawayRecordDetailConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @Operation(summary = "获得上架记录子分页") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") - public CommonResult> getPutawayRecordDetailPage(@Valid PutawayRecordDetailPageReqVO pageVO) { - PageResult pageResult = putawayRecordDetailService.getPutawayRecordDetailPage(pageVO); - return success(PutawayRecordDetailConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出上架记录子 Excel") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:export')") - @OperateLog(type = EXPORT) - public void exportPutawayRecordDetailExcel(@Valid PutawayRecordDetailExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = putawayRecordDetailService.getPutawayRecordDetailList(exportReqVO); - // 导出 Excel - List datas = PutawayRecordDetailConvert.INSTANCE.convertList02(list); - - for(PutawayRecordDetailExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "上架记录子.xls", "数据", PutawayRecordDetailExcelVO.class, datas); - } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java index 6ebd2842..df0013db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java @@ -1,34 +1,40 @@ package com.win.module.wms.controller.putawayRecord; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.framework.excel.core.util.ExcelUtils; +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.putawayRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExcelVO; +import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; +import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; +import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainRespVO; +import com.win.module.wms.convert.putawayRecord.PutawayRecordMainConvert; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.putawayRecord.PutawayRecordDetailService; +import com.win.module.wms.service.putawayRecord.PutawayRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; -import com.win.module.wms.convert.putawayRecord.PutawayRecordMainConvert; -import com.win.module.wms.service.putawayRecord.PutawayRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 上架记录主") @RestController @@ -38,51 +44,12 @@ public class PutawayRecordMainController { @Resource private PutawayRecordMainService putawayRecordMainService; - @Resource - private AdminUserApi userApi; + private PutawayRecordDetailService putawayRecordDetailService; - @PostMapping("/create") - @Operation(summary = "创建上架记录主") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:create')") - public CommonResult createPutawayRecordMain(@Valid @RequestBody PutawayRecordMainCreateReqVO createReqVO) { - return success(putawayRecordMainService.createPutawayRecordMain(createReqVO)); - } - @PutMapping("/update") - @Operation(summary = "更新上架记录主") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:update')") - public CommonResult updatePutawayRecordMain(@Valid @RequestBody PutawayRecordMainUpdateReqVO updateReqVO) { - putawayRecordMainService.updatePutawayRecordMain(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除上架记录主") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:delete')") - public CommonResult deletePutawayRecordMain(@RequestParam("id") Long id) { - putawayRecordMainService.deletePutawayRecordMain(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得上架记录主") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:query')") - public CommonResult getPutawayRecordMain(@RequestParam("id") Long id) { - PutawayRecordMainDO putawayRecordMain = putawayRecordMainService.getPutawayRecordMain(id); - return success(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMain)); - } - - @GetMapping("/list") - @Operation(summary = "获得上架记录主列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:query')") - public CommonResult> getPutawayRecordMainList(@RequestParam("ids") Collection ids) { - List list = putawayRecordMainService.getPutawayRecordMainList(ids); - return success(PutawayRecordMainConvert.INSTANCE.convertList(list)); - } + @Resource + private AdminUserApi userApi; @GetMapping("/page") @Operation(summary = "获得上架记录主分页") @@ -91,6 +58,7 @@ public class PutawayRecordMainController { PageResult pageResult = putawayRecordMainService.getPutawayRecordMainPage(pageVO); return success(PutawayRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PutawayRecordMain:query')") @@ -109,17 +77,44 @@ public class PutawayRecordMainController { @Operation(summary = "导出上架记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:export')") @OperateLog(type = EXPORT) - public void exportPutawayRecordMainExcel(@Valid PutawayRecordMainExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + public void exportPutawayRecordMainExcel(@Valid PutawayRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = putawayRecordMainService.getPutawayRecordMainList(exportReqVO); - // 导出 Excel - List datas = PutawayRecordMainConvert.INSTANCE.convertList02(list); - for(PutawayRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "上架记录主.xls", "上架记录数据", PutawayRecordMainExcelVO.class, resultList, mapDropDown); + } + + @PostMapping("/export-excel-senior") + @Operation(summary = "导出上架记录主 Excel") + @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:export')") + @OperateLog(type = EXPORT) + public void exportPutawayRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = putawayRecordMainService.getPutawayRecordMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "上架记录主.xls", "上架记录数据", PutawayRecordMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); + mapDropDown.put(10, interfaceType); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(25, inventoryStatus); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(42, uom); + List resultList = new ArrayList<>(); + // 导出 + for(PutawayRecordMainDO mainDO : list) { + List subList = putawayRecordDetailService.selectList(mainDO.getId()); + for(PutawayRecordDetailDO detailDO : subList) { + PutawayRecordMainExcelVO vo = PutawayRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + resultList.add(vo); + } } - ExcelUtils.write(response, "上架记录主.xls", "数据", PutawayRecordMainExcelVO.class, datas); + return resultList; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java index cc903225..5f45c0ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java @@ -1,17 +1,13 @@ package com.win.module.wms.controller.putawayRecord.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; - import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -53,7 +49,7 @@ public class PutawayRecordMainExcelVO { private String departmentCode; @ExcelProperty(value = "接口类型", converter = DictConvert.class) - @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.INTERFACE_TYPE) private String interfaceType; @ExcelProperty("单据号") @@ -65,12 +61,6 @@ public class PutawayRecordMainExcelVO { @ExcelProperty("备注") private String remark; - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者Id") - private String creator; - @ExcelProperty("代码") private String code; @@ -95,4 +85,87 @@ public class PutawayRecordMainExcelVO { @ExcelProperty("是否可用") private String available; + @ExcelProperty("从包装号") + private String fromPackingNumber; + + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("从批次") + private String fromBatch; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.INVENTORY_STATUS) + private String inventoryStatus; + + @ExcelProperty("订单号") + private String poNumber; + + @ExcelProperty("订单行") + private String poLine; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("从库位组代码") + private String fromLocationGroupCode; + + @ExcelProperty("从库区代码") + private String fromAreaCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("到库位代码") + private String toLocationCode; + + @ExcelProperty("到库位组代码") + private String toLocationGroupCode; + + @ExcelProperty("到库区代码") + private String toAreaCode; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("数量") + private BigDecimal qty; + + @ExcelProperty(value = "计量单位", converter = DictConvert.class) + @DictFormat(DictTypeConstants.UOM) + private String uom; + + @ExcelProperty("任务明细ID") + private String jobDetailId; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty("到批次") + private String toBatch; + + @ExcelProperty("创建时间") + 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/convert/putawayJob/PutawayJobMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayJob/PutawayJobMainConvert.java index 1d99cc76..0e3633a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayJob/PutawayJobMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayJob/PutawayJobMainConvert.java @@ -5,9 +5,12 @@ import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExcelVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainRespVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import java.util.List; @@ -35,4 +38,13 @@ public interface PutawayJobMainConvert { List convertList02(List list); PutawayJobMainDO convert(PutawayRequestMainDO mainDO); + + @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), + @Mapping(source = "mainDO.remark", target = "remark"), + @Mapping(source = "mainDO.createTime", target = "createTime"), + @Mapping(source = "mainDO.creator", target = "creator"), + }) + PutawayJobMainExcelVO convert(PutawayJobMainDO mainDO, PutawayJobDetailDO detailDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayRecord/PutawayRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayRecord/PutawayRecordMainConvert.java index 011d6364..38cc6f92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayRecord/PutawayRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/putawayRecord/PutawayRecordMainConvert.java @@ -1,16 +1,18 @@ package com.win.module.wms.convert.putawayRecord; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExcelVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainRespVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; + +import java.util.List; /** * 上架记录主 Convert @@ -34,4 +36,14 @@ public interface PutawayRecordMainConvert { List convertList02(List list); + @Mappings({ + @Mapping(source = "mainDO.number", target = "number"), + @Mapping(source = "mainDO.remark", target = "remark"), + @Mapping(source = "mainDO.code", target = "code"), + @Mapping(source = "mainDO.interfaceType", target = "interfaceType"), + @Mapping(source = "mainDO.createTime", target = "createTime"), + @Mapping(source = "mainDO.creator", target = "creator"), + }) + PutawayRecordMainExcelVO convert(PutawayRecordMainDO mainDO, PutawayRecordDetailDO detailDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java index 9fa9f315..a3bbd861 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.putawayJob; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 上架任务子 Mapper * @@ -75,4 +75,9 @@ public interface PutawayJobDetailMapper extends BaseMapperX .orderByDesc(PutawayJobDetailDO::getId)); } + default List selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(PutawayJobDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java index 765dea1d..f3b8f4ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.putawayRecord; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 上架记录子 Mapper * @@ -94,4 +94,9 @@ public interface PutawayRecordDetailMapper extends BaseMapperX selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(PutawayRecordDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java index 9a49604d..ff3e19e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java @@ -1,17 +1,17 @@ package com.win.module.wms.dal.mysql.putawayRecord; -import java.util.*; - import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 上架记录主 Mapper * @@ -52,6 +52,7 @@ public interface PutawayRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + default List selectList(PutawayRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) @@ -81,4 +82,8 @@ public interface PutawayRecordMainMapper extends BaseMapperX selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index 071127b1..b52138f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -69,7 +69,7 @@ public interface InspectJobMainService { * @param pstatus 状态 * @return 采购订单主列表 */ - public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus); + InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus); /** * 高级搜索不分页 @@ -104,6 +104,6 @@ public interface InspectJobMainService { * @param inspectJobMainUpdateReqVO * @return */ - Integer excuteInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); + Integer executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 8c9bcd0c..a84b54f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -128,14 +128,13 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { return map; } - @Override @Transactional public Integer acceptInspectJobMain(Long id) { InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); if(!jobStatusState.accept()) { - throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); } Long userId = getLoginUserId(); AdminUserRespDTO userRespDTO = userApi.getUser(userId); @@ -153,7 +152,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); if(!jobStatusState.cancelAccept()) { - throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); } inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); inspectJobMainDO.setAcceptUserId(null); @@ -165,7 +164,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { @Override @Transactional - public Integer excuteInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { + public Integer executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { //查询数据 InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(inspectJobMainUpdateReqVO.getId()); JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java index 891498d5..1952d861 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.inspectRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; @@ -44,7 +43,7 @@ public interface InspectRecordMainService { * 获得检验记录主列表, 用于 Excel 导出 * * @param conditions 查询条件 - * @return 采购收货申请主列表 + * @return 检验记录主列表 */ List getInspectRecordMainList(CustomConditions conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index d3fe9fa7..a581c0f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -106,6 +106,6 @@ public interface PurchasereceiptJobMainService { * @param purchasereceiptJobMainUpdateReqVO * @return */ - Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO); + Integer executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index e7724956..33fd893b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -201,7 +201,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Override @Transactional - public Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) { + public Integer executePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) { //查询数据 PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(purchasereceiptJobMainUpdateReqVO.getId()); List subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java index 4e2cbf38..28f4fe0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java @@ -1,13 +1,12 @@ package com.win.module.wms.service.putawayJob; -import java.util.*; -import javax.validation.*; + import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; -import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.List; /** * 上架任务子 Service 接口 @@ -17,13 +16,12 @@ import com.win.framework.common.pojo.PageResult; public interface PutawayJobDetailService { /** - * 创建上架任务子 + * 获得上架任务子分页 * - * @param createReqVO 创建信息 - * @return 编号 + * @param pageReqVO 分页查询 + * @return 上架任务子分页 */ - Long createPutawayJobDetail(@Valid PutawayJobDetailCreateReqVO createReqVO); - + PageResult getPutawayJobDetailPage(PutawayJobDetailPageReqVO pageReqVO); /** * 获得用高级搜索上架任务子分页列表 @@ -33,44 +31,6 @@ public interface PutawayJobDetailService { */ PageResult getPutawayJobDetailSenior(CustomConditions conditions); - /** - * 更新上架任务子 - * - * @param updateReqVO 更新信息 - */ - void updatePutawayJobDetail(@Valid PutawayJobDetailUpdateReqVO updateReqVO); - - /** - * 删除上架任务子 - * - * @param id 编号 - */ - void deletePutawayJobDetail(Long id); - - /** - * 获得上架任务子 - * - * @param id 编号 - * @return 上架任务子 - */ - PutawayJobDetailDO getPutawayJobDetail(Long id); - - /** - * 获得上架任务子列表 - * - * @param ids 编号 - * @return 上架任务子列表 - */ - List getPutawayJobDetailList(Collection ids); - - /** - * 获得上架任务子分页 - * - * @param pageReqVO 分页查询 - * @return 上架任务子分页 - */ - PageResult getPutawayJobDetailPage(PutawayJobDetailPageReqVO pageReqVO); - /** * 获得上架任务子列表, 用于 Excel 导出 * @@ -79,4 +39,11 @@ public interface PutawayJobDetailService { */ List getPutawayJobDetailList(PutawayJobDetailExportReqVO exportReqVO); + /** + * 根据主表id查询上架任务任务 + * @param masterId + * @return + */ + List selectList(Long masterId); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java index 1b5db3fc..2e349914 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java @@ -1,24 +1,16 @@ package com.win.module.wms.service.putawayJob; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; -import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; import com.win.module.wms.dal.mysql.putawayJob.PutawayJobDetailMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import javax.annotation.Resource; +import java.util.List; /** * 上架任务子 Service 实现类 @@ -33,58 +25,23 @@ public class PutawayJobDetailServiceImpl implements PutawayJobDetailService { private PutawayJobDetailMapper putawayJobDetailMapper; @Override - public Long createPutawayJobDetail(PutawayJobDetailCreateReqVO createReqVO) { - // 插入 - PutawayJobDetailDO putawayJobDetail = PutawayJobDetailConvert.INSTANCE.convert(createReqVO); - putawayJobDetailMapper.insert(putawayJobDetail); - // 返回 - return putawayJobDetail.getId(); + public PageResult getPutawayJobDetailPage(PutawayJobDetailPageReqVO pageReqVO) { + return putawayJobDetailMapper.selectPage(pageReqVO); } - @Override - public void updatePutawayJobDetail(PutawayJobDetailUpdateReqVO updateReqVO) { - // 校验存在 - validatePutawayJobDetailExists(updateReqVO.getId()); - // 更新 - PutawayJobDetailDO updateObj = PutawayJobDetailConvert.INSTANCE.convert(updateReqVO); - putawayJobDetailMapper.updateById(updateObj); - } @Override public PageResult getPutawayJobDetailSenior(CustomConditions conditions) { return putawayJobDetailMapper.selectSenior(conditions); } - @Override - public void deletePutawayJobDetail(Long id) { - // 校验存在 - validatePutawayJobDetailExists(id); - // 删除 - putawayJobDetailMapper.deleteById(id); - } - - private void validatePutawayJobDetailExists(Long id) { - if (putawayJobDetailMapper.selectById(id) == null) { - throw exception(PUTAWAY_JOB_DETAIL_NOT_EXISTS); - } - } - - @Override - public PutawayJobDetailDO getPutawayJobDetail(Long id) { - return putawayJobDetailMapper.selectById(id); - } @Override - public List getPutawayJobDetailList(Collection ids) { - return putawayJobDetailMapper.selectBatchIds(ids); - } - - @Override - public PageResult getPutawayJobDetailPage(PutawayJobDetailPageReqVO pageReqVO) { - return putawayJobDetailMapper.selectPage(pageReqVO); + public List getPutawayJobDetailList(PutawayJobDetailExportReqVO exportReqVO) { + return putawayJobDetailMapper.selectList(exportReqVO); } @Override - public List getPutawayJobDetailList(PutawayJobDetailExportReqVO exportReqVO) { - return putawayJobDetailMapper.selectList(exportReqVO); + public List selectList(Long masterId) { + return putawayJobDetailMapper.selectList(masterId); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index 0c058fbf..21152c91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -1,17 +1,17 @@ package com.win.module.wms.service.putawayJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 上架任务主 Service 接口 * @@ -19,14 +19,6 @@ import org.springframework.lang.Nullable; */ public interface PutawayJobMainService { - /** - * 创建上架任务主 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createPutawayJobMain(@Valid PutawayJobMainCreateReqVO createReqVO); - /** * 获得用高级搜索户分页列表 * @@ -35,20 +27,6 @@ public interface PutawayJobMainService { */ PageResult getPutawayJobMainSenior(CustomConditions conditions); - /** - * 更新上架任务主 - * - * @param updateReqVO 更新信息 - */ - void updatePutawayJobMain(@Valid PutawayJobMainUpdateReqVO updateReqVO); - - /** - * 删除上架任务主 - * - * @param id 编号 - */ - void deletePutawayJobMain(Long id); - /** * 获得上架任务主 * @@ -57,14 +35,6 @@ public interface PutawayJobMainService { */ PutawayJobMainDO getPutawayJobMain(Long id); - /** - * 获得上架任务主列表 - * - * @param ids 编号 - * @return 上架任务主列表 - */ - List getPutawayJobMainList(Collection ids); - /** * 获得上架任务主分页 * @@ -80,6 +50,15 @@ public interface PutawayJobMainService { * @return 上架任务主列表 */ List getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO); + + /** + * 获得上架任务主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 上架任务主列表 + */ + List getPutawayJobMainList(CustomConditions conditions); + /** * 校验任务状态正确 *@author chenfang @@ -95,4 +74,26 @@ public interface PutawayJobMainService { * @return */ Map getCountByStatus(@Nullable Collection types); + + /** + * 承接任务 + * @param id + * @return + */ + Integer acceptPutawayJobMain(Long id); + + /** + * 取消承接任务 + * @param id + * @return + */ + Integer cancelAcceptPutawayJobMain(Long id); + + /** + * 执行任务 + * @param putawayJobMainUpdateReqVO + * @return + */ + Integer executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 9fdedcdb..7082e219 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -1,24 +1,47 @@ package com.win.module.wms.service.putawayJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; +import com.win.framework.common.pojo.PageResult; +import com.win.module.infra.api.trends.TrendsApi; +import com.win.module.infra.enums.TrendsTypeEnum; +import com.win.module.system.api.serialnumber.SerialNumberApi; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.system.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailUpdateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; +import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; +import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; +import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; +import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper; +import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper; +import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper; +import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; +import com.win.module.wms.enums.job.JobStatusState; +import com.win.module.wms.enums.request.RequestStatusEnum; +import com.win.module.wms.service.expectin.ExpectinService; +import com.win.module.wms.service.transaction.TransactionService; +import com.win.module.wms.util.JobUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.*; -import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.putawayJob.PutawayJobMainConvert; -import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static com.win.module.wms.enums.ErrorCodeConstants.*; /** @@ -32,52 +55,35 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { @Resource private PutawayJobMainMapper putawayJobMainMapper; + @Resource + private PutawayRecordMainMapper putawayRecordMainMapper; + @Resource + private PutawayRecordDetailMapper putawayRecordDetailMapper; + @Resource + private PutawayRequestMainMapper putawayRequestMainMapper; + @Resource + private AdminUserApi userApi; + @Resource + private TrendsApi trendsApi; + @Resource + private SerialNumberApi serialNumberApi; + @Resource + private JobUtils jobUtils; + @Resource + private TransactionService transactionService; + @Resource + private ExpectinService expectinService; - @Override - public Long createPutawayJobMain(PutawayJobMainCreateReqVO createReqVO) { - // 插入 - PutawayJobMainDO putawayJobMain = PutawayJobMainConvert.INSTANCE.convert(createReqVO); - putawayJobMainMapper.insert(putawayJobMain); - // 返回 - return putawayJobMain.getId(); - } @Override public PageResult getPutawayJobMainSenior(CustomConditions conditions) { return putawayJobMainMapper.selectSenior(conditions); } - @Override - public void updatePutawayJobMain(PutawayJobMainUpdateReqVO updateReqVO) { - // 校验存在 - validatePutawayJobMainExists(updateReqVO.getId()); - // 更新 - PutawayJobMainDO updateObj = PutawayJobMainConvert.INSTANCE.convert(updateReqVO); - putawayJobMainMapper.updateById(updateObj); - } - - @Override - public void deletePutawayJobMain(Long id) { - // 校验存在 - validatePutawayJobMainExists(id); - // 删除 - putawayJobMainMapper.deleteById(id); - } - - private void validatePutawayJobMainExists(Long id) { - if (putawayJobMainMapper.selectById(id) == null) { - throw exception(PUTAWAY_JOB_MAIN_NOT_EXISTS); - } - } @Override public PutawayJobMainDO getPutawayJobMain(Long id) { return putawayJobMainMapper.selectById(id); } - @Override - public List getPutawayJobMainList(Collection ids) { - return putawayJobMainMapper.selectBatchIds(ids); - } - @Override public PageResult getPutawayJobMainPage(PutawayJobMainPageReqVO pageReqVO) { return putawayJobMainMapper.selectPage(pageReqVO); @@ -87,15 +93,21 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { public List getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO) { return putawayJobMainMapper.selectList(exportReqVO); } + + @Override + public List getPutawayJobMainList(CustomConditions conditions) { + return putawayJobMainMapper.selectList(conditions); + } + @Override public PutawayJobMainDO putawayJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("number",pnumber); - queryWrapper.eq("status",pstatus); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("number", pnumber); + queryWrapper.eq("status", pstatus); PutawayJobMainDO putawayJobMainDO = putawayJobMainMapper.selectOne(queryWrapper); - if(putawayJobMainDO != null){ + if (putawayJobMainDO != null) { return putawayJobMainDO; - }else { + } else { throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); } } @@ -108,4 +120,133 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { map.put("count", l.intValue()); return map; } + + @Override + @Transactional + public Integer acceptPutawayJobMain(Long id) { + PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus()); + if(!jobStatusState.accept()) { + throw exception(PUTAWAY_JOB_MAIN_STATUS_ERROR); + } + Long userId = getLoginUserId(); + AdminUserRespDTO userRespDTO = userApi.getUser(userId); + putawayJobMainDO.setStatus(jobStatusState.getState().getCode()); + putawayJobMainDO.setAcceptUserId(String.valueOf(userId)); + putawayJobMainDO.setAcceptUserName(userRespDTO.getNickname()); + putawayJobMainDO.setAcceptTime(LocalDateTime.now()); + trendsApi.createTrends(id, "putawayJob", "承接了上架任务", TrendsTypeEnum.UPDATE); + return putawayJobMainMapper.updateById(putawayJobMainDO); + } + + @Override + @Transactional + public Integer cancelAcceptPutawayJobMain(Long id) { + PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus()); + if(!jobStatusState.cancelAccept()) { + throw exception(PUTAWAY_JOB_MAIN_STATUS_ERROR); + } + putawayJobMainDO.setStatus(jobStatusState.getState().getCode()); + putawayJobMainDO.setAcceptUserId(null); + putawayJobMainDO.setAcceptUserName(null); + putawayJobMainDO.setAcceptTime(null); + trendsApi.createTrends(id, "putawayJob", "取消了上架任务", TrendsTypeEnum.UPDATE); + return putawayJobMainMapper.updateById(putawayJobMainDO); + } + + @Override + @Transactional + public Integer executePutawayJobMain(PutawayJobMainUpdateReqVO putawayJobMainUpdateReqVO) { + //查询数据 + PutawayJobMainDO putawayJobMainDO = this.validatePutawayJobMainExists(putawayJobMainUpdateReqVO.getId()); + JobStatusState jobStatusState = new JobStatusState(putawayJobMainDO.getStatus()); + boolean flag = jobStatusState.execute(); + if(!flag) { + throw new ServiceException(PUTAWAY_JOB_MAIN_STATUS_ERROR); + } + //更新完成信息 + Long userId = getLoginUserId(); + AdminUserRespDTO userRespDTO = userApi.getUser(userId); + putawayJobMainDO.setStatus(jobStatusState.getState().getCode()); + putawayJobMainDO.setCompleteTime(LocalDateTime.now()); + putawayJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId())); + putawayJobMainDO.setCompleteUserName(userRespDTO.getNickname()); + //更新任务表状态 + int result = putawayJobMainMapper.updateById(putawayJobMainDO); + //创建采购收货记录主表 + PutawayRecordMainDO putawayRecordMainDO = new PutawayRecordMainDO(); + BeanUtils.copyProperties(putawayJobMainDO, putawayRecordMainDO); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode()); + putawayRecordMainDO.setNumber(number); + putawayRecordMainDO.setJobNumber(putawayJobMainDO.getNumber()); + putawayRecordMainDO.setId(null); + putawayRecordMainDO.setCreator(null); + putawayRecordMainDO.setCreateTime(null); + putawayRecordMainDO.setUpdater(null); + putawayRecordMainDO.setUpdateTime(null); + putawayRecordMainMapper.insert(putawayRecordMainDO); + //库存事务 + List transactionCreateReqVOList = new ArrayList<>(); + List putawayJobDetailUpdateReqVOList = putawayJobMainUpdateReqVO.getSubList(); + List putawayRecordDetailDOList = new ArrayList<>(); + for(PutawayJobDetailUpdateReqVO putawayJobDetailUpdateReqVO : putawayJobDetailUpdateReqVOList) { + PutawayRecordDetailDO putawayRecordDetailDO = new PutawayRecordDetailDO(); + BeanUtils.copyProperties(putawayJobDetailUpdateReqVO, putawayRecordDetailDO); + putawayRecordDetailDO.setMasterId(putawayRecordMainDO.getId()); + putawayRecordDetailDO.setNumber(number); + putawayRecordDetailDO.setJobDetailId(String.valueOf(putawayJobDetailUpdateReqVO.getId())); + putawayRecordDetailDO.setId(null); + putawayRecordDetailDO.setCreator(null); + putawayRecordDetailDO.setCreateTime(null); + putawayRecordDetailDO.setUpdater(null); + putawayRecordDetailDO.setUpdateTime(null); + putawayRecordDetailDOList.add(putawayRecordDetailDO); + //添加库存事务list + TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); + BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVO); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PutawayJob"); + transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); + transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); + transactionCreateReqVO.setRecordNumber(number); + transactionCreateReqVO.setId(null); + //待确定库存事务信息 + transactionCreateReqVOList.add(transactionCreateReqVO); + } + if(!putawayRecordDetailDOList.isEmpty()) { + putawayRecordDetailMapper.insertBatch(putawayRecordDetailDOList); + } + List typeList = new ArrayList<>(); + typeList.add(JobStatusEnum.PENDING.getCode()); + typeList.add(JobStatusEnum.PROCESSING.getCode()); + Long count = putawayJobMainMapper.selectListCount(typeList, putawayJobMainDO.getRequestNumber()); + PutawayRequestMainDO putawayRequestMainDO = putawayRequestMainMapper.selectByNumber(putawayJobMainDO.getRequestNumber()); + //申请单下所有任务全部完成 + if(count == 0) { + putawayRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode()); + putawayRequestMainMapper.updateById(putawayRequestMainDO); + } else if(putawayRequestMainDO.getStatus().equals(RequestStatusEnum.HANDLING.getCode())) {//部分完成 + putawayRequestMainDO.setStatus(RequestStatusEnum.PARTIAL.getCode()); + putawayRequestMainMapper.updateById(putawayRequestMainDO); + } + //增加库存事务 + transactionService.createTransaction(transactionCreateReqVOList); + //移除预计入 + expectinService.deleteExpectinByJobNumber(putawayJobMainDO.getNumber()); + //变更记录 + trendsApi.createTrends(putawayJobMainDO.getId(), "putawayJob", "执行了上架任务", TrendsTypeEnum.UPDATE); + return result; + } + + private PutawayJobMainDO validatePutawayJobMainExists(Long id) { + PutawayJobMainDO putawayJobMainDO = putawayJobMainMapper.selectById(id); + if (putawayJobMainDO == null) { + throw exception(INSPECT_JOB_MAIN_NOT_EXISTS); + } + return putawayJobMainDO; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java index 98d53c4b..d21f931f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java @@ -1,15 +1,11 @@ package com.win.module.wms.service.putawayRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailCreateReqVO; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.List; /** * 上架记录子 Service 接口 @@ -18,20 +14,6 @@ import com.win.framework.common.pojo.PageResult; */ public interface PutawayRecordDetailService { - /** - * 创建上架记录子 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createPutawayRecordDetail(@Valid PutawayRecordDetailCreateReqVO createReqVO); - - /** - * 更新上架记录子 - * - * @param updateReqVO 更新信息 - */ - void updatePutawayRecordDetail(@Valid PutawayRecordDetailUpdateReqVO updateReqVO); /** * 获得用高级搜索上架记录子分页列表 * @@ -39,28 +21,6 @@ public interface PutawayRecordDetailService { * @return 分页列表 */ PageResult getPutawayRecordDetailSenior(CustomConditions conditions); - /** - * 删除上架记录子 - * - * @param id 编号 - */ - void deletePutawayRecordDetail(Long id); - - /** - * 获得上架记录子 - * - * @param id 编号 - * @return 上架记录子 - */ - PutawayRecordDetailDO getPutawayRecordDetail(Long id); - - /** - * 获得上架记录子列表 - * - * @param ids 编号 - * @return 上架记录子列表 - */ - List getPutawayRecordDetailList(Collection ids); /** * 获得上架记录子分页 @@ -71,11 +31,10 @@ public interface PutawayRecordDetailService { PageResult getPutawayRecordDetailPage(PutawayRecordDetailPageReqVO pageReqVO); /** - * 获得上架记录子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 上架记录子列表 + * 根据主表id查询上架记录 + * @param masterId + * @return */ - List getPutawayRecordDetailList(PutawayRecordDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java index d4fa3acd..c81ad884 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java @@ -5,6 +5,7 @@ import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailCreateR import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,59 +33,19 @@ public class PutawayRecordDetailServiceImpl implements PutawayRecordDetailServic @Resource private PutawayRecordDetailMapper putawayRecordDetailMapper; - @Override - public Long createPutawayRecordDetail(PutawayRecordDetailCreateReqVO createReqVO) { - // 插入 - PutawayRecordDetailDO putawayRecordDetail = PutawayRecordDetailConvert.INSTANCE.convert(createReqVO); - putawayRecordDetailMapper.insert(putawayRecordDetail); - // 返回 - return putawayRecordDetail.getId(); - } - - @Override - public void updatePutawayRecordDetail(PutawayRecordDetailUpdateReqVO updateReqVO) { - // 校验存在 - validatePutawayRecordDetailExists(updateReqVO.getId()); - // 更新 - PutawayRecordDetailDO updateObj = PutawayRecordDetailConvert.INSTANCE.convert(updateReqVO); - putawayRecordDetailMapper.updateById(updateObj); - } - - @Override - public void deletePutawayRecordDetail(Long id) { - // 校验存在 - validatePutawayRecordDetailExists(id); - // 删除 - putawayRecordDetailMapper.deleteById(id); - } - - private void validatePutawayRecordDetailExists(Long id) { - if (putawayRecordDetailMapper.selectById(id) == null) { - throw exception(PUTAWAY_RECORD_DETAIL_NOT_EXISTS); - } - } - - @Override - public PutawayRecordDetailDO getPutawayRecordDetail(Long id) { - return putawayRecordDetailMapper.selectById(id); - } - - @Override - public List getPutawayRecordDetailList(Collection ids) { - return putawayRecordDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getPutawayRecordDetailPage(PutawayRecordDetailPageReqVO pageReqVO) { return putawayRecordDetailMapper.selectPage(pageReqVO); } - @Override - public List getPutawayRecordDetailList(PutawayRecordDetailExportReqVO exportReqVO) { - return putawayRecordDetailMapper.selectList(exportReqVO); - } @Override public PageResult getPutawayRecordDetailSenior(CustomConditions conditions) { return putawayRecordDetailMapper.selectSenior(conditions); } + + @Override + public List selectList(Long masterId) { + return putawayRecordDetailMapper.selectList(masterId); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java index 1ad10d4f..0bf4df42 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java @@ -1,15 +1,12 @@ package com.win.module.wms.service.putawayRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import java.util.List; /** * 上架记录主 Service 接口 @@ -19,13 +16,12 @@ import com.win.framework.common.pojo.PageResult; public interface PutawayRecordMainService { /** - * 创建上架记录主 + * 获得上架记录主分页 * - * @param createReqVO 创建信息 - * @return 编号 + * @param pageReqVO 分页查询 + * @return 上架记录主分页 */ - Long createPutawayRecordMain(@Valid PutawayRecordMainCreateReqVO createReqVO); - + PageResult getPutawayRecordMainPage(PutawayRecordMainPageReqVO pageReqVO); /** * 获得用高级搜索上架记录主分页列表 @@ -36,49 +32,19 @@ public interface PutawayRecordMainService { PageResult getPutawayRecordMainSenior(CustomConditions conditions); /** - * 更新上架记录主 - * - * @param updateReqVO 更新信息 - */ - void updatePutawayRecordMain(@Valid PutawayRecordMainUpdateReqVO updateReqVO); - - /** - * 删除上架记录主 - * - * @param id 编号 - */ - void deletePutawayRecordMain(Long id); - - /** - * 获得上架记录主 - * - * @param id 编号 - * @return 上架记录主 - */ - PutawayRecordMainDO getPutawayRecordMain(Long id); - - /** - * 获得上架记录主列表 + * 获得上架记录主列表, 用于 Excel 导出 * - * @param ids 编号 + * @param exportReqVO 查询条件 * @return 上架记录主列表 */ - List getPutawayRecordMainList(Collection ids); - - /** - * 获得上架记录主分页 - * - * @param pageReqVO 分页查询 - * @return 上架记录主分页 - */ - PageResult getPutawayRecordMainPage(PutawayRecordMainPageReqVO pageReqVO); + List getPutawayRecordMainList(PutawayRecordMainExportReqVO exportReqVO); /** * 获得上架记录主列表, 用于 Excel 导出 * - * @param exportReqVO 查询条件 + * @param conditions 查询条件 * @return 上架记录主列表 */ - List getPutawayRecordMainList(PutawayRecordMainExportReqVO exportReqVO); + List getPutawayRecordMainList(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java index 8fd7b30d..b4ca5424 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java @@ -1,24 +1,16 @@ package com.win.module.wms.service.putawayRecord; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; -import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.putawayRecord.PutawayRecordMainConvert; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import javax.annotation.Resource; +import java.util.List; /** * 上架记录主 Service 实现类 @@ -33,58 +25,23 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService { private PutawayRecordMainMapper putawayRecordMainMapper; @Override - public Long createPutawayRecordMain(PutawayRecordMainCreateReqVO createReqVO) { - // 插入 - PutawayRecordMainDO putawayRecordMain = PutawayRecordMainConvert.INSTANCE.convert(createReqVO); - putawayRecordMainMapper.insert(putawayRecordMain); - // 返回 - return putawayRecordMain.getId(); - } - - @Override - public void updatePutawayRecordMain(PutawayRecordMainUpdateReqVO updateReqVO) { - // 校验存在 - validatePutawayRecordMainExists(updateReqVO.getId()); - // 更新 - PutawayRecordMainDO updateObj = PutawayRecordMainConvert.INSTANCE.convert(updateReqVO); - putawayRecordMainMapper.updateById(updateObj); - } - - @Override - public void deletePutawayRecordMain(Long id) { - // 校验存在 - validatePutawayRecordMainExists(id); - // 删除 - putawayRecordMainMapper.deleteById(id); + public PageResult getPutawayRecordMainPage(PutawayRecordMainPageReqVO pageReqVO) { + return putawayRecordMainMapper.selectPage(pageReqVO); } - private void validatePutawayRecordMainExists(Long id) { - if (putawayRecordMainMapper.selectById(id) == null) { - throw exception(PUTAWAY_RECORD_MAIN_NOT_EXISTS); - } - } @Override public PageResult getPutawayRecordMainSenior(CustomConditions conditions) { return putawayRecordMainMapper.selectSenior(conditions); } - @Override - public PutawayRecordMainDO getPutawayRecordMain(Long id) { - return putawayRecordMainMapper.selectById(id); - } @Override - public List getPutawayRecordMainList(Collection ids) { - return putawayRecordMainMapper.selectBatchIds(ids); - } - - @Override - public PageResult getPutawayRecordMainPage(PutawayRecordMainPageReqVO pageReqVO) { - return putawayRecordMainMapper.selectPage(pageReqVO); + public List getPutawayRecordMainList(PutawayRecordMainExportReqVO exportReqVO) { + return putawayRecordMainMapper.selectList(exportReqVO); } @Override - public List getPutawayRecordMainList(PutawayRecordMainExportReqVO exportReqVO) { - return putawayRecordMainMapper.selectList(exportReqVO); + public List getPutawayRecordMainList(CustomConditions conditions) { + return putawayRecordMainMapper.selectSeniorList(conditions); } }