记录赋值fromAreaCodes与fromLocationType问题增加

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java

@@ -13,7 +13,7 @@ public class ProductrepairRequestBomRespVO extends ProductrepairRequestDetailbBa
 
     private String itemCode;
     private String uom;
-    private BigDecimal qty;
+    private BigDecimal bomQty;
     private String version;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java

@@ -143,6 +143,8 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
             productrepairRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             productrepairRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             productrepairRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            productrepairRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+            productrepairRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("ProductRepairRecord").getInterfaceType();
             productrepairRecordMainCreateReqVO.setInterfaceType(interFaceType);
             productrepairRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());
@@ -485,9 +487,11 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                 if(detailbDOMap.get(productrepairRequestBomRespVO.getItemCode()) != null) {
                     ProductrepairRequestDetailbDO productrepairRequestDetailbDO = detailbDOMap.get(productrepairRequestBomRespVO.getItemCode());
                     productrepairRequestBomRespVO = ProductrepairRequestDetailbConvert.INSTANCE.convertRespVO(productrepairRequestDetailbDO);
+                }else {
+                    productrepairRequestBomRespVO.setQty(BigDecimal.ZERO);
                 }
             }
-            productrepairRequestBomRespVO.setQty(new BigDecimal(map.get("qty") != null?map.get("qty").toString():"0"));
+            productrepairRequestBomRespVO.setBomQty(new BigDecimal(map.get("qty") != null?map.get("qty").toString():"0"));
             productrepairRequestBomRespVO.setUom(map.get("uom") != null?map.get("uom").toString():"");
             productrepairRequestBomRespVO.setVersion(map.get("version") != null?map.get("version").toString():"");
             resultList.add(productrepairRequestBomRespVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java

@@ -151,6 +151,8 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
             productscrapRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             productscrapRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             productscrapRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            productscrapRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+            productscrapRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("ProductScrapRecord").getInterfaceType();
             productscrapRecordMainCreateReqVO.setInterfaceType(interFaceType);
             productscrapRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java

@@ -234,10 +234,12 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService {
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapRecord");
         scrapRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         scrapRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        scrapRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        scrapRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.TRANSFER_DELIVER_RECORD.getCode());
+        scrapRecordMainDO.setNumber(number);
         String interFaceType = recordsettingService.selectRecordsettingExist("ScrapRecord").getInterfaceType();
         scrapRecordMainDO.setInterfaceType(interFaceType);
-        scrapRecordMainDO.setNumber(number);
         scrapRecordMainDO.setBusinessType(businesstypeDO.getCode());
         scrapRecordMainDO.setJobNumber(scrapJobMainDO.getNumber());
         scrapRecordMainDO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java

@@ -79,6 +79,8 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
         scrapRecordMainDO.setBusinessType(businesstypeDO.getCode());
         scrapRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         scrapRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        scrapRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        scrapRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         String interFaceType = recordsettingService.selectRecordsettingExist("ScrapRecord").getInterfaceType();
         scrapRecordMainDO.setInterfaceType(interFaceType);
         scrapRecordMainDO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java

@@ -137,6 +137,8 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService {
             scrapRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             scrapRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             scrapRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            scrapRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+            scrapRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("ScrapRecord").getInterfaceType();
             scrapRecordMainCreateReqVO.setInterfaceType(interFaceType);
             scrapRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java

@@ -249,6 +249,10 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("TransferDeliverRecord");
         transferissueRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         transferissueRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        transferissueRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        transferissueRecordMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+        transferissueRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+        transferissueRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.TRANSFER_DELIVER_RECORD.getCode());
         String interFaceType = recordsettingService.selectRecordsettingExist("TransferDeliverRecord").getInterfaceType();
         transferissueRecordMainDO.setInterfaceType(interFaceType);
@@ -260,7 +264,7 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ
         transferissueRecordMainDO.setDueTime(transferissueJobMainDO.getRequestDueTime());
         transferissueRecordMainDO.setAvailable("TRUE");
         transferissueRecordMainDO.setId(null);
-        transferissueRecordMainDO.setCreateTime(null);
+        transferissueRecordMainDO.setCreateTime(LocalDateTime.now());
         transferissueRecordMainDO.setCreator(null);
         transferissueRecordMainDO.setUpdateTime(null);
         transferissueRecordMainDO.setUpdater(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java

@@ -80,6 +80,10 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa
         transferissueRecordMainDO.setBusinessType(businesstypeDO.getCode());
         transferissueRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         transferissueRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        transferissueRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        transferissueRecordMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+        transferissueRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+        transferissueRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         String interFaceType = recordsettingService.selectRecordsettingExist("TransferDeliverRecord").getInterfaceType();
         transferissueRecordMainDO.setInterfaceType(interFaceType);
         transferissueRecordMainDO.setExecuteTime(LocalDateTime.now());
@@ -89,8 +93,6 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa
         transferissueRecordMainDO.setId(null);
         transferissueRecordMainDO.setCreator(null);
         transferissueRecordMainDO.setCreateTime(LocalDateTime.now());
-        transferissueRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
-        transferissueRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         transferissueRecordMainMapper.insert(transferissueRecordMainDO);
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
@@ -128,30 +130,7 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa
             transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
             transactionCreateReqVO.setId(null);
             transactionCreateReqVOList.add(transactionCreateReqVO);
-//            if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) {
+
-//                TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
-//                BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVOIn);
-//                //增加业务入类型
-//                transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
-//                TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
-//                transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
-//                transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
-//                transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
-//                transactionCreateReqVOIn.setBatch(recordDetailDO.getToBatch());
-//                transactionCreateReqVOIn.setPackingNumber(recordDetailDO.getToPackingNumber());
-//                transactionCreateReqVOIn.setInventoryStatus(recordDetailDO.getInventoryStatus());
-//                transactionCreateReqVOIn.setLocationCode(recordDetailDO.getToLocationCode());
-//                transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
-//                transactionCreateReqVOIn.setAmount(balanceDO.getAmount());
-//                transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate());
-//                transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate());
-//                transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate());
-//                transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode());
-//                transactionCreateReqVOIn.setRecordNumber(number);
-//                transactionCreateReqVOIn.setId(null);
-//                //待确定库存事务信息
-//                transactionCreateReqVOList.add(transactionCreateReqVOIn);
-//            }
         }
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java

@@ -594,6 +594,10 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest
             transferissueRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             transferissueRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             transferissueRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            transferissueRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+            transferissueRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+            transferissueRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+            transferissueRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("TransferDeliverRecord").getInterfaceType();
             transferissueRecordMainCreateReqVO.setInterfaceType(interFaceType);
             transferissueRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());
@@ -653,30 +657,6 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest
                 transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
                 transactionCreateReqVO.setId(null);
                 transactionCreateReqVOList.add(transactionCreateReqVO);
-//                if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) {
-//                    TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
-//                    BeanUtils.copyProperties(transferissueRecordDetailDO, transactionCreateReqVOIn);
-//                    //增加业务入类型
-//                    transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
-//                    TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
-//                    transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
-//                    transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
-//                    transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
-//                    transactionCreateReqVOIn.setBatch(transferissueRecordDetailDO.getToBatch());
-//                    transactionCreateReqVOIn.setPackingNumber(transferissueRecordDetailDO.getToPackingNumber());
-//                    transactionCreateReqVOIn.setInventoryStatus(transferissueRecordDetailDO.getInventoryStatus());
-//                    transactionCreateReqVOIn.setLocationCode(transferissueRecordDetailDO.getToLocationCode());
-//                    transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
-//                    transactionCreateReqVOIn.setAmount(balanceDO.getAmount());
-//                    transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate());
-//                    transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate());
-//                    transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate());
-//                    transactionCreateReqVOIn.setWarehouseCode(transferissueRecordMainDO.getFromWarehouseCode());
-//                    transactionCreateReqVOIn.setRecordNumber(number);
-//                    transactionCreateReqVOIn.setId(null);
-//                    //待确定库存事务信息
-//                    transactionCreateReqVOList.add(transactionCreateReqVOIn);
-//                }
 
                 // 调拨入库数据拼装
                 TransferreceiptRequestDetailCreateReqVO transferreceiptRequestDetailCreateReqVO = new TransferreceiptRequestDetailCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java

@@ -238,13 +238,17 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain
         TransferreceiptRecordMainDO transferreceiptRecordMainDO = new TransferreceiptRecordMainDO();
         BeanUtils.copyProperties(transferreceiptJobMainDO, transferreceiptRecordMainDO);
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("TransferReceiptRecord");
+        transferreceiptRecordMainDO.setBusinessType(businesstypeDO.getCode());
         transferreceiptRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         transferreceiptRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        transferreceiptRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        transferreceiptRecordMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+        transferreceiptRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+        transferreceiptRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.TRANSFER_RECEIPT_RECORD.getCode());
         String interFaceType = recordsettingService.selectRecordsettingExist("TransferReceiptRecord").getInterfaceType();
         transferreceiptRecordMainDO.setInterfaceType(interFaceType);
         transferreceiptRecordMainDO.setNumber(number);
-        transferreceiptRecordMainDO.setBusinessType(businesstypeDO.getCode());
         transferreceiptRecordMainDO.setJobNumber(transferreceiptJobMainDO.getNumber());
         transferreceiptRecordMainDO.setExecuteTime(LocalDateTime.now());
         transferreceiptRecordMainDO.setActiveDate(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java

@@ -79,6 +79,10 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco
         transferreceiptRecordMainDO.setBusinessType(businesstypeDO.getCode());
         transferreceiptRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         transferreceiptRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        transferreceiptRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        transferreceiptRecordMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+        transferreceiptRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+        transferreceiptRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         String interFaceType = recordsettingService.selectRecordsettingExist("TransferReceiptRecord").getInterfaceType();
         transferreceiptRecordMainDO.setInterfaceType(interFaceType);
         transferreceiptRecordMainDO.setExecuteTime(LocalDateTime.now());
@@ -126,30 +130,6 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco
             transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
             transactionCreateReqVO.setId(null);
             transactionCreateReqVOList.add(transactionCreateReqVO);
-//            if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) {
-//                TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
-//                BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVOIn);
-//                //增加业务入类型
-//                transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
-//                TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
-//                transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
-//                transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
-//                transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
-//                transactionCreateReqVOIn.setBatch(recordDetailDO.getToBatch());
-//                transactionCreateReqVOIn.setPackingNumber(recordDetailDO.getToPackingNumber());
-//                transactionCreateReqVOIn.setInventoryStatus(recordDetailDO.getInventoryStatus());
-//                transactionCreateReqVOIn.setLocationCode(recordDetailDO.getToLocationCode());
-//                transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
-//                transactionCreateReqVOIn.setAmount(balanceDO.getAmount());
-//                transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate());
-//                transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate());
-//                transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate());
-//                transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode());
-//                transactionCreateReqVOIn.setRecordNumber(number);
-//                transactionCreateReqVOIn.setId(null);
-//                //待确定库存事务信息
-//                transactionCreateReqVOList.add(transactionCreateReqVOIn);
-//            }
         }
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java

@@ -136,6 +136,10 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq
             transferreceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             transferreceiptRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             transferreceiptRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            transferreceiptRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+            transferreceiptRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+            transferreceiptRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+            transferreceiptRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("TransferReceiptRecord").getInterfaceType();
             transferreceiptRecordMainCreateReqVO.setInterfaceType(interFaceType);
             transferreceiptRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());
@@ -191,30 +195,6 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq
                 transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
                 transactionCreateReqVO.setId(null);
                 transactionCreateReqVOList.add(transactionCreateReqVO);
-//                if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) {
-//                    TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
-//                    BeanUtils.copyProperties(transferreceiptRequestDetailDO, transactionCreateReqVOIn);
-//                    //增加业务入类型
-//                    transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
-//                    TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
-//                    transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
-//                    transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
-//                    transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
-//                    transactionCreateReqVOIn.setBatch(transferreceiptRequestDetailDO.getBatch());
-//                    transactionCreateReqVOIn.setPackingNumber(transferreceiptRequestDetailDO.getPackingNumber());
-//                    transactionCreateReqVOIn.setInventoryStatus(transferreceiptRequestDetailDO.getInventoryStatus());
-//                    transactionCreateReqVOIn.setLocationCode(transferreceiptRequestDetailDO.getToLocationCode());
-//                    transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
-//                    transactionCreateReqVOIn.setAmount(balanceDO.getAmount());
-//                    transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate());
-//                    transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate());
-//                    transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate());
-//                    transactionCreateReqVOIn.setWarehouseCode(transferreceiptRecordMainDO.getFromWarehouseCode());
-//                    transactionCreateReqVOIn.setRecordNumber(number);
-//                    transactionCreateReqVOIn.setId(null);
-//                    //待确定库存事务信息
-//                    transactionCreateReqVOList.add(transactionCreateReqVOIn);
-//                }
             }
             // 更新成状态已完成
             mainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java

@@ -231,20 +231,22 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe
         UnplannedissueRecordMainDO unplannedissueRecordMainDO = new UnplannedissueRecordMainDO();
         BeanUtils.copyProperties(unplannedissueJobMainDO, unplannedissueRecordMainDO);
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("UnplannedDeliverRecord");
+        unplannedissueRecordMainDO.setBusinessType(businesstypeDO.getCode());
         unplannedissueRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         unplannedissueRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        unplannedissueRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        unplannedissueRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.UNPLANNED_DELIVER_RECORD.getCode());
+        unplannedissueRecordMainDO.setNumber(number);
         String interFaceType = recordsettingService.selectRecordsettingExist("UnplannedDeliverRecord").getInterfaceType();
         unplannedissueRecordMainDO.setInterfaceType(interFaceType);
-        unplannedissueRecordMainDO.setNumber(number);
-        unplannedissueRecordMainDO.setBusinessType(businesstypeDO.getCode());
         unplannedissueRecordMainDO.setJobNumber(unplannedissueJobMainDO.getNumber());
         unplannedissueRecordMainDO.setExecuteTime(LocalDateTime.now());
         unplannedissueRecordMainDO.setActiveDate(LocalDateTime.now());
         unplannedissueRecordMainDO.setDueTime(unplannedissueJobMainDO.getRequestDueTime());
         unplannedissueRecordMainDO.setAvailable("TRUE");
         unplannedissueRecordMainDO.setId(null);
-        unplannedissueRecordMainDO.setCreateTime(null);
+        unplannedissueRecordMainDO.setCreateTime(LocalDateTime.now());
         unplannedissueRecordMainDO.setCreator(null);
         unplannedissueRecordMainDO.setUpdateTime(null);
         unplannedissueRecordMainDO.setUpdater(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java

@@ -79,6 +79,8 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord
         unplannedissueRecordMainDO.setBusinessType(businesstypeDO.getCode());
         unplannedissueRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         unplannedissueRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        unplannedissueRecordMainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+        unplannedissueRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         String interFaceType = recordsettingService.selectRecordsettingExist("UnplannedDeliverRecord").getInterfaceType();
         unplannedissueRecordMainDO.setInterfaceType(interFaceType);
         unplannedissueRecordMainDO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java

@@ -141,6 +141,8 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
             unplannedissueRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             unplannedissueRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             unplannedissueRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            unplannedissueRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
+            unplannedissueRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("UnplannedDeliverRecord").getInterfaceType();
             unplannedissueRecordMainCreateReqVO.setInterfaceType(interFaceType);
             unplannedissueRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java

@@ -232,10 +232,12 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("UnplannedReceiptRecord");
         unplannedreceiptRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         unplannedreceiptRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        unplannedreceiptRecordMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+        unplannedreceiptRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         String number = serialNumberApi.generateCode(RuleCodeEnum.UNPLANNED_RECEIPT_RECORD.getCode());
+        unplannedreceiptRecordMainDO.setNumber(number);
         String interFaceType = recordsettingService.selectRecordsettingExist("UnplannedReceiptRecord").getInterfaceType();
         unplannedreceiptRecordMainDO.setInterfaceType(interFaceType);
-        unplannedreceiptRecordMainDO.setNumber(number);
         unplannedreceiptRecordMainDO.setBusinessType(businesstypeDO.getCode());
         unplannedreceiptRecordMainDO.setJobNumber(unplannedreceiptJobMainDO.getNumber());
         unplannedreceiptRecordMainDO.setExecuteTime(LocalDateTime.now());
@@ -243,7 +245,7 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa
         unplannedreceiptRecordMainDO.setDueTime(unplannedreceiptJobMainDO.getRequestDueTime());
         unplannedreceiptRecordMainDO.setAvailable("TRUE");
         unplannedreceiptRecordMainDO.setId(null);
-        unplannedreceiptRecordMainDO.setCreateTime(null);
+        unplannedreceiptRecordMainDO.setCreateTime(LocalDateTime.now());
         unplannedreceiptRecordMainDO.setCreator(null);
         unplannedreceiptRecordMainDO.setUpdateTime(null);
         unplannedreceiptRecordMainDO.setUpdater(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java

@@ -83,6 +83,8 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe
         unplannedreceiptRecordMainDO.setBusinessType(businesstypeDO.getCode());
         unplannedreceiptRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
         unplannedreceiptRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
+        unplannedreceiptRecordMainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+        unplannedreceiptRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         String interFaceType = recordsettingService.selectRecordsettingExist("UnplannedReceiptRecord").getInterfaceType();
         unplannedreceiptRecordMainDO.setInterfaceType(interFaceType);
         unplannedreceiptRecordMainDO.setExecuteTime(LocalDateTime.now());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java

@@ -133,6 +133,8 @@ public class UnplannedreceiptRequestMainServiceImpl implements UnplannedreceiptR
             unplannedreceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             unplannedreceiptRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
             unplannedreceiptRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
+            unplannedreceiptRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes());
+            unplannedreceiptRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes());
             String interFaceType = recordsettingService.selectRecordsettingExist("UnplannedReceiptRecord").getInterfaceType();
             unplannedreceiptRecordMainCreateReqVO.setInterfaceType(interFaceType);
             unplannedreceiptRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());