From 3c86377636dfa2ec2f3adad64928b1dd17f89e03 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 28 Nov 2023 11:10:53 +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 --- .../vo/CountPlanMainCreateReqVO.java | 11 ++++++++- .../vo/PutawayJobDetailUpdateReqVO.java | 22 +++++++++++++++++ .../vo/TransactionCreateReqVO.java | 24 +++++++++++++++++++ .../countPlan/CountPlanDetailConvert.java | 9 +++---- .../wms/dal/mysql/balance/BalanceMapper.java | 2 +- .../inventoryAction/InventoryActionEnum.java | 13 ++++++++-- .../countPlan/CountPlanMainServiceImpl.java | 13 ++++++++++ .../putawayJob/PutawayJobMainServiceImpl.java | 10 ++++++++ .../PutawayRequestMainServiceImpl.java | 4 ++-- 9 files changed, 98 insertions(+), 10 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainCreateReqVO.java index c9429634..a20c2613 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainCreateReqVO.java @@ -1,7 +1,13 @@ package com.win.module.wms.controller.countPlan.vo; -import lombok.*; +import com.win.framework.excel.core.annotations.SubObject; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.validation.Valid; +import java.util.List; @Schema(description = "管理后台 - 盘点计划主创建 Request VO") @Data @@ -9,4 +15,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @ToString(callSuper = true) public class CountPlanMainCreateReqVO extends CountPlanMainBaseVO { + @SubObject + @Schema(description = "子表数据") + private List<@Valid CountPlanDetailCreateReqVO> subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailUpdateReqVO.java index 33b01bec..f16978ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailUpdateReqVO.java @@ -2,8 +2,12 @@ package com.win.module.wms.controller.putawayJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 上架任务子更新 Request VO") @Data @@ -26,4 +30,22 @@ public class PutawayJobDetailUpdateReqVO extends PutawayJobDetailBaseVO { @Schema(description = "到库存状态") private String toInventoryStatus; + @Schema(description = "单价") + private BigDecimal singlePrice; + + @Schema(description = "金额") + private BigDecimal amount; + + @Schema(description = "到货日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime arriveDate; + + @Schema(description = "生产日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime produceDate; + + @Schema(description = "失效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime expireDate; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionCreateReqVO.java index 02eb0e3c..0d23b136 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionCreateReqVO.java @@ -2,6 +2,12 @@ package com.win.module.wms.controller.transaction.vo; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 库存事务创建 Request VO") @Data @@ -9,4 +15,22 @@ import io.swagger.v3.oas.annotations.media.Schema; @ToString(callSuper = true) public class TransactionCreateReqVO extends TransactionBaseVO { + @Schema(description = "单价") + private BigDecimal singlePrice; + + @Schema(description = "金额") + private BigDecimal amount; + + @Schema(description = "到货日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime arriveDate; + + @Schema(description = "生产日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime produceDate; + + @Schema(description = "失效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime expireDate; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanDetailConvert.java index c624e74a..573e0c5a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanDetailConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanDetailConvert.java @@ -1,16 +1,15 @@ package com.win.module.wms.convert.countPlan; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.countPlan.vo.CountPlanDetailCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailExcelVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailRespVO; import com.win.module.wms.controller.countPlan.vo.CountPlanDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; + +import java.util.List; /** * 盘点计划子 Convert @@ -34,4 +33,6 @@ public interface CountPlanDetailConvert { List convertList02(List list); + List convertList03(List list); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java index dbdc2231..565354fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java @@ -53,7 +53,7 @@ public interface BalanceMapper extends BaseMapperX { amountNew = reqVO.getAmount(); } //出库变负数 - if (InventoryActionEnum.OUT.equals(inventoryAction)) { + if (InventoryActionEnum.OUT.getCode().equals(inventoryAction)) { qtyNew = BigDecimal.ZERO.subtract(qtyNew); amountNew = BigDecimal.ZERO.subtract(amountNew); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/inventoryAction/InventoryActionEnum.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/inventoryAction/InventoryActionEnum.java index 5437dd17..70887275 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/inventoryAction/InventoryActionEnum.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/inventoryAction/InventoryActionEnum.java @@ -5,7 +5,16 @@ package com.win.module.wms.enums.inventoryAction; */ public enum InventoryActionEnum { - OUT,// 出库 - IN; // 入库 + OUT("OUT"),// 出库 + IN("IN"); // 入库 + + private String code; + InventoryActionEnum(String code) { + this.code = code; + } + + public String getCode() { + return this.code; + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index 7e895208..50f40ebd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -7,10 +7,13 @@ 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.countPlan.vo.CountPlanMainCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainUpdateReqVO; +import com.win.module.wms.convert.countPlan.CountPlanDetailConvert; import com.win.module.wms.convert.countPlan.CountPlanMainConvert; import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO; @@ -46,12 +49,22 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { private CountRequestMainMapper countRequestMainMapper; @Resource private TrendsApi trendsApi; + @Resource + private SerialNumberApi serialNumberApi; @Override public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) { // 插入 CountPlanMainDO countPlanMain = CountPlanMainConvert.INSTANCE.convert(createReqVO); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); + countPlanMain.setNumber(number); countPlanMainMapper.insert(countPlanMain); + List subDOList = CountPlanDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); + for (CountPlanDetailDO detailDO : subDOList) { + detailDO.setMasterId(countPlanMain.getId()); + detailDO.setNumber(number); + } + countPlanDetailMapper.insertBatch(subDOList); trendsApi.createTrends(countPlanMain.getId(), "countPlan", "增加了盘点计划", TrendsTypeEnum.CREATE); return countPlanMain.getId(); } 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 07f7f3ed..bcef9de8 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 @@ -224,6 +224,11 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { transactionCreateReqVOIn.setPackingNumber(putawayJobDetailUpdateReqVO.getToPackingNumber()); transactionCreateReqVOIn.setInventoryStatus(putawayJobDetailUpdateReqVO.getToInventoryStatus()); transactionCreateReqVOIn.setLocationCode(putawayJobDetailUpdateReqVO.getToLocationCode()); + transactionCreateReqVOIn.setSinglePrice(putawayJobDetailUpdateReqVO.getSinglePrice()); + transactionCreateReqVOIn.setAmount(putawayJobDetailUpdateReqVO.getAmount()); + transactionCreateReqVOIn.setArriveDate(putawayJobDetailUpdateReqVO.getArriveDate()); + transactionCreateReqVOIn.setProduceDate(putawayJobDetailUpdateReqVO.getProduceDate()); + transactionCreateReqVOIn.setExpireDate(putawayJobDetailUpdateReqVO.getExpireDate()); transactionCreateReqVOIn.setRecordNumber(number); transactionCreateReqVOIn.setId(null); //待确定库存事务信息 @@ -242,6 +247,11 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { transactionCreateReqVOOut.setBatch(putawayJobDetailUpdateReqVO.getBatch()); transactionCreateReqVOOut.setPackingNumber(putawayJobDetailUpdateReqVO.getPackingNumber()); transactionCreateReqVOOut.setLocationCode(putawayJobDetailUpdateReqVO.getFromLocationCode()); + transactionCreateReqVOOut.setSinglePrice(putawayJobDetailUpdateReqVO.getSinglePrice()); + transactionCreateReqVOOut.setAmount(putawayJobDetailUpdateReqVO.getAmount()); + transactionCreateReqVOOut.setArriveDate(putawayJobDetailUpdateReqVO.getArriveDate()); + transactionCreateReqVOOut.setProduceDate(putawayJobDetailUpdateReqVO.getProduceDate()); + transactionCreateReqVOOut.setExpireDate(putawayJobDetailUpdateReqVO.getExpireDate()); transactionCreateReqVOOut.setId(null); //待确定库存事务信息 transactionCreateReqVOList.add(transactionCreateReqVOOut); 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 41681dbd..3b6f9851 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 @@ -324,7 +324,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService PutawayRecordMainCreateReqVO putawayRecordMainCreateReqVO = new PutawayRecordMainCreateReqVO(); BeanUtils.copyProperties(mainDO, putawayRecordMainCreateReqVO); putawayRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode()); putawayRecordMainCreateReqVO.setNumber(number); //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord"); @@ -341,7 +341,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService List expectoutCreateReqVOList = new ArrayList<>(); PutawayJobMainDO putawayJobMainDO = PutawayJobMainConvert.INSTANCE.convert(mainDO); putawayJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); - String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_JOB.getCode()); putawayJobMainDO.setNumber(number); putawayJobMainDO.setRequestNumber(mainDO.getNumber()); JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("PurchasePutawayJob");