From ca96738e619056269f7bd43be9463b86b2267817 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 22 Dec 2023 13:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=B5=8B=E5=80=BCfromAreaCod?= =?UTF-8?q?es=E4=B8=8EfromLocationType=E9=97=AE=E9=A2=98=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ProductrepairRequestBomRespVO.java | 2 +- .../ProductrepairRequestMainServiceImpl.java | 6 +++- .../ProductscrapRequestMainServiceImpl.java | 2 ++ .../scrapJob/ScrapJobMainServiceImpl.java | 4 ++- .../ScrapRecordMainServiceImpl.java | 2 ++ .../ScrapRequestMainServiceImpl.java | 2 ++ .../TransferissueJobMainServiceImpl.java | 6 +++- .../TransferissueRecordMainServiceImpl.java | 31 +++---------------- .../TransferissueRequestMainServiceImpl.java | 28 +++-------------- .../TransferreceiptJobMainServiceImpl.java | 6 +++- .../TransferreceiptRecordMainServiceImpl.java | 28 +++-------------- ...TransferreceiptRequestMainServiceImpl.java | 28 +++-------------- .../UnplannedissueJobMainServiceImpl.java | 8 +++-- .../UnplannedissueRecordMainServiceImpl.java | 2 ++ .../UnplannedissueRequestMainServiceImpl.java | 2 ++ .../UnplannedreceiptJobMainServiceImpl.java | 6 ++-- ...UnplannedreceiptRecordMainServiceImpl.java | 2 ++ ...nplannedreceiptRequestMainServiceImpl.java | 2 ++ 18 files changed, 59 insertions(+), 108 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java index 15c6cf77..5490ecf3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index 3d0e266e..6f310337 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/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); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java index 8530c2e7..88b7fafc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java +++ b/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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index c6146baa..80722d57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java index c786b4d9..3a0805ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java +++ b/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()); 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 41c2e326..eae238e5 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 @@ -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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 139ad812..6fab38d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/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); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java index 219702c6..dc56a034 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java +++ b/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 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); 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 96d07c96..5471187c 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 @@ -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(); 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 62577bb9..d76bb0fd 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 @@ -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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java index 4f8f0f1a..9c05c040 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java +++ b/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); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java index cb78cde7..89822117 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java +++ b/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()); 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 a699e70d..b14f6134 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 @@ -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); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java index 5b5beb4a..2e58542f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java +++ b/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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index e425ef52..238f0696 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/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()); 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 f1503a98..365bf26b 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 @@ -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); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java index 8ba58717..bac7b0f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java +++ b/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()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java index ee299a03..6d6b3964 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java +++ b/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());