From 22a4bee0d6bcbe9a278182d67297f1a1b9da184a Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 7 Dec 2023 18:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SecurityConfiguration.java | 2 +- .../module/wms/enums/ErrorCodeConstants.java | 1 + .../inspectJob/InspectJobMainController.java | 8 +++++++ .../InspectRequestMainController.java | 15 ++++++++++--- .../countJob/CountJobMainServiceImpl.java | 4 ++++ .../inspectJob/InspectJobMainService.java | 7 ++++++ .../inspectJob/InspectJobMainServiceImpl.java | 19 ++++++++++++++-- .../InspectRequestMainService.java | 10 ++++++++- .../InspectRequestMainServiceImpl.java | 21 +++++++++++++++++- .../purchase/PurchaseMainServiceImpl.java | 4 ++-- .../PurchasereceiptJobMainServiceImpl.java | 3 +++ .../PurchasereturnJobMainServiceImpl.java | 22 +++++++++---------- .../putawayJob/PutawayJobMainServiceImpl.java | 4 +++- .../src/main/resources/application.yaml | 2 +- 14 files changed, 99 insertions(+), 23 deletions(-) diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java index 6ecb8836..8e33559a 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java @@ -43,7 +43,7 @@ public class SecurityConfiguration { registry.antMatchers("/magic/web/**").anonymous() .antMatchers("/magic-api/**").anonymous(); //静态资源 - registry.antMatchers("/profile/**").anonymous(); + registry.antMatchers("/admin-api/profile/**").anonymous(); // 文件读取 registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); } 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 2f6b20bf..4b352a6a 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 @@ -476,6 +476,7 @@ public interface ErrorCodeConstants { ErrorCode INSPECT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "到货检验申请状态不支持审批同意"); ErrorCode INSPECT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "到货检验申请状态不支持处理"); ErrorCode INSPECT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝"); + ErrorCode INSPECT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_073_010, "到货检验状态不支持重新添加"); //检验任务主ErrorCode ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在"); //检验任务子ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index edc0187d..67c73a24 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -207,6 +207,14 @@ public class InspectJobMainController { return success(result > 0); } + @PutMapping(value = "/close") + @Operation(summary = "关闭任务") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:close')") + public CommonResult closeInspectJobMain(@RequestParam("id") Long id) { + int result = inspectJobMainService.closeInspectJobMain(id); + return success(result > 0); + } + @PutMapping("/execute") @Operation(summary = "执行任务") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 6f1fd3d3..6cf01548 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -227,6 +227,15 @@ public class InspectRequestMainController { return success(count > 0); } + @PutMapping("/reAdd") + @Operation(summary = "重新添加到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:reAdd')") + public CommonResult openInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.reAddInspectRequestMain(id); + return success(count > 0); + } + @PutMapping("/agree") @Operation(summary = "审批通过到货检验申请主") @Parameter(name = "id", description = "编号", required = true) @@ -245,12 +254,12 @@ public class InspectRequestMainController { return success(count > 0); } - @PutMapping("/abort") + @PutMapping("/refused") @Operation(summary = "审批拒绝到货检验申请主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:abort')") - public CommonResult abortInspectRequestMain(@RequestParam("id") Long id) { - Integer count = inspectRequestMainService.abortInspectRequestMain(id); + public CommonResult refusedInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.refusedInspectRequestMain(id); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index c4d7f064..18a9a625 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -14,10 +14,13 @@ import com.win.module.wms.controller.countJob.vo.CountJobDetailUpdateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainUpdateReqVO; +import com.win.module.wms.convert.countJob.CountJobDetailConvert; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; +import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper; import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper; import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper; @@ -25,6 +28,7 @@ import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper; 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.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index fd5d5946..dadae0ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -98,6 +98,13 @@ public interface InspectJobMainService { */ Integer abandonInspectJobMain(Long id); + /** + * 关闭任务 + * @param id + * @return + */ + Integer closeInspectJobMain(Long id); + /** * 执行任务 * @param inspectJobMainUpdateReqVO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index aa15557e..8c3daa33 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 @@ -181,6 +181,19 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { return inspectJobMainMapper.updateById(inspectJobMainDO); } + @Override + @Transactional + public Integer closeInspectJobMain(Long id) { + InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); + if(!jobStatusState.close()) { + throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); + } + inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); + trendsApi.createTrends(id, "inspectJob", "关闭了到货检验任务", TrendsTypeEnum.UPDATE); + return inspectJobMainMapper.updateById(inspectJobMainDO); + } + @Override @Transactional public String executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { @@ -195,6 +208,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { Long userId = getLoginUserId(); AdminUserRespDTO userRespDTO = userApi.getUser(userId); inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); + inspectJobMainDO.setNextAction(inspectJobMainUpdateReqVO.getNextAction()); inspectJobMainDO.setCompleteTime(LocalDateTime.now()); inspectJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId())); inspectJobMainDO.setCompleteUserName(userRespDTO.getNickname()); @@ -217,6 +231,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { BigDecimal failedQty = BigDecimal.ZERO; BigDecimal crackQty = BigDecimal.ZERO; BigDecimal notPassedQty = BigDecimal.ZERO; + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); List inspectJobDetailUpdateReqVOList = inspectJobMainUpdateReqVO.getSubList(); @@ -228,6 +243,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { failedQty = failedQty.add(inspectRecordDetailDO.getFailedQty()); crackQty = crackQty.add(inspectRecordDetailDO.getCrackQty()); notPassedQty = notPassedQty.add(inspectRecordDetailDO.getNotPassedQty()); + inspectRecordDetailDO.setNotPassedQty(inspectJobDetailUpdateReqVO.getNotPassedQty()); inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId()); inspectRecordDetailDO.setNumber(number); inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId())); @@ -243,7 +259,6 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); BeanUtils.copyProperties(inspectRecordDetailDO, transactionCreateReqVOIn); //增加业务入类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); @@ -362,7 +377,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { //上架申请子 SwitchDO switchDO = switchService.selectSwitchExist("CreatePutawayRequestAfterInspectRecordCreated"); //检验合格生成上架申请 - if(switchDO.getEffectiveSetValue().equals("TRUE")) { + if(switchDO.getEffectiveSetValue().equals("TRUE") && !inspectJobMainUpdateReqVO.getNextAction().equals("FULL_INSPECT")) { PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO(); BeanUtils.copyProperties(inspectRecordMainDO, putawayRequestMainCreateReqVO); List putawayRequestDetailCreateReqVOList = new ArrayList<>(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java index fbecee90..1f9a3042 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java @@ -111,6 +111,14 @@ public interface InspectRequestMainService { */ Integer submitInspectRequestMain(Long id); + /** + * 重新添加到货检验申请主 + * + * @param id 到货检验申请主ID + * @return 更新数量 + */ + Integer reAddInspectRequestMain(Long id); + /** * 审批通过到货检验申请主 * @@ -131,6 +139,6 @@ public interface InspectRequestMainService { * @param id 到货检验申请主ID * @return 更新数量 */ - Integer abortInspectRequestMain(Long id); + Integer refusedInspectRequestMain(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index e33b76e2..f11eac63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -295,6 +295,25 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService return inspectRequestMainMapper.updateById(mainDO); } + @Override + @Transactional + public Integer reAddInspectRequestMain(Long id) { + // 校验存在存在下级单据 + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + Long count = inspectJobMainMapper.selectByRequestNumber(mainDO.getNumber()); + if(count > 0) { + throw new ServiceException(INSPECT_REQUEST_JOB_EXISTS); + } + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.reAdd(); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_RE_ADD); + } + mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 + trendsApi.createTrends(id, "inspectRequest", "打开了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + @Override @Transactional public Integer agreeInspectRequestMain(Long id) { @@ -333,7 +352,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService @Override @Transactional - public Integer abortInspectRequestMain(Long id) { + public Integer refusedInspectRequestMain(Long id) { // 校验存在 InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 8be055c7..e30387dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -26,7 +26,6 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO; -import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; @@ -197,7 +196,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { queryWrapper1.eq("line_number", poLine); queryWrapper1.eq("item_code", pitemCode); PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1); - if (purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())) { + //if (purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())) { + if (purchaseDetailDO != null) { return purchaseDetailDO; } else { throw new UtilException("采购订单明细:订单号" + pnumber + "、订单行" + poLine + "、零件号" + pitemCode + "、无效"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index d9702b7b..d65d630e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -34,6 +34,7 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchaseshortageD import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper; import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper; @@ -122,6 +123,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain private PutawayRequestMainService putawayRequestMainService; @Resource private RequestsettingService requestsettingService; + @Resource + private PurchasereceiptJobDetailMapper purchasereceiptJobDetailMapper; @Override public PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 0ec2c969..22a0048a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -15,10 +15,8 @@ import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainE import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; -import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert; 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.purchasereturnJob.PurchasereturnJobDetailDO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; @@ -26,6 +24,7 @@ import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnReq import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; 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.purchasereturnJob.PurchasereturnJobDetailMapper; import com.win.module.wms.dal.mysql.purchasereturnJob.PurchasereturnJobMainMapper; import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordDetailMapper; import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordMainMapper; @@ -91,6 +90,8 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe private JobUtils jobUtils; @Resource private BalanceMapper balanceMapper; + @Resource + private PurchasereturnJobDetailMapper purchasereturnJobDetailMapper; @Override public PageResult getPurchasereturnJobMainSenior(CustomConditions conditions) { @@ -235,24 +236,24 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe purchasereturnRecordMainDO.setUpdateTime(null); purchasereturnRecordMainDO.setUpdater(null); purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); List purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList(); //退货记录子 List purchasereturnRecordDetailDOList = new ArrayList<>(); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); for(PurchasereturnJobDetailUpdateReqVO purchasereturnJobDetailUpdateReqVO : purchasereturnJobDetailUpdateReqVOList) { - PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnJobDetailUpdateReqVO); PurchasereturnRecordDetailDO purchasereturnRecordDetailDO = new PurchasereturnRecordDetailDO(); - BeanUtils.copyProperties(purchasereturnJobDetailDO, purchasereturnRecordDetailDO); + BeanUtils.copyProperties(purchasereturnJobDetailUpdateReqVO, purchasereturnRecordDetailDO); purchasereturnRecordDetailDO.setMasterId(purchasereturnRecordMainDO.getId()); purchasereturnRecordDetailDO.setNumber(number); - purchasereturnRecordDetailDO.setJobDetailId(String.valueOf(purchasereturnJobDetailDO.getId())); - purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailDO.getPackingNumber()); + purchasereturnRecordDetailDO.setJobDetailId(String.valueOf(purchasereturnJobDetailUpdateReqVO.getId())); + purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailUpdateReqVO.getPackingNumber()); purchasereturnRecordDetailDO.setToPackingNumber(purchasereturnJobDetailUpdateReqVO.getToPackingNumber()); - purchasereturnRecordDetailDO.setFromContainerNumber(purchasereturnJobDetailDO.getContainerNumber()); + purchasereturnRecordDetailDO.setFromContainerNumber(purchasereturnJobDetailUpdateReqVO.getContainerNumber()); purchasereturnRecordDetailDO.setToContainerNumber(purchasereturnJobDetailUpdateReqVO.getToContainerNumber()); purchasereturnRecordDetailDO.setQty(purchasereturnJobDetailUpdateReqVO.getHandleQty()); - purchasereturnRecordDetailDO.setFromBatch(purchasereturnJobDetailDO.getBatch()); + purchasereturnRecordDetailDO.setFromBatch(purchasereturnJobDetailUpdateReqVO.getBatch()); purchasereturnRecordDetailDO.setToBatch(purchasereturnJobDetailUpdateReqVO.getToBatch()); purchasereturnRecordDetailDO.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus()); purchasereturnRecordDetailDO.setToLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode()); @@ -270,13 +271,12 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); BeanUtils.copyProperties(purchasereturnRecordDetailDO, transactionCreateReqVOOut); //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode()); TransactiontypeDO transactionTypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); transactionCreateReqVOOut.setInventoryAction(transactionTypeDOOut.getInventoryAction()); transactionCreateReqVOOut.setTransactionType(transactionTypeDOOut.getCode()); transactionCreateReqVOOut.setBusinessType(purchasereturnRecordMainDO.getBusinessType()); - transactionCreateReqVOOut.setLocationCode(purchasereturnJobDetailDO.getFromLocationCode()); + transactionCreateReqVOOut.setLocationCode(purchasereturnJobDetailUpdateReqVO.getFromLocationCode()); transactionCreateReqVOOut.setOwnerCode(purchasereturnRecordDetailDO.getFromOwnerCode()); transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice()); transactionCreateReqVOOut.setAmount(balanceDO.getAmount()); @@ -301,7 +301,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe transactionCreateReqVOIn.setInventoryAction(transactionTypeDOIn.getInventoryAction()); transactionCreateReqVOIn.setTransactionType(transactionTypeDOIn.getCode()); transactionCreateReqVOIn.setBusinessType(purchasereturnRecordMainDO.getBusinessType()); - transactionCreateReqVOIn.setLocationCode(purchasereturnJobDetailDO.getToLocationCode()); + transactionCreateReqVOIn.setLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode()); transactionCreateReqVOIn.setOwnerCode(purchasereturnRecordDetailDO.getToOwnerCode()); transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 1d7b8dc4..b722c8e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -15,12 +15,14 @@ import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.putawayJob.PutawayJobDetailMapper; import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper; @@ -186,6 +188,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { putawayRecordMainDO.setUpdater(null); putawayRecordMainDO.setUpdateTime(null); putawayRecordMainMapper.insert(putawayRecordMainDO); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob"); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); List putawayJobDetailUpdateReqVOList = putawayJobMainUpdateReqVO.getSubList(); @@ -214,7 +217,6 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVOIn); //增加业务入类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob"); transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index 8c0c30ac..111f4563 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -148,7 +148,7 @@ win: - /admin-api/infra/file/*/get/** # 获取图片，和租户无关 - /magic/web/* # magic-api 和租户无关 - /magic-api/* # magic-api 和租户无关 - - profile/* # 静态资源 和租户无关 + - /admin-api/profile/* # 静态资源 和租户无关 ignore-tables: - system_tenant - system_tenant_package