From 17fad562fa450d5d3e56e3bd3d65bf5d82b4c641 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 6 Dec 2023 15:06:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CustomerreceiptRequestMainExportReqVO.java | 6 --- .../CustomerreceiptRequestMainPageReqVO.java | 4 +- .../CustomerreturnJobMainController.java | 18 ++++---- .../CustomersettleRequestMainPageReqVO.java | 4 +- .../DeliverPlanDetailController.java | 11 +++++ .../CustomersettleRequestDetailConvert.java | 2 + .../CustomerreceiptRequestMainDO.java | 4 +- .../CustomerreturnJobMainDO.java | 4 +- .../CustomerreturnRequestMainDO.java | 4 +- .../CustomersettleRequestMainDO.java | 4 +- .../deliverRequest/DeliverRequestMainDO.java | 4 +- .../CustomerreceiptRequestMainMapper.java | 6 +-- .../CustomerreturnJobMainMapper.java | 4 +- .../CustomerreturnRequestMainMapper.java | 4 +- .../CustomersettleRequestMainMapper.java | 4 +- .../DeliverRequestMainMapper.java | 4 +- ...CustomerreceiptRequestMainServiceImpl.java | 4 +- .../CustomerreturnJobMainService.java | 2 +- .../CustomerreturnJobMainServiceImpl.java | 4 +- .../CustomerreturnRequestMainServiceImpl.java | 8 ++-- .../CustomersettleRequestMainServiceImpl.java | 45 +++++++++---------- .../deliverJob/DeliverJobMainServiceImpl.java | 32 ++++++++++++- .../DeliverRequestMainService.java | 1 + .../DeliverRequestMainServiceImpl.java | 8 ++-- 24 files changed, 114 insertions(+), 77 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java index 7869b715..d5452983 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExportReqVO.java @@ -100,10 +100,4 @@ public class CustomerreceiptRequestMainExportReqVO { @Schema(description = "直接生成记录") private String directCreateRecord; - - @Schema(description = "入库库存状态范围") - private String inInventoryStatus; - - @Schema(description = "出库库存状态范围") - private String outInventoryStatus; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java index c3d16de2..86eefa6c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainPageReqVO.java @@ -104,8 +104,8 @@ public class CustomerreceiptRequestMainPageReqVO extends PageParam { private String directCreateRecord; @Schema(description = "入库库存状态范围") - private String inInventoryStatus; + private String inInventoryStatuses; @Schema(description = "出库库存状态范围") - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java index b021ee1f..b8fc44cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java @@ -187,11 +187,13 @@ public class CustomerreturnJobMainController { if(result==null) { return success(result); }; - CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO(); - reqVO.setMasterId(result.getId()); - List customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO); - List customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList); - result.setSubList(customerreturnJobDetailExcelVOS); +// CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO(); +// reqVO.setMasterId(result.getId()); +// List customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO); +// List customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList); +// result.setSubList(customerreturnJobDetailExcelVOS); + List subList = customerreturnJobDetailService.selectList(id); + result.setSubList(subList); return success(result); } @@ -241,8 +243,8 @@ public class CustomerreturnJobMainController { @Operation(summary = "执行客户退货任务主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:execute')") - public CommonResult closeCustomerreturnRequestMain(@Valid @RequestBody CustomerreturnJobMainUpdateReqVO updateReqVO) { - Integer count = customerreturnJobMainService.executeCustomerreturnJobMain(updateReqVO); - return success(count > 0); + public CommonResult closeCustomerreturnRequestMain(@Valid @RequestBody CustomerreturnJobMainUpdateReqVO updateReqVO) { + String number = customerreturnJobMainService.executeCustomerreturnJobMain(updateReqVO); + return success(number); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainPageReqVO.java index 0e7bf7b9..b599fa0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainPageReqVO.java @@ -83,8 +83,8 @@ public class CustomersettleRequestMainPageReqVO extends PageParam { private String directCreateRecord; @Schema(description = "入库库存状态范围") - private String inInventoryStatus; + private String inInventoryStatuses; @Schema(description = "出库库存状态范围") - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java index 1a1a90f4..bab97336 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java @@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverPlan; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.deliverRequest.vo.DeliverRequestDetailRespVO; +import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -122,4 +125,12 @@ public class DeliverPlanDetailController { ExcelUtils.write(response, "发货计划子.xls", "数据", DeliverPlanDetailExcelVO.class, datas); } + @GetMapping("/detailList") + @Operation(summary = "根据主表id查询子表") + @Parameter(name = "masterId", description = "主表id", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:detailList')") + public CommonResult> selectDetailByMasterID(@RequestParam("id") Long masterId) { + List list = deliverPlanDetailService.selectListByMasterID(masterId); + return success(DeliverPlanDetailConvert.INSTANCE.convertList(list)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRequest/CustomersettleRequestDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRequest/CustomersettleRequestDetailConvert.java index 337b54c7..c25bbbe4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRequest/CustomersettleRequestDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customersettleRequest/CustomersettleRequestDetailConvert.java @@ -52,4 +52,6 @@ public interface CustomersettleRequestDetailConvert { CustomersettleRequestDetailCreateReqVO convert1(CustomersettleRequestDetailDO detailDO); List convertList03(List list); + + CustomersettleRequestDetailCreateReqVO convertDoToVo(CustomersettleRequestDetailDO customersettleRequestDetailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java index 96d9351a..2cf7535e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java @@ -158,10 +158,10 @@ public class CustomerreceiptRequestMainDO extends BaseDO { /** * 入库库存状态范围 */ - private String inInventoryStatus; + private String inInventoryStatuses; /** * 出库库存状态范围 */ - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java index 89d268cf..24b1f22e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java @@ -246,9 +246,9 @@ public class CustomerreturnJobMainDO extends BaseDO { /** * 入库库存状态范围 */ - private String inInventoryStatus; + private String inInventoryStatuses; /** * 出库库存状态范围 */ - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java index 288d2585..f55023da 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java @@ -182,9 +182,9 @@ public class CustomerreturnRequestMainDO extends BaseDO { /** * 入库库存状态范围 */ - private String inInventoryStatus; + private String inInventoryStatuses; /** * 出库库存状态范围 */ - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java index d2fba13d..0956200b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java @@ -133,9 +133,9 @@ public class CustomersettleRequestMainDO extends BaseDO { /** * 入库库存状态范围 */ - private String inInventoryStatus; + private String inInventoryStatuses; /** * 出库库存状态范围 */ - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java index ff639df9..3ef5b41d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java @@ -172,10 +172,10 @@ public class DeliverRequestMainDO extends BaseDO { /** * 入库库存状态范围 */ - private String inInventoryStatus; + private String inInventoryStatuses; /** * 出库库存状态范围 */ - private String outInventoryStatus; + private String outInventoryStatuses; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java index 6d226be1..5f543487 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRequest/CustomerreceiptRequestMainMapper.java @@ -50,8 +50,8 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { @@ -87,8 +87,6 @@ public interface CustomerreceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java index d18c18b6..0da72920 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestMainMapper.java @@ -53,8 +53,8 @@ public interface CustomerreturnRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java index e264678f..21224dc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRequest/CustomersettleRequestMainMapper.java @@ -44,8 +44,8 @@ public interface CustomersettleRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java index 0cd4e435..24eb28ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestMainMapper.java @@ -52,8 +52,8 @@ public interface DeliverRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java index dfef8fbe..dfb28e4f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java @@ -96,8 +96,8 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq customerreceiptRequestMain.setToLocationTypes(businesstypeDO.getInLocationTypes()); customerreceiptRequestMain.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); customerreceiptRequestMain.setToAreaCodes(businesstypeDO.getInAreaCodes()); - customerreceiptRequestMain.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - customerreceiptRequestMain.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + customerreceiptRequestMain.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + customerreceiptRequestMain.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); customerreceiptRequestMain.setRequestTime(LocalDateTime.now()); //调用自动执行方法 if(RequestStatusEnum.HANDLING.getCode().equals(customerreceiptRequestMain.getStatus())) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index c42b7bd2..ae377d7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -141,5 +141,5 @@ public interface CustomerreturnJobMainService { * @param customerreturnJobMainUpdateReqVO * @return */ - Integer executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO); + String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 57aaf1f9..a6d89139 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -233,7 +233,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe @Override @Transactional - public Integer executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO) { + public String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO) { //查询数据 CustomerreturnJobMainDO customerreturnJobMainDO = this.validateCustomerreturnJobMainExists(customerreturnJobMainUpdateReqVO.getId()); List subList = customerreturnJobDetailService.selectList(customerreturnJobMainDO.getId()); @@ -350,6 +350,6 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe expectoutService.deleteExpectoutByJobNumber(customerreturnJobMainDO.getNumber()); //变更记录 trendsApi.createTrends(customerreturnJobMainDO.getId(), "customerreturnJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE); - return result; + return number; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 50e9f50b..56975809 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -340,8 +340,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectJob"); customerreturnJobMainDO.setBusinessType(businesstypeDO.getCode()); - customerreturnJobMainDO.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - customerreturnJobMainDO.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + customerreturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + customerreturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); customerreturnJobMainMapper.insert(customerreturnJobMainDO); List expectinCreateReqVOList = new ArrayList<>(); List customerreturnJobDetailDOList = new ArrayList<>(); @@ -638,8 +638,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque mainDo.setToLocationTypes(businesstypeDO.getInLocationTypes()); mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes()); - mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java index 26d4d6d2..e8d0f1c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java @@ -259,25 +259,24 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque * @param detailDOList 客户收货子 */ private void generateRecord(CustomersettleRequestMainDO mainDO, List detailDOList) { - if ("TRUE".equals(mainDO.getDirectCreateRecord())) { - CustomersettleRecordMainCreateReqVO customersettleRecordMainCreateReqVO = new CustomersettleRecordMainCreateReqVO(); - BeanUtils.copyProperties(mainDO, customersettleRecordMainCreateReqVO); - customersettleRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_REQUEST.getCode()); - customersettleRecordMainCreateReqVO.setNumber(number); - //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomersettleRecord"); - customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO); - customersettleRecordMainMapper.insert(convert); - for (CustomersettleRequestDetailDO customersettleRequestDetailDO : detailDOList) { - CustomersettleRecordDetailCreateReqVO customersettleRecordDetailCreateReqVO = new CustomersettleRecordDetailCreateReqVO(); - BeanUtils.copyProperties(customersettleRequestDetailDO, customersettleRecordDetailCreateReqVO); - customersettleRecordDetailCreateReqVO.setNumber(number); - customersettleRecordDetailCreateReqVO.setMasterId(convert.getId().toString()); - customersettleRecordDetailMapper.insert(CustomersettleRecordDetailConvert.INSTANCE.convert(customersettleRecordDetailCreateReqVO)); - trendsApi.createTrends(mainDO.getId(), "CustomersettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE); - } + CustomersettleRecordMainCreateReqVO customersettleRecordMainCreateReqVO = new CustomersettleRecordMainCreateReqVO(); + BeanUtils.copyProperties(mainDO, customersettleRecordMainCreateReqVO); + customersettleRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); + + String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_REQUEST.getCode()); + customersettleRecordMainCreateReqVO.setNumber(number); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomersettleRecord"); + customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); + CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO); + customersettleRecordMainMapper.insert(convert); + for (CustomersettleRequestDetailDO customersettleRequestDetailDO : detailDOList) { + CustomersettleRecordDetailCreateReqVO customersettleRecordDetailCreateReqVO = new CustomersettleRecordDetailCreateReqVO(); + BeanUtils.copyProperties(customersettleRequestDetailDO, customersettleRecordDetailCreateReqVO); + customersettleRecordDetailCreateReqVO.setNumber(number); + customersettleRecordDetailCreateReqVO.setMasterId(convert.getId().toString()); + customersettleRecordDetailMapper.insert(CustomersettleRecordDetailConvert.INSTANCE.convert(customersettleRecordDetailCreateReqVO)); + trendsApi.createTrends(mainDO.getId(), "CustomersettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE); } } @@ -457,8 +456,8 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerSettleRequest"); mainDo.setBusinessType(businesstypeDO.getCode()); mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); - mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); } /** @@ -507,7 +506,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque mainDo.setBusinessType(businesstypeDO.getCode()); mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); - mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 1db9f1b9..31eb2f3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -11,6 +11,8 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO; +import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO; +import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailUpdateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; @@ -18,8 +20,10 @@ import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert; +import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO; +import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; @@ -37,6 +41,7 @@ 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.customerreceiptRequest.CustomerreceiptRequestMainService; +import com.win.module.wms.service.customersettleRequest.CustomersettleRequestMainService; import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchase.PurchaseMainService; @@ -107,6 +112,8 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { @Resource private CustomerreceiptRequestMainService customerreceiptRequestMainService; @Resource + private CustomersettleRequestMainService customersettleRequestMainService; + @Resource private CustomerreceiptRequestDetailMapper customerreceiptRequestDetailMapper; @Override @@ -279,6 +286,16 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverJob"); deliverRecordMainDO.setBusinessType(businesstypeDO.getCode()); deliverRecordMainMapper.insert(deliverRecordMainDO); + //添加客户结算申请主表 + CustomersettleRequestMainCreateReqVO customersettleRequestMainCreateReqVO = new CustomersettleRequestMainCreateReqVO(); + BeanUtils.copyProperties(deliverJobMainDO, customersettleRequestMainCreateReqVO); + customersettleRequestMainCreateReqVO.setId(null); + customersettleRequestMainCreateReqVO.setCreator(null); + customersettleRequestMainCreateReqVO.setCreateTime(null); + customersettleRequestMainCreateReqVO.setUpdater(null); + customersettleRequestMainCreateReqVO.setUpdateTime(null); + customersettleRequestMainCreateReqVO.setDeliverRecordNumber(number); + ArrayList customersettleRequestDetailCreateReqVOS = new ArrayList<>(); //添加客户收货申请主表 CustomerreceiptRequestMainCreateReqVO customerreceiptRequestMainCreateReqVO = new CustomerreceiptRequestMainCreateReqVO(); BeanUtils.copyProperties(deliverJobMainDO, customerreceiptRequestMainCreateReqVO); @@ -307,7 +324,6 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { List> recordList = DetailUpdateItem.getRecordList(); recordList.forEach(recordListItem -> { DeliverRecordDetailDO deliverRecordDetailDO = new DeliverRecordDetailDO(); - CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO = new CustomerreceiptRequestDetailDO(); BeanUtils.copyProperties(DetailUpdateItem, deliverRecordDetailDO); deliverRecordDetailDO.setJobDetailId(DetailUpdateItem.getId().toString()); deliverRecordDetailDO.setId(null); @@ -335,6 +351,18 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { deliverRecordDetailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); deliverRecordDetailDO.setFromAreaCode(locationDOFrom.getAreaCode()); deliverRecordDetailDOList.add(deliverRecordDetailDO); + //根据发货记录子表赋值给客户结算申请子表 + CustomersettleRequestDetailDO customersettleRequestDetailDO = new CustomersettleRequestDetailDO(); + BeanUtils.copyProperties(deliverRecordDetailDO, customersettleRequestDetailDO); + customersettleRequestDetailDO.setId(null); + customersettleRequestDetailDO.setCreator(null); + customersettleRequestDetailDO.setCreateTime(null); + customersettleRequestDetailDO.setUpdater(null); + customersettleRequestDetailDO.setUpdateTime(null); + CustomersettleRequestDetailCreateReqVO customersettleRequestDetailCreateReqVO = CustomersettleRequestDetailConvert.INSTANCE.convertDoToVo(customersettleRequestDetailDO); + customersettleRequestDetailCreateReqVOS.add(customersettleRequestDetailCreateReqVO); + //根据发货记录子表赋值给客户收货申请子表 + CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO = new CustomerreceiptRequestDetailDO(); BeanUtils.copyProperties(deliverRecordDetailDO, customerreceiptRequestDetailDO); customerreceiptRequestDetailDO.setId(null); customerreceiptRequestDetailDO.setCreator(null); @@ -367,6 +395,8 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { }); deliverRecordDetailMapper.insertBatch(deliverRecordDetailDOList); customerreceiptRequestMainCreateReqVO.setSubList(customerreceiptRequestDetailCreateReqVOS); + customersettleRequestMainCreateReqVO.setSubList(customersettleRequestDetailCreateReqVOS); + customersettleRequestMainService.createCustomersettleRequestMain(customersettleRequestMainCreateReqVO); customerreceiptRequestMainService.createCustomerreceiptRequestMain(customerreceiptRequestMainCreateReqVO); List typeList = new ArrayList<>(); typeList.add(JobStatusEnum.PENDING.getCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java index 3fd823e9..0da03932 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainService.java @@ -8,6 +8,7 @@ import com.win.module.wms.controller.deliverRequest.vo.*; import com.win.module.wms.controller.issueRequest.vo.IssueRequestImportErrorVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO; import com.win.module.wms.dal.dataobject.deliverPlan.DeliverPlanMainDO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.framework.common.pojo.PageResult; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 505f089c..25bb27b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java @@ -378,8 +378,8 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService mainDo.setToLocationTypes(businesstypeDO.getInLocationTypes()); mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes()); - mainDo.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - mainDo.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); } try { ValidationUtils.validate(validator, mainDo); @@ -528,8 +528,8 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService deliverRequestMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes()); deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes()); - deliverRequestMainDO.setInInventoryStatus(businesstypeDO.getInInventoryStatuses()); - deliverRequestMainDO.setOutInventoryStatus(businesstypeDO.getOutInventoryStatuses()); + deliverRequestMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); + deliverRequestMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); String customerDeliverNumber = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_DELIVER_NUMBER.getCode()); deliverRequestMainDO.setCustomerDeliverNumber(customerDeliverNumber); return deliverRequestMainDO; From fdb6726755a8934f1fd0e68aa583e607c9989c9b Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 6 Dec 2023 15:23:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=8F=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- win-server/src/main/resources/application-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-server/src/main/resources/application-test.yaml b/win-server/src/main/resources/application-test.yaml index e50e60d5..07c0a703 100644 --- a/win-server/src/main/resources/application-test.yaml +++ b/win-server/src/main/resources/application-test.yaml @@ -1,5 +1,5 @@ server: - port: 25100 + port: 25110 --- #################### 数据库相关配置 #################### From 4df29ced3a6dc08ab99e49b6a0e3b345c0f07950 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 6 Dec 2023 16:59:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerreceiptRecordMainController.java | 61 ++++++++- .../vo/CustomerreceiptRecordMainExcelVO.java | 120 +++++++++++++++++- .../CustomerreturnJobMainController.java | 8 +- .../vo/CustomerreturnJobDetailBaseVO.java | 15 --- .../vo/CustomerreturnJobDetailRespVO.java | 17 +++ .../CustomerreceiptRecordMainConvert.java | 18 ++- .../CustomerreceiptRecordDetailMapper.java | 5 + .../CustomerreturnJobDetailMapper.java | 2 +- .../CustomerreceiptRecordDetailService.java | 1 + ...ustomerreceiptRecordDetailServiceImpl.java | 5 + .../CustomerreturnJobMainServiceImpl.java | 102 ++++++++------- 11 files changed, 269 insertions(+), 85 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java index 054c7bd2..2324ecaf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java @@ -1,9 +1,18 @@ package com.win.module.wms.controller.customerreceiptRecord; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; +import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO; +import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; +import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.customerreceiptRecord.CustomerreceiptRecordDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -39,6 +48,8 @@ public class CustomerreceiptRecordMainController { @Resource private CustomerreceiptRecordMainService customerreceiptRecordMainService; + @Resource + private CustomerreceiptRecordDetailService customerreceiptRecordDetailService; @Resource private AdminUserApi userApi; @@ -112,13 +123,51 @@ public class CustomerreceiptRecordMainController { HttpServletResponse response) throws IOException { List list = customerreceiptRecordMainService.getCustomerreceiptRecordMainList(exportReqVO); // 导出 Excel - List datas = CustomerreceiptRecordMainConvert.INSTANCE.convertList02(list); - for(CustomerreceiptRecordMainExcelVO 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", "数据", CustomerreceiptRecordMainExcelVO.class, resultList,mapDropDown); + } + + @GetMapping("/export-excel-senior") + @Operation(summary = "导出客户退货任务 Excel") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:export')") + @OperateLog(type = EXPORT) + public void exportCustomerreceiptRecordMainSeniorExcel(@Valid CustomerreceiptRecordMainExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = customerreceiptRecordMainService.getCustomerreceiptRecordMainList(exportReqVO); + // 导出 Excel + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "发货任务.xls", "数据", CustomerreceiptRecordMainExcelVO.class, resultList,mapDropDown); + } + + private List getExcelVo(List list, Map mapDropDown) { + String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE); + mapDropDown.put(7, transferMode); + String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); + mapDropDown.put(18, interfaceType); + mapDropDown.put(54, interfaceType); + String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(24, locationType); + mapDropDown.put(25, locationType); + String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(28, trueFalse); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(30, inventoryStatus); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(52, uom); + List resultList = new ArrayList<>(); + // 导出 + for(CustomerreceiptRecordMainDO mainDO : list) { + List subList = customerreceiptRecordDetailService.selectList(mainDO.getId()); + for(CustomerreceiptRecordDetailDO detailDO : subList) { + CustomerreceiptRecordMainExcelVO vo = CustomerreceiptRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setCreatorDetail(userApi.getUser(Long.valueOf(vo.getCreatorDetail())).getNickname()); + resultList.add(vo); + } } - ExcelUtils.write(response, "客户收货记录主.xls", "数据", CustomerreceiptRecordMainExcelVO.class, datas); + return resultList; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java index 261dbede..5df89086 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.customerreceiptRecord.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.math.BigDecimal; import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -22,6 +25,9 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class CustomerreceiptRecordMainExcelVO { + @ExcelProperty("单据号") + private String number; + @ExcelProperty("申请单号") private String requestNumber; @@ -44,8 +50,7 @@ public class CustomerreceiptRecordMainExcelVO { @DictFormat("transfer_mode") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String transferMode; - @ExcelProperty(value = "车牌号", converter = DictConvert.class) - @DictFormat("vehicle_plate_number") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @ExcelProperty("车牌号") private String vehiclePlateNumber; @ExcelProperty("从仓库代码") @@ -61,15 +66,19 @@ public class CustomerreceiptRecordMainExcelVO { private String inTransactionType; @ExcelProperty("执行时间") + @ColumnWidth(value = 22) private LocalDateTime executeTime; @ExcelProperty("生效日期") + @ColumnWidth(value = 22) private LocalDateTime activeDate; @ExcelProperty("申请时间") + @ColumnWidth(value = 22) private LocalDateTime requestTime; @ExcelProperty("截止时间") + @ColumnWidth(value = 22) private LocalDateTime dueTime; @ExcelProperty("部门") @@ -79,9 +88,6 @@ public class CustomerreceiptRecordMainExcelVO { @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String interfaceType; - @ExcelProperty("单据号") - private String number; - @ExcelProperty("业务类型") private String businessType; @@ -89,6 +95,7 @@ public class CustomerreceiptRecordMainExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 22) private LocalDateTime createTime; @ExcelProperty("创建者Id") @@ -111,7 +118,108 @@ public class CustomerreceiptRecordMainExcelVO { @ExcelProperty("到库区代码范围") private String toAreaCodes; - @ExcelProperty("是否可用") + @ExcelProperty(value = "是否可用", converter = DictConvert.class) + @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String available; + //子表数据 +// @ExcelProperty("销售订单号") +// private String soNumber; +// +// @ExcelProperty("销售订单行") +// private String soLine; + + @ExcelProperty("从批次") + private String fromBatch; + + @ExcelProperty(value = "库存状态", converter = DictConvert.class) + @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String inventoryStatus; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + + @ExcelProperty("从库位代码") + private String fromLocationCode; + + @ExcelProperty("从库位组代码") + private String fromLocationGroupCode; + + @ExcelProperty("从库区代码") + private String fromAreaCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty("到库位代码") + private String toLocationCode; + + @ExcelProperty("到库位组代码") + private String toLocationGroupCode; + + @ExcelProperty("到库区代码") + private String toAreaCode; + + @ExcelProperty("单价") + private BigDecimal singlePrice; + + @ExcelProperty("金额") + private BigDecimal amount; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("备注") + private String remarkDetail; + + @ExcelProperty("创建时间") + @ColumnWidth(value = 22) + private LocalDateTime createTimeDetail; + + @ExcelProperty("创建者Id") + private String creatorDetail; + + @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("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String uom; + + @ExcelProperty("代码") + private String codeDetail; + + @ExcelProperty(value = "接口类型", converter = DictConvert.class) + @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String interfaceTypeDetail; + + @ExcelProperty("任务明细ID") + private String jobDetailId; + + @ExcelProperty("从包装号") + private String fromPackingNumber; + + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("到批次") + private String toBatch; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java index b8fc44cb..cdf14e7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java @@ -215,7 +215,7 @@ public class CustomerreturnJobMainController { @PutMapping("/accept") @Operation(summary = "承接客户退货任务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:accept')") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:accept')") public CommonResult acceptCustomerreturnJobMain(@RequestParam("id") Long id) { Integer count = customerreturnJobMainService.acceptCustomerreturnJobMain(id); return success(count > 0); @@ -224,7 +224,7 @@ public class CustomerreturnJobMainController { @PutMapping("/abandon") @Operation(summary = "取消承接客户退货任务") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:abandon')") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:abandon')") public CommonResult abandonCustomerreturnRequestMain(@RequestParam("id") Long id) { Integer count = customerreturnJobMainService.abandonCustomerreturnJobMain(id); return success(count > 0); @@ -233,7 +233,7 @@ public class CustomerreturnJobMainController { @PutMapping("/close") @Operation(summary = "关闭客户退货任务主") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:close')") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:close')") public CommonResult closeCustomerreturnRequestMain(@RequestParam("id") Long id) { Integer count = customerreturnJobMainService.closeCustomerreturnJobMain(id); return success(count > 0); @@ -242,7 +242,7 @@ public class CustomerreturnJobMainController { @PutMapping("/execute") @Operation(summary = "执行客户退货任务主") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:execute')") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:execute')") public CommonResult closeCustomerreturnRequestMain(@Valid @RequestBody CustomerreturnJobMainUpdateReqVO updateReqVO) { String number = customerreturnJobMainService.executeCustomerreturnJobMain(updateReqVO); return success(number); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java index bc6f6712..bd1cf816 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java @@ -81,19 +81,4 @@ public class CustomerreturnJobDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "实际数量") - private BigDecimal handleQty; - - @Schema(description = "到包装号") - private String toPackingNumber; - - @Schema(description = "到器具号") - private String toContainerNumber; - - @Schema(description = "到批次") - private String toBatch; - - @Schema(description = "到库存状态") - private String toInventoryStatus; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailRespVO.java index 0ad0aa36..918f82a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailRespVO.java @@ -3,10 +3,27 @@ package com.win.module.wms.controller.customerreturnJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.math.BigDecimal; + @Schema(description = "管理后台 - 客户退货任务子 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class CustomerreturnJobDetailRespVO extends CustomerreturnJobDetailBaseVO { + @Schema(description = "实际数量") + private BigDecimal handleQty; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "到库存状态") + private String toInventoryStatus; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java index 4305254d..7ed7dd2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java @@ -8,7 +8,10 @@ import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRec import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainExcelVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainRespVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordMainDO; @@ -33,5 +36,18 @@ public interface CustomerreceiptRecordMainConvert { PageResult convertPage(PageResult page); List convertList02(List list); - + @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"), + @Mapping(source = "mainDO.updateTime", target = "updateTime"), + @Mapping(source = "mainDO.updater", target = "updater"), + @Mapping(source = "detailDO.remark", target = "remarkDetail"), + @Mapping(source = "detailDO.createTime", target = "createtimeDetail"), + @Mapping(source = "detailDO.creator", target = "creatorDetail"), + @Mapping(source = "detailDO.code", target = "codeDetail"), + @Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"), + }) + CustomerreceiptRecordMainExcelVO convert(CustomerreceiptRecordMainDO mainDO, CustomerreceiptRecordDetailDO detailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java index 019281be..db8475c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java @@ -10,6 +10,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import org.apache.ibatis.annotations.Mapper; /** @@ -98,4 +99,8 @@ public interface CustomerreceiptRecordDetailMapper extends BaseMapperX selectList(Long masterId){ + return selectList(new LambdaQueryWrapperX() + .eq(CustomerreceiptRecordDetailDO::getMasterId, masterId)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java index 5b541b25..cbdb4993 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java @@ -22,7 +22,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX selectPage(CustomerreturnJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(CustomerreturnJobDetailDO::getMasterId,reqVO.getMasterId()) + .eqIfPresent(CustomerreturnJobDetailDO::getMasterId,reqVO.getMasterId()) .eqIfPresent(CustomerreturnJobDetailDO::getSoNumber, reqVO.getSoNumber()) .eqIfPresent(CustomerreturnJobDetailDO::getSoLine, reqVO.getSoLine()) .eqIfPresent(CustomerreturnJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java index 068ee5d4..31263d98 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailService.java @@ -79,4 +79,5 @@ public interface CustomerreceiptRecordDetailService { */ List getCustomerreceiptRecordDetailList(CustomerreceiptRecordDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java index efa2ebcc..78b93367 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRecord/CustomerreceiptRecordDetailServiceImpl.java @@ -5,6 +5,7 @@ import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRec import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -87,4 +88,8 @@ public class CustomerreceiptRecordDetailServiceImpl implements CustomerreceiptRe return customerreceiptRecordDetailMapper.selectList(exportReqVO); } + @Override + public List selectList(Long masterId) { + return customerreceiptRecordDetailMapper.selectList(masterId); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index a6d89139..ba4b3b36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -276,57 +276,55 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe // } customerreturnJobDetailUpdateReqVOList.forEach(DetailUpdateItem -> { if (DetailUpdateItem.getId().equals(customerreturnJobDetailDO.getId())) { - List> recordList = DetailUpdateItem.getRecordList(); - recordList.forEach(recordListItem -> { - CustomerreturnRecordDetailDO customerreturnRecordDetailDO = new CustomerreturnRecordDetailDO(); - BeanUtils.copyProperties(customerreturnJobDetailDO, customerreturnRecordDetailDO); - customerreturnRecordDetailDO.setMasterId(customerreturnRecordMainDO.getId().toString()); - customerreturnRecordDetailDO.setNumber(number); - customerreturnRecordDetailDO.setJobDetailId(String.valueOf(customerreturnJobDetailDO.getId())); - customerreturnRecordDetailDO.setFromBatch(customerreturnJobDetailDO.getBatch()); - customerreturnRecordDetailDO.setQty(new BigDecimal(recordListItem.get("handleQty").toString())); - customerreturnRecordDetailDO.setToBatch(recordListItem.get("toBatch")==null?"":recordListItem.get("toBatch")); - customerreturnRecordDetailDO.setToPackingNumber(recordListItem.get("toPackingNumber")==null?"":recordListItem.get("toPackingNumber")); - customerreturnRecordDetailDO.setToContainerNumber(recordListItem.get("toContainerNumber")==null?"":recordListItem.get("toContainerNumber")); - customerreturnRecordDetailDO.setInventoryStatus(recordListItem.get("toInventoryStatus").toString()); - customerreturnRecordDetailDO.setFromPackingNumber(customerreturnJobDetailDO.getPackingNumber()); - customerreturnRecordDetailDO.setFromContainerNumber(customerreturnJobDetailDO.getContainerNumber()); - customerreturnRecordDetailDO.setFromLocationCode(customerreturnJobDetailDO.getFromLocationCode()); - LocationDO locationDOFrom = locationService.selectLocation(customerreturnJobDetailDO.getFromLocationCode()); - if(locationDOFrom != null){ - customerreturnRecordDetailDO.setFromAreaCode(locationDOFrom.getAreaCode()); - customerreturnRecordDetailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); - } - customerreturnRecordDetailDO.setToLocationCode(recordListItem.get("toLocationCode").toString()); - LocationDO locationDO = locationService.selectLocation(recordListItem.get("toLocationCode").toString()); - if(locationDO != null){ - customerreturnRecordDetailDO.setToAreaCode(locationDO.getAreaCode()); - customerreturnRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode()); - } - customerreturnRecordDetailDO.setId(null); - customerreturnRecordDetailDO.setCreator(null); - customerreturnRecordDetailDO.setCreateTime(null); - customerreturnRecordDetailDO.setUpdater(null); - customerreturnRecordDetailDO.setUpdateTime(null); - customerreturnRecordDetailDOList.add(customerreturnRecordDetailDO); - //添加库存事务list - TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); - BeanUtils.copyProperties(customerreturnRecordDetailDO, transactionCreateReqVO); - //增加业务类型 - transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); - transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); - transactionCreateReqVO.setBusinessType(customerreturnRecordMainDO.getBusinessType()); - transactionCreateReqVO.setLocationCode(customerreturnJobDetailDO.getFromLocationCode()); - transactionCreateReqVO.setOwnerCode(customerreturnRecordDetailDO.getFromOwnerCode()); - transactionCreateReqVO.setRecordNumber(number); - transactionCreateReqVO.setBatch(customerreturnRecordDetailDO.getFromBatch()); - transactionCreateReqVO.setPackingNumber(customerreturnRecordDetailDO.getFromPackingNumber()); - transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); - transactionCreateReqVO.setId(null); - transactionCreateReqVOList.add(transactionCreateReqVO); - }); + List> recordList = DetailUpdateItem.getRecordList(); + CustomerreturnRecordDetailDO customerreturnRecordDetailDO = new CustomerreturnRecordDetailDO(); + BeanUtils.copyProperties(customerreturnJobDetailDO, customerreturnRecordDetailDO); + customerreturnRecordDetailDO.setMasterId(customerreturnRecordMainDO.getId().toString()); + customerreturnRecordDetailDO.setNumber(number); + customerreturnRecordDetailDO.setJobDetailId(String.valueOf(customerreturnJobDetailDO.getId())); + customerreturnRecordDetailDO.setFromBatch(customerreturnJobDetailDO.getBatch()); + customerreturnRecordDetailDO.setQty(customerreturnJobDetailDO.getQty()); + customerreturnRecordDetailDO.setToBatch(customerreturnJobDetailDO.getBatch()); + customerreturnRecordDetailDO.setToPackingNumber(customerreturnJobDetailDO.getPackingNumber()); + customerreturnRecordDetailDO.setToContainerNumber(customerreturnJobDetailDO.getContainerNumber()); + customerreturnRecordDetailDO.setInventoryStatus(customerreturnJobDetailDO.getInventoryStatus()); + customerreturnRecordDetailDO.setFromPackingNumber(customerreturnJobDetailDO.getPackingNumber()); + customerreturnRecordDetailDO.setFromContainerNumber(customerreturnJobDetailDO.getContainerNumber()); + customerreturnRecordDetailDO.setFromLocationCode(customerreturnJobDetailDO.getFromLocationCode()); + LocationDO locationDOFrom = locationService.selectLocation(customerreturnJobDetailDO.getFromLocationCode()); + if (locationDOFrom != null) { + customerreturnRecordDetailDO.setFromAreaCode(locationDOFrom.getAreaCode()); + customerreturnRecordDetailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); + } + customerreturnRecordDetailDO.setToLocationCode(customerreturnJobDetailDO.getToLocationCode()); + LocationDO locationDO = locationService.selectLocation(customerreturnJobDetailDO.getToLocationCode()); + if (locationDO != null) { + customerreturnRecordDetailDO.setToAreaCode(locationDO.getAreaCode()); + customerreturnRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode()); + } + customerreturnRecordDetailDO.setId(null); + customerreturnRecordDetailDO.setCreator(null); + customerreturnRecordDetailDO.setCreateTime(null); + customerreturnRecordDetailDO.setUpdater(null); + customerreturnRecordDetailDO.setUpdateTime(null); + customerreturnRecordDetailDOList.add(customerreturnRecordDetailDO); + //添加库存事务list + TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); + BeanUtils.copyProperties(customerreturnRecordDetailDO, transactionCreateReqVO); + //增加业务类型 + transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); + transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); + transactionCreateReqVO.setBusinessType(customerreturnRecordMainDO.getBusinessType()); + transactionCreateReqVO.setLocationCode(customerreturnJobDetailDO.getFromLocationCode()); + transactionCreateReqVO.setOwnerCode(customerreturnRecordDetailDO.getFromOwnerCode()); + transactionCreateReqVO.setRecordNumber(number); + transactionCreateReqVO.setBatch(customerreturnRecordDetailDO.getFromBatch()); + transactionCreateReqVO.setPackingNumber(customerreturnRecordDetailDO.getFromPackingNumber()); + transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); + transactionCreateReqVO.setId(null); + transactionCreateReqVOList.add(transactionCreateReqVO); } }); } @@ -337,7 +335,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe Long count = customerreturnJobMainMapper.selectListCount(typeList, customerreturnJobMainDO.getRequestNumber()); CustomerreturnRequestMainDO customerreturnRequestMainDO = customerreturnRequestMainMapper.selectByNumber(customerreturnJobMainDO.getRequestNumber()); //申请单下所有任务全部完成 - if(count == 0) { + if (count == 0) { customerreturnRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode()); customerreturnRequestMainMapper.updateById(customerreturnRequestMainDO); } else if(customerreturnRequestMainDO.getStatus().equals(RequestStatusEnum.HANDLING.getCode())) {//部分完成 From b80517d5c869fbb86050e9f3a4c0fdff00cb8f4a Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 6 Dec 2023 17:27:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BB=93=E7=AE=97convert?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerreceiptRecordMainConvert.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java index 7ed7dd2e..fd299733 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customerreceiptRecord/CustomerreceiptRecordMainConvert.java @@ -41,13 +41,9 @@ public interface CustomerreceiptRecordMainConvert { @Mapping(source = "mainDO.remark", target = "remark"), @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), - @Mapping(source = "mainDO.updateTime", target = "updateTime"), - @Mapping(source = "mainDO.updater", target = "updater"), + @Mapping(source = "mainDO.code", target = "code"), + @Mapping(source = "mainDO.interfaceType", target = "interfaceType"), @Mapping(source = "detailDO.remark", target = "remarkDetail"), - @Mapping(source = "detailDO.createTime", target = "createtimeDetail"), - @Mapping(source = "detailDO.creator", target = "creatorDetail"), - @Mapping(source = "detailDO.code", target = "codeDetail"), - @Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"), }) CustomerreceiptRecordMainExcelVO convert(CustomerreceiptRecordMainDO mainDO, CustomerreceiptRecordDetailDO detailDO); } From 70f12ed983d62920e353768004e542a3be33dad9 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 6 Dec 2023 17:43:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=94=B3=E8=AF=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 6 + .../vo/PutawayRequestMainBaseVO.java | 1 - .../CountadjustRequestMainService.java | 38 ++++++ .../CountadjustRequestMainServiceImpl.java | 123 ++++++++++++++++++ .../inspectJob/InspectJobMainServiceImpl.java | 47 +++++++ .../PutawayRequestMainServiceImpl.java | 2 + 6 files changed, 216 insertions(+), 1 deletion(-) 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 c9fcaae9..32053b9e 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 @@ -941,6 +941,12 @@ public interface ErrorCodeConstants { //盘点调整申请ErrorCode ErrorCode COUNTADJUST_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_156_000, "盘点调整申请主不存在"); ErrorCode COUNTADJUST_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_156_001, "盘点调整申请子不存在"); + ErrorCode COUNTADJUST_REQUEST_JOB_EXISTS = new ErrorCode(1_000_078_003, "盘点调整申请存在采购收货任务单"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_078_004, "盘点调整申请状态不支持关闭"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "盘点调整申请状态不支持提交"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "盘点调整申请状态不支持审批同意"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "盘点调整申请状态不支持处理"); + ErrorCode COUNTADJUST_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "盘点调整申请状态不支持审批拒绝"); //盘点调整记录ErrorCode ErrorCode COUNTADJUST_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_157_000, "盘点调整记录主不存在"); ErrorCode COUNTADJUST_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_157_001, "盘点调整记录子不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainBaseVO.java index afa985d7..3909069b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainBaseVO.java @@ -77,7 +77,6 @@ public class PutawayRequestMainBaseVO { private String toWarehouseCode; @Schema(description = "到库位类型范围", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "到库位类型范围不能为空") private String toLocationTypes; @Schema(description = "到库区代码范围") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java index 8bc3c5eb..15504699 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java @@ -46,4 +46,42 @@ public interface CountadjustRequestMainService { */ List getCountadjustRequestMainList(CustomConditions conditions); + /** + * 关闭盘点调整申请主 + * + * @param id 盘点调整申请主ID + * @return 更新数量 + */ + Integer closeCountadjustRequestMain(Long id); + + /** + * 提交盘点调整申请主 + * + * @param id 盘点调整申请主ID + * @return 更新数量 + */ + Integer submitCountadjustRequestMain(Long id); + + /** + * 审批通过盘点调整申请主 + * + * @param id 盘点调整申请主ID + * @return 更新数量 + */ + Integer agreeCountadjustRequestMain(Long id); + + /** + * 处理盘点调整申请主 + * @param id + * @return + */ + Integer handleCountadjustRequestMain(Long id); + /** + * 审批拒绝盘点调整申请主 + * + * @param id 盘点调整申请主ID + * @return 更新数量 + */ + Integer abortCountadjustRequestMain(Long id); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java index 3673d08e..d15c59b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java @@ -1,17 +1,29 @@ package com.win.module.wms.service.countadjustRequest; +import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; 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.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO; +import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO; import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO; +import com.win.module.wms.dal.mysql.countadjustRecord.CountadjustRecordMainMapper; +import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestDetailMapper; import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestMainMapper; +import com.win.module.wms.enums.request.RequestStatusEnum; +import com.win.module.wms.enums.request.RequestStatusState; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.*; + /** * 盘点调整申请主 Service 实现类 * @@ -23,6 +35,12 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain @Resource private CountadjustRequestMainMapper countadjustRequestMainMapper; + @Resource + private CountadjustRequestDetailMapper countadjustRequestDetailMapper; + @Resource + private CountadjustRecordMainMapper countadjustRecordMainMapper; + @Resource + private TrendsApi trendsApi; @Override public PageResult getCountadjustRequestMainSenior(CustomConditions conditions) { @@ -44,4 +62,109 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain return countadjustRequestMainMapper.selectSeniorList(conditions); } + @Override + @Transactional + public Integer closeCountadjustRequestMain(Long id) { + // 校验存在存在下级单据 + CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); +// Long count = countadjustRecordMainMapper.selectByRequestNumber(mainDO.getNumber()); +// if(count > 0) { +// throw new ServiceException(COUNTADJUST_REQUEST_JOB_EXISTS); +// } + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.close(); + if(!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_CLOSE); + } + mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 + trendsApi.createTrends(id, "countadjustRequest", "关闭了到货校验申请", TrendsTypeEnum.UPDATE); + return countadjustRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer submitCountadjustRequestMain(Long id) { + CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); + if(!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_SUBMIT); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); + } + trendsApi.createTrends(id, "countadjustRequest", "提交了到货校验申请", TrendsTypeEnum.UPDATE); + return countadjustRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer agreeCountadjustRequestMain(Long id) { + // 校验存在 + CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.agree(mainDO.getAutoAgree()); + if(!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_AGREE); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用自动执行方法 + if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { + this.generateJob(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); + } + trendsApi.createTrends(id, "countadjustRequest", "审批同意了到货校验申请", TrendsTypeEnum.UPDATE); + return countadjustRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer handleCountadjustRequestMain(Long id) { + // 校验存在 + CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.handle(); + if(!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_HANDLE); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + //调用执行方法 + this.generateJob(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); + trendsApi.createTrends(id, "countadjustRequest", "执行了到货校验申请", TrendsTypeEnum.UPDATE); + return countadjustRequestMainMapper.updateById(mainDO); + } + + @Override + @Transactional + public Integer abortCountadjustRequestMain(Long id) { + // 校验存在 + CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.refused(); + if(!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_ABORT); + } + mainDO.setStatus(requestStatusState.getState().getCode()); + trendsApi.createTrends(id, "countadjustRequest", "审批拒绝了到货校验申请", TrendsTypeEnum.UPDATE); + return countadjustRequestMainMapper.updateById(mainDO); + } + + /** + * 生成收货检验任务，不要改动事务传播方式，否则会有事务问题 + * @param mainDO 收货检验主 + * @param detailDOList 收货检验子 + */ + private void generateJob(CountadjustRequestMainDO mainDO, List detailDOList) { + + } + + private CountadjustRequestMainDO validateCountadjustRequestMainExists(Long id) { + CountadjustRequestMainDO mainDO = countadjustRequestMainMapper.selectById(id); + if (mainDO == null) { + throw exception(COUNTADJUST_REQUEST_MAIN_NOT_EXISTS); + } + return mainDO; + } + } 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 37c4f33b..aa15557e 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 @@ -11,9 +11,12 @@ 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.inspectJob.vo.*; +import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; +import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; @@ -30,7 +33,9 @@ import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper; 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.documentSwitch.SwitchService; import com.win.module.wms.service.expectin.ExpectinService; +import com.win.module.wms.service.putawayRequest.PutawayRequestMainService; import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; @@ -85,6 +90,10 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { private BalanceMapper balanceMapper; @Resource private InspectRequestDetailMapper inspectRequestDetailMapper; + @Resource + private SwitchService switchService; + @Resource + private PutawayRequestMainService putawayRequestMainService; @Override public InspectJobMainDO getInspectJobMain(Long id) { @@ -197,6 +206,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode()); inspectRecordMainDO.setNumber(number); inspectRecordMainDO.setJobNumber(inspectJobMainDO.getNumber()); + inspectRecordMainDO.setFromWarehouseCode(inspectJobMainDO.getWarehouseCode()); inspectRecordMainDO.setId(null); inspectRecordMainDO.setCreator(null); inspectRecordMainDO.setCreateTime(null); @@ -349,6 +359,43 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { } //移除预计入 expectinService.deleteExpectinByJobNumber(inspectJobMainDO.getNumber()); + //上架申请子 + SwitchDO switchDO = switchService.selectSwitchExist("CreatePutawayRequestAfterInspectRecordCreated"); + //检验合格生成上架申请 + if(switchDO.getEffectiveSetValue().equals("TRUE")) { + PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO(); + BeanUtils.copyProperties(inspectRecordMainDO, putawayRequestMainCreateReqVO); + List putawayRequestDetailCreateReqVOList = new ArrayList<>(); + for(InspectJobDetailUpdateReqVO inspectJobDetailUpdateReqVO : inspectJobDetailUpdateReqVOList) { + if(!inspectJobDetailUpdateReqVO.getToInventoryStatus().equals("OK")) { + continue; + } + PutawayRequestDetailCreateReqVO putawayRequestDetailCreateReqVO = new PutawayRequestDetailCreateReqVO(); + BeanUtils.copyProperties(inspectJobDetailUpdateReqVO, putawayRequestDetailCreateReqVO); + putawayRequestDetailCreateReqVO.setBatch(inspectRecordMainDO.getBatch()); + putawayRequestDetailCreateReqVO.setPoNumber(inspectRecordMainDO.getPoNumber()); + putawayRequestDetailCreateReqVO.setPoLine(inspectRecordMainDO.getPoLine()); + putawayRequestDetailCreateReqVO.setItemCode(inspectRecordMainDO.getItemCode()); + putawayRequestDetailCreateReqVO.setItemName(inspectRecordMainDO.getItemCode()); + putawayRequestDetailCreateReqVO.setInventoryStatus("OK"); + putawayRequestDetailCreateReqVO.setId(null); + putawayRequestDetailCreateReqVO.setCreateTime(null); + putawayRequestDetailCreateReqVO.setCreator(null); + putawayRequestDetailCreateReqVO.setUpdateTime(null); + putawayRequestDetailCreateReqVO.setUpdater(null); + putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO); + } + putawayRequestMainCreateReqVO.setToWarehouseCode(inspectRecordMainDO.getFromWarehouseCode()); + putawayRequestMainCreateReqVO.setId(null); + putawayRequestMainCreateReqVO.setCreateTime(null); + putawayRequestMainCreateReqVO.setCreator(null); + putawayRequestMainCreateReqVO.setUpdateTime(null); + putawayRequestMainCreateReqVO.setUpdater(null); + putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList); + if(!putawayRequestDetailCreateReqVOList.isEmpty()) { + putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO); + } + } //变更记录 trendsApi.createTrends(inspectJobMainDO.getId(), "inspectJob", "执行了到货检验任务", TrendsTypeEnum.UPDATE); return number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index b6492242..98966bcb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -408,8 +408,10 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService //校验主表公共方法(适用于新增/修改) private PutawayRequestMainDO validatorMainMethod(PutawayRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { PutawayRequestMainDO mainDo = PutawayRequestMainConvert.INSTANCE.convert(baseVO); + mainDo.setRequestTime(LocalDateTime.now()); mainDo.setBusinessType(businesstypeDO.getCode()); mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); + mainDo.setToLocationTypes(businesstypeDO.getInLocationTypes()); mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); From 314654333df55e64863848c58ee23b8907cddafe Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 6 Dec 2023 18:47:58 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/CustomerreturnJobDetailUpdateReqVO.java | 3 +-- .../customerreturnJob/CustomerreturnJobMainServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailUpdateReqVO.java index 06fa91b7..10c6174f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailUpdateReqVO.java @@ -11,6 +11,5 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class CustomerreturnJobDetailUpdateReqVO extends CustomerreturnJobDetailBaseVO { - @Schema(description = "子表记录数据") - private List> recordList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index ba4b3b36..5502e03e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -276,7 +276,6 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe // } customerreturnJobDetailUpdateReqVOList.forEach(DetailUpdateItem -> { if (DetailUpdateItem.getId().equals(customerreturnJobDetailDO.getId())) { - List> recordList = DetailUpdateItem.getRecordList(); CustomerreturnRecordDetailDO customerreturnRecordDetailDO = new CustomerreturnRecordDetailDO(); BeanUtils.copyProperties(customerreturnJobDetailDO, customerreturnRecordDetailDO); customerreturnRecordDetailDO.setMasterId(customerreturnRecordMainDO.getId().toString()); From 6fee81d2319b0534d8be6bffd9667d97be360022 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 6 Dec 2023 18:57:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 2 +- .../CountadjustRecordMainMapper.java | 5 + .../CountadjustRequestMainServiceImpl.java | 105 ++++++++++++++++-- .../itembasic/ItembasicServiceImpl.java | 11 +- 4 files changed, 105 insertions(+), 18 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 32053b9e..fa1d4614 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 @@ -941,7 +941,7 @@ public interface ErrorCodeConstants { //盘点调整申请ErrorCode ErrorCode COUNTADJUST_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_156_000, "盘点调整申请主不存在"); ErrorCode COUNTADJUST_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_156_001, "盘点调整申请子不存在"); - ErrorCode COUNTADJUST_REQUEST_JOB_EXISTS = new ErrorCode(1_000_078_003, "盘点调整申请存在采购收货任务单"); + ErrorCode COUNTADJUST_REQUEST_RECORD_EXISTS = new ErrorCode(1_000_078_003, "盘点调整申请存在盘点调整记录单"); ErrorCode COUNTADJUST_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_078_004, "盘点调整申请状态不支持关闭"); ErrorCode COUNTADJUST_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "盘点调整申请状态不支持提交"); ErrorCode COUNTADJUST_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "盘点调整申请状态不支持审批同意"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java index 88f82bab..677f5328 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countadjustRecord/CountadjustRecordMainMapper.java @@ -68,6 +68,11 @@ public interface CountadjustRecordMainMapper extends BaseMapperX() + .eq(CountadjustRecordMainDO::getRequestNumber, requestNumber)); + } + default List 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/countadjustRequest/CountadjustRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java index d15c59b1..cd155de3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java @@ -5,23 +5,42 @@ import com.win.framework.common.pojo.CustomConditions; 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.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordDetailCreateReqVO; +import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainCreateReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExportReqVO; import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainPageReqVO; +import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert; +import com.win.module.wms.convert.countadjustRecord.CountadjustRecordMainConvert; +import com.win.module.wms.dal.dataobject.balance.BalanceDO; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordMainDO; import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO; import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO; +import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.balance.BalanceMapper; +import com.win.module.wms.dal.mysql.countadjustRecord.CountadjustRecordDetailMapper; import com.win.module.wms.dal.mysql.countadjustRecord.CountadjustRecordMainMapper; import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestDetailMapper; import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestMainMapper; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; +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 org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; 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.*; /** @@ -40,7 +59,17 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain @Resource private CountadjustRecordMainMapper countadjustRecordMainMapper; @Resource + private CountadjustRecordDetailMapper countadjustRecordDetailMapper; + @Resource + private TransactionService transactionService; + @Resource + private BalanceMapper balanceMapper; + @Resource private TrendsApi trendsApi; + @Resource + private SerialNumberApi serialNumberApi; + @Resource + private JobUtils jobUtils; @Override public PageResult getCountadjustRequestMainSenior(CustomConditions conditions) { @@ -67,10 +96,10 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain public Integer closeCountadjustRequestMain(Long id) { // 校验存在存在下级单据 CountadjustRequestMainDO mainDO = validateCountadjustRequestMainExists(id); -// Long count = countadjustRecordMainMapper.selectByRequestNumber(mainDO.getNumber()); -// if(count > 0) { -// throw new ServiceException(COUNTADJUST_REQUEST_JOB_EXISTS); -// } + Long count = countadjustRecordMainMapper.selectByRequestNumber(mainDO.getNumber()); + if(count > 0) { + throw new ServiceException(COUNTADJUST_REQUEST_RECORD_EXISTS); + } RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.close(); if(!flag) { @@ -93,7 +122,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain mainDO.setStatus(requestStatusState.getState().getCode()); //调用自动执行方法 if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { - this.generateJob(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); + this.generateRecord(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); } trendsApi.createTrends(id, "countadjustRequest", "提交了到货校验申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); @@ -112,7 +141,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain mainDO.setStatus(requestStatusState.getState().getCode()); //调用自动执行方法 if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { - this.generateJob(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); + this.generateRecord(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); } trendsApi.createTrends(id, "countadjustRequest", "审批同意了到货校验申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); @@ -130,7 +159,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain } mainDO.setStatus(requestStatusState.getState().getCode()); //调用执行方法 - this.generateJob(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); + this.generateRecord(mainDO, countadjustRequestDetailMapper.selectList(mainDO.getId())); trendsApi.createTrends(id, "countadjustRequest", "执行了到货校验申请", TrendsTypeEnum.UPDATE); return countadjustRequestMainMapper.updateById(mainDO); } @@ -151,12 +180,64 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain } /** - * 生成收货检验任务，不要改动事务传播方式，否则会有事务问题 - * @param mainDO 收货检验主 - * @param detailDOList 收货检验子 + * 生成盘点调整记录,并更新库存 + * @param mainDO 盘点调整主 + * @param detailDOList 盘点调整子 */ - private void generateJob(CountadjustRequestMainDO mainDO, List detailDOList) { - + private void generateRecord(CountadjustRequestMainDO mainDO, List detailDOList) { + CountadjustRecordMainCreateReqVO countadjustRecordMainCreateReqVO = new CountadjustRecordMainCreateReqVO(); + BeanUtils.copyProperties(mainDO, countadjustRecordMainCreateReqVO); + countadjustRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); + String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_ADJUST_RECORD.getCode()); + countadjustRecordMainCreateReqVO.setNumber(number); + //增加业务类型 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountadjustRecord"); + countadjustRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); + CountadjustRecordMainDO countadjustRecordMainDO = CountadjustRecordMainConvert.INSTANCE.convert(countadjustRecordMainCreateReqVO); + countadjustRecordMainMapper.insert(countadjustRecordMainDO); + List transactionCreateReqVOList = new ArrayList<>(); + for(CountadjustRequestDetailDO countadjustRequestDetailDO : detailDOList) { + CountadjustRecordDetailCreateReqVO countadjustRecordDetailCreateReqVO = new CountadjustRecordDetailCreateReqVO(); + BeanUtils.copyProperties(countadjustRequestDetailDO, countadjustRecordDetailCreateReqVO); + countadjustRecordDetailCreateReqVO.setNumber(number); + countadjustRecordDetailMapper.insert(CountadjustRecordDetailConvert.INSTANCE.convert(countadjustRecordDetailCreateReqVO)); + //添加库存事务list + BalanceDO balanceDO = balanceMapper.getBalanceQty(countadjustRecordDetailCreateReqVO.getPackingNumber(), countadjustRecordDetailCreateReqVO.getItemCode(), countadjustRecordDetailCreateReqVO.getBatch(), countadjustRecordDetailCreateReqVO.getInventoryStatus(), countadjustRecordDetailCreateReqVO.getLocationCode()); + TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); + BeanUtils.copyProperties(countadjustRecordDetailCreateReqVO, transactionCreateReqVO); + //增加业务类型 + BusinesstypeDO countAdjustBusinesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjust"); + transactionCreateReqVO.setBusinessType(countAdjustBusinesstypeDO.getCode()); + if(countadjustRecordDetailCreateReqVO.getAdjustQty().compareTo(BigDecimal.ZERO) > 0) { + TransactiontypeDO transactionTypeDOIn = jobUtils.selectDocumentFromTransactionType(countAdjustBusinesstypeDO.getInTransactionType()); + transactionCreateReqVO.setInventoryAction(transactionTypeDOIn.getInventoryAction()); + transactionCreateReqVO.setTransactionType(transactionTypeDOIn.getCode()); + } else { + TransactiontypeDO transactionTypeDOOut = jobUtils.selectDocumentFromTransactionType(countAdjustBusinesstypeDO.getOutTransactionType()); + transactionCreateReqVO.setInventoryAction(transactionTypeDOOut.getInventoryAction()); + transactionCreateReqVO.setTransactionType(transactionTypeDOOut.getCode()); + } + transactionCreateReqVO.setBusinessType(mainDO.getBusinessType()); + transactionCreateReqVO.setLocationCode(countadjustRecordDetailCreateReqVO.getLocationCode()); + transactionCreateReqVO.setOwnerCode(countadjustRecordDetailCreateReqVO.getOwnerCode()); + transactionCreateReqVO.setSinglePrice(balanceDO.getSinglePrice()); + transactionCreateReqVO.setAmount(balanceDO.getAmount()); + transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate()); + transactionCreateReqVO.setProduceDate(balanceDO.getProduceDate()); + transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate()); + transactionCreateReqVO.setRecordNumber(number); + transactionCreateReqVO.setQty(countadjustRecordDetailCreateReqVO.getAdjustQty().abs());//绝对值 + transactionCreateReqVO.setInventoryStatus(countadjustRecordDetailCreateReqVO.getInventoryStatus()); + transactionCreateReqVO.setWarehouseCode(countadjustRecordMainDO.getWarehouseCode()); + transactionCreateReqVO.setBatch(countadjustRecordDetailCreateReqVO.getBatch()); + transactionCreateReqVO.setWorker(String.valueOf(getLoginUserId())); + transactionCreateReqVO.setPackingNumber(countadjustRecordDetailCreateReqVO.getPackingNumber()); + transactionCreateReqVOList.add(transactionCreateReqVO); + } + //增加库存事务 + transactionService.createTransaction(transactionCreateReqVOList); + //变更记录 + trendsApi.createTrends(countadjustRecordMainDO.getId(), "countadjustRequest", "生成了盘点调整记录", TrendsTypeEnum.CREATE); } private CountadjustRequestMainDO validateCountadjustRequestMainExists(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index a8ebac4c..ddffc36e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -13,7 +13,6 @@ import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.wms.controller.itembasic.vo.*; import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; -import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.mysql.itembasic.ItembasicMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -97,10 +96,12 @@ public class ItembasicServiceImpl implements ItembasicService { public List getItembasicList(CustomConditions conditions) { return itembasicMapper.selectSeniorList(conditions); } + @Override public List getItembasicList() { return itembasicMapper.selectAllList(); } + @Override public PageResult getItembasicPage(ItembasicPageReqVO pageReqVO) { return itembasicMapper.selectPage(pageReqVO); @@ -288,19 +289,19 @@ public class ItembasicServiceImpl implements ItembasicService { } @VisibleForTesting private void validateIsStdPackExists(String stdPack) { - if (stdPack == null || stdPack == null) { + if (stdPack == null) { throw exception(ITEMBASIC_IS_STDPACK_NOT_EXISTS); } } @VisibleForTesting private void validateEnableBuyExists(String enableBuy) { - if (enableBuy == null || enableBuy == null) { + if (enableBuy == null) { throw exception(ITEMBASIC_ENABLE_BUY_NOT_EXISTS); } } @VisibleForTesting private void validateEnableMakeExists(String enableMark) { - if (enableMark == null || enableMark == null) { + if (enableMark == null) { throw exception(ITEMBASIC_ENABLE_MAKE_NOT_EXISTS); } } @@ -348,7 +349,7 @@ public class ItembasicServiceImpl implements ItembasicService { } //公共方法 查询物料 public ItembasicDO selectItembasic(String code) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("code",code); queryWrapper.eq("available","TRUE"); // queryWrapper.eq("status","ENABLE");