From 17fad562fa450d5d3e56e3bd3d65bf5d82b4c641 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 6 Dec 2023 15:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BB=93=E7=AE=97=E5=90=8E?= =?UTF-8?q?=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;