From 32780446785855221df7370b72202f5b93c29555 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 20 Dec 2023 19:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93=E4=B8=8E?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/TransferreceiptJobDetailUpdateReqVO.java | 4 +++- .../vo/TransferreceiptRequestDetailBaseVO.java | 3 +++ .../vo/UnplannedreceiptJobDetailUpdateReqVO.java | 4 ++++ .../scrapRequest/ScrapRequestMainServiceImpl.java | 12 +++++++----- .../TransferissueRequestMainServiceImpl.java | 4 ++-- .../TransferreceiptJobMainServiceImpl.java | 3 ++- .../UnplannedissueJobMainServiceImpl.java | 3 +-- .../UnplannedreceiptJobMainServiceImpl.java | 1 + 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailUpdateReqVO.java index 9ad9aaf6..28311f5e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailUpdateReqVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.transferreceiptJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.math.BigDecimal; + @Schema(description = "管理后台 - 调拨入库任务子更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @@ -10,7 +12,7 @@ import lombok.*; public class TransferreceiptJobDetailUpdateReqVO extends TransferreceiptJobDetailBaseVO { @Schema(description = "实际收货数量") - private String toQty; + private BigDecimal handleQty; @Schema(description = "到包装") private String toPackingNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java index a3e9c3b5..07408826 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java @@ -93,4 +93,7 @@ public class TransferreceiptRequestDetailBaseVO { @Schema(description = "主键ID") private Long masterId; + @Schema(description = "到包装号") + private String toPackingNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailUpdateReqVO.java index 472f7e5e..498efc7a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailUpdateReqVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.unplannedreceiptJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.math.BigDecimal; + @Schema(description = "管理后台 - 计划外入库任务子更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class UnplannedreceiptJobDetailUpdateReqVO extends UnplannedreceiptJobDetailBaseVO { + @Schema(description = "实际数量") + private BigDecimal handleQty; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java index 28726b90..41c2e326 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java @@ -11,6 +11,7 @@ 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.expectin.vo.ExpectinCreateReqVO; +import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.*; @@ -42,6 +43,7 @@ import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; import com.win.module.wms.service.expectin.ExpectinService; +import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.jobsetting.JobsettingService; import com.win.module.wms.service.location.LocationService; @@ -104,7 +106,7 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { @Resource private ScrapJobDetailMapper scrapJobDetailMapper; @Resource - private ExpectinService expectinService; + private ExpectoutService expectoutService; @Transactional @Override @@ -193,7 +195,7 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { scrapJobMainMapper.insert(scrapJobMainDO); // 任务 子表数据创建 - List expectinCreateReqVOList = new ArrayList<>(); + List expectoutCreateReqVOList = new ArrayList<>(); List scrapJobDetailDOList = new ArrayList<>(); for(ScrapRequestDetailDO scrapRequestDetailDO:detailDOList){ ScrapJobDetailDO scrapJobDetailDO = ScrapJobDetailConvert.INSTANCE.convert(scrapRequestDetailDO); @@ -208,18 +210,18 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { scrapJobDetailDOList.add(scrapJobDetailDO); //预计出 - ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO(); + ExpectoutCreateReqVO expectinCreateReqVO = new ExpectoutCreateReqVO(); BeanUtils.copyProperties(scrapRequestDetailDO, expectinCreateReqVO); expectinCreateReqVO.setJobNumber(number); expectinCreateReqVO.setBusinessType(scrapJobMainDO.getBusinessType()); expectinCreateReqVO.setLocationCode(scrapRequestDetailDO.getFromLocationCode()); expectinCreateReqVO.setOwnerCode(scrapRequestDetailDO.getFromOwnerCode()); expectinCreateReqVO.setQty(scrapRequestDetailDO.getQty()); - expectinCreateReqVOList.add(expectinCreateReqVO); + expectoutCreateReqVOList.add(expectinCreateReqVO); } scrapJobDetailMapper.insertBatch(scrapJobDetailDOList); //增加预计入 - expectinService.createExpectin(expectinCreateReqVOList); + expectoutService.createExpectout(expectoutCreateReqVOList); trendsApi.createTrends(scrapJobMainDO.getId(), "ScrapJob", "报废出库申请生成报废出库任务", TrendsTypeEnum.CREATE); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index e20aa3f8..98238853 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -616,11 +616,11 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest transferissueRecordDetailCreateReqVO.setNumber(number); transferissueRecordDetailCreateReqVO.setMasterId(String.valueOf(transferissueRecordMainDO.getId())); transferissueRecordDetailCreateReqVO.setFromPackingNumber(transferissueRequestDetailDO.getPackingNumber()); - transferissueRecordDetailCreateReqVO.setToPackingNumber(transferissueRequestDetailDO.getPackingNumber()); + // transferissueRecordDetailCreateReqVO.setToPackingNumber(transferissueRequestDetailDO.getPackingNumber()); transferissueRecordDetailCreateReqVO.setFromContainerNumber(transferissueRequestDetailDO.getContainerNumber()); transferissueRecordDetailCreateReqVO.setToContainerNumber(transferissueRequestDetailDO.getContainerNumber()); transferissueRecordDetailCreateReqVO.setFromBatch(transferissueRequestDetailDO.getBatch()); - transferissueRecordDetailCreateReqVO.setToBatch(transferissueRequestDetailDO.getBatch()); + // transferissueRecordDetailCreateReqVO.setToBatch(transferissueRequestDetailDO.getBatch()); transferissueRecordDetailCreateReqVO.setInventoryStatus(transferissueRequestDetailDO.getInventoryStatus()); transferissueRecordDetailCreateReqVO.setFromLocationGroupCode(transferissueRequestDetailDO.getFromLocationCode()); transferissueRecordDetailCreateReqVO.setFromAreaCode(transferissueRequestDetailDO.getFromLocationCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index e3d52e4c..163d9015 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -289,7 +289,7 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain transferreceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode()); transferreceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); transferreceiptRecordDetailDO.setInventoryStatus(transferreceiptJobDetailUpdateReqVO.getToInventoryStatus());//toInventoryStatus - transferreceiptRecordDetailDO.setQty(new BigDecimal(transferreceiptJobDetailUpdateReqVO.getToQty() == null?"0":transferreceiptJobDetailUpdateReqVO.getToQty()));//toQty + transferreceiptRecordDetailDO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty());//toQty transferreceiptRecordDetailDOList.add(transferreceiptRecordDetailDO); //添加库存事务list @@ -308,6 +308,7 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setBatch(transferreceiptRecordDetailDO.getFromBatch()); transactionCreateReqVO.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode()); + transactionCreateReqVO.setQty(transferreceiptJobDetailUpdateReqVO.getHandleQty()); transactionCreateReqVO.setRecordNumber(number); transactionCreateReqVO.setAmount(balanceDO.getAmount()); transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 787acac8..a699e70d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -217,7 +217,6 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe throw new ServiceException(TRANSFERISSUE_JOB_MAIN_STATUS_ERROR); } - //更新完成信息 Long userId = getLoginUserId(); AdminUserRespDTO userRespDTO = userApi.getUser(userId); @@ -296,7 +295,7 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setBatch(unplannedissueJobDetailDO.getBatch()); transactionCreateReqVO.setWarehouseCode(unplannedissueRecordMainDO.getFromWarehouseCode()); - transactionCreateReqVO.setQty(unplannedissueJobDetailUpdateReqVO.getQty()); + transactionCreateReqVO.setQty(unplannedissueJobDetailUpdateReqVO.getHandleQty()); transactionCreateReqVO.setRecordNumber(number); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index b65325a0..f1503a98 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -295,6 +295,7 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa transactionCreateReqVO.setBatch(unplannedreceiptRecordDetailDO.getBatch()); transactionCreateReqVO.setWarehouseCode(unplannedreceiptRecordMainDO.getToWarehouseCode()); transactionCreateReqVO.setRecordNumber(number); + transactionCreateReqVO.setQty(unplannedreceiptJobDetailUpdateReqVO.getHandleQty()); transactionCreateReqVO.setId(null); transactionCreateReqVOList.add(transactionCreateReqVO); }