From 6c04d888c88e2f0420fb3a178112ba88343509cf Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 15 Dec 2023 13:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereceiptJobMainServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index f4c8290a..606ddc7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -300,10 +300,12 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVOTemp.getHandleQty()); purchasereceiptRecordDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); purchasereceiptRecordDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); - LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); - purchasereceiptRecordDetailDO.setFromAreaCode(locationDO1.getAreaCode()); - purchasereceiptRecordDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode()); - LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + if(purchasereceiptJobDetailDO.getFromLocationCode() != null && !purchasereceiptJobDetailDO.getFromLocationCode().isEmpty()) { + LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + purchasereceiptRecordDetailDO.setFromAreaCode(locationDO1.getAreaCode()); + purchasereceiptRecordDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode()); + } + LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getToLocationCode()); purchasereceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode()); purchasereceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode()); @@ -350,10 +352,12 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchaseshortageDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber()); purchaseshortageDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); purchaseshortageDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber()); - LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); - purchaseshortageDetailDO.setFromAreaCode(locationDO1.getAreaCode()); - purchaseshortageDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode()); - LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + if(purchasereceiptJobDetailDO.getFromLocationCode() != null && !purchasereceiptJobDetailDO.getFromLocationCode().isEmpty()) { + LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode()); + purchaseshortageDetailDO.setFromAreaCode(locationDO1.getAreaCode()); + purchaseshortageDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode()); + } + LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getToLocationCode()); purchaseshortageDetailDO.setToAreaCode(locationDO2.getAreaCode()); purchaseshortageDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode()); PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());