发料申请 直接生成记录

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailCreateReqVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.issueRecord.vo;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.util.List;
+import java.util.Map;
+
 @Schema(description = "管理后台 - 发料记录子创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class IssueRecordDetailCreateReqVO extends IssueRecordDetailBaseVO {
-
+    @Schema(description = "子表记录数据")
+    private List<Map<String,String>> recordList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.issueRecord.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+import java.util.Map;
+
 @Schema(description = "管理后台 - 发料记录子 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class IssueRecordDetailRespVO extends IssueRecordDetailBaseVO {
-
+    @Schema(description = "子表记录数据")
+    private List<Map<String,String>> recordList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java

@@ -24,7 +24,6 @@ public class IssueRecordMainBaseVO {
     private Long id;
 
     @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "申请单号不能为空")
     private String requestNumber;
 
     @Schema(description = "任务单号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java

@@ -1,7 +1,6 @@
 package com.win.module.wms.service.issueRecord;
 
 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;
@@ -14,18 +13,15 @@ import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO;
 import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainUpdateReqVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.issueRecord.IssueRecordDetailConvert;
-import com.win.module.wms.convert.issueRecord.IssueRecordMainConvert;
 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.issueRecord.IssueRecordDetailDO;
-import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO;
 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.issueRecord.IssueRecordDetailMapper;
-import com.win.module.wms.dal.mysql.issueRecord.IssueRecordMainMapper;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -33,14 +29,20 @@ import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
+
-import java.util.List;
+import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
+import com.win.framework.common.pojo.PageResult;
+
+import com.win.module.wms.convert.issueRecord.IssueRecordMainConvert;
+import com.win.module.wms.dal.mysql.issueRecord.IssueRecordMainMapper;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -109,6 +111,7 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService {
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
         for (IssueRecordDetailDO detailDO : subDOList) {
+            List<Map<String,String>> recordList = IssueRecordDetailConvert.INSTANCE.convert(detailDO).getRecordList();
             detailDO.setMasterId(mainDO.getId());
             detailDO.setNumber(number);
             LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode());
@@ -135,53 +138,66 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService {
             } else {
                 throw exception(ITEMBASIC_NOT_EXISTS);
             }
-            //查询库存余额
+            recordList.forEach( recordListItem -> {
-            BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode());
+                // record 相关数据
-            if (balanceDO == null) {
+                String toInventoryStatus = recordListItem.get("toInventoryStatus").toString();
-                throw exception(BALANCE_NOT_EXISTS);
+                String fromPackingNumber = recordListItem.get("fromPackingNumber").toString();
-            }
+                String fromBatch = recordListItem.get("fromBatch").toString();
-            // 库存事务——入
+                String toPackingNumber = recordListItem.get("toPackingNumber").toString();
-            TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
+                String toBatch = recordListItem.get("toBatch").toString();
-            BeanUtils.copyProperties(detailDO, transactionCreateReqVOIn);
+                String fromLocationCode = recordListItem.get("fromLocationCode").toString();
-            transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
+                String toLocationCode = recordListItem.get("toLocationCode").toString();
-            TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
+
-            transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
+                //查询库存余额
-            transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
+                List<String> inventoryStatusList = new ArrayList<>();
-            transactionCreateReqVOIn.setWorker(String.valueOf(userRespDTO.getId()));
+                inventoryStatusList.add(toInventoryStatus);
-            transactionCreateReqVOIn.setBatch(detailDO.getToBatch());
+                List<BalanceDO> balanceDO = jobUtils.selectlocationReturnManagementAccuracyToBalance(detailDO.getItemCode(),fromPackingNumber,fromBatch,fromLocationCode,inventoryStatusList);
-            transactionCreateReqVOIn.setPackingNumber(detailDO.getToPackingNumber());
+                if (balanceDO == null || balanceDO.size() == 0) {
-            transactionCreateReqVOIn.setInventoryStatus(detailDO.getInventoryStatus());
+                    throw exception(BALANCE_NOT_EXISTS);
-            transactionCreateReqVOIn.setLocationCode(detailDO.getToLocationCode());
+                }
-            transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
+                // 库存事务——入
-            transactionCreateReqVOIn.setAmount(balanceDO.getAmount());
+                TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
-            transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate());
+                BeanUtils.copyProperties(detailDO, transactionCreateReqVOIn);
-            transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate());
+                transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
-            transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate());
+                TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
-            transactionCreateReqVOIn.setWarehouseCode(mainDO.getFromWarehouseCode());
+                transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
-            transactionCreateReqVOIn.setRecordNumber(number);
+                transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
-            transactionCreateReqVOIn.setId(null);
+                transactionCreateReqVOIn.setWorker(String.valueOf(userRespDTO.getId()));
-            transactionCreateReqVOList.add(transactionCreateReqVOIn);
+                transactionCreateReqVOIn.setBatch(toBatch);
-            // 库存事务——出
+                transactionCreateReqVOIn.setPackingNumber(toPackingNumber);
-            TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO();
+                transactionCreateReqVOIn.setInventoryStatus(toInventoryStatus);
-            BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut);
+                transactionCreateReqVOIn.setLocationCode(toLocationCode);
-            transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
+                transactionCreateReqVOIn.setSinglePrice(balanceDO.get(0).getSinglePrice());
-            TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
+                transactionCreateReqVOIn.setAmount(balanceDO.get(0).getAmount());
-            transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
+                transactionCreateReqVOIn.setArriveDate(balanceDO.get(0).getArriveDate());
-            transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
+                transactionCreateReqVOIn.setProduceDate(balanceDO.get(0).getProduceDate());
-            transactionCreateReqVOOut.setRecordNumber(number);
+                transactionCreateReqVOIn.setExpireDate(balanceDO.get(0).getExpireDate());
-            transactionCreateReqVOOut.setInventoryStatus(detailDO.getInventoryStatus());
+                transactionCreateReqVOIn.setWarehouseCode(mainDO.getFromWarehouseCode());
-            transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId()));
+                transactionCreateReqVOIn.setRecordNumber(number);
-            transactionCreateReqVOOut.setBatch(detailDO.getFromBatch());
+                transactionCreateReqVOIn.setId(null);
-            transactionCreateReqVOOut.setPackingNumber(detailDO.getFromPackingNumber());
+                transactionCreateReqVOList.add(transactionCreateReqVOIn);
-            transactionCreateReqVOOut.setLocationCode(detailDO.getFromLocationCode());
+                // 库存事务——出
-            transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice());
+                TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO();
-            transactionCreateReqVOOut.setAmount(balanceDO.getAmount());
+                BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut);
-            transactionCreateReqVOOut.setArriveDate(balanceDO.getArriveDate());
+                transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
-            transactionCreateReqVOOut.setProduceDate(balanceDO.getProduceDate());
+                TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
-            transactionCreateReqVOOut.setExpireDate(balanceDO.getExpireDate());
+                transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
-            transactionCreateReqVOOut.setWarehouseCode(mainDO.getFromWarehouseCode());
+                transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
-            transactionCreateReqVOOut.setId(null);
+                transactionCreateReqVOOut.setRecordNumber(number);
-            transactionCreateReqVOList.add(transactionCreateReqVOOut);
+                transactionCreateReqVOOut.setInventoryStatus(toInventoryStatus);
+                transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId()));
+                transactionCreateReqVOOut.setBatch(fromBatch);
+                transactionCreateReqVOOut.setPackingNumber(fromPackingNumber);
+                transactionCreateReqVOOut.setLocationCode(fromLocationCode);
+                transactionCreateReqVOOut.setSinglePrice(balanceDO.get(0).getSinglePrice());
+                transactionCreateReqVOOut.setAmount(balanceDO.get(0).getAmount());
+                transactionCreateReqVOOut.setArriveDate(balanceDO.get(0).getArriveDate());
+                transactionCreateReqVOOut.setProduceDate(balanceDO.get(0).getProduceDate());
+                transactionCreateReqVOOut.setExpireDate(balanceDO.get(0).getExpireDate());
+                transactionCreateReqVOOut.setWarehouseCode(mainDO.getFromWarehouseCode());
+                transactionCreateReqVOOut.setId(null);
+                transactionCreateReqVOList.add(transactionCreateReqVOOut);
+            });
         }
         issueRecordDetailMapper.insertBatch(subDOList);
         //增加库存事务