修改Bug。

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;
 }

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;
+
 }

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;
+
 }

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<CountPlanDetailExcelVO> convertList02(List<CountPlanDetailDO> list);
 
+    List<CountPlanDetailDO> convertList03(List<CountPlanDetailCreateReqVO> list);
+
 }

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<BalanceDO> {
                 amountNew = reqVO.getAmount();
             }
             //出库变负数
-            if (InventoryActionEnum.OUT.equals(inventoryAction)) {
+            if (InventoryActionEnum.OUT.getCode().equals(inventoryAction)) {
                 qtyNew = BigDecimal.ZERO.subtract(qtyNew);
                 amountNew = BigDecimal.ZERO.subtract(amountNew);
             }

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;
+    }
 
 }

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<CountPlanDetailDO> 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();
     }

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);

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<ExpectoutCreateReqVO> 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");