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