Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java

@@ -47,9 +47,11 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl<WarehouseConfigM
 			}
 		} else {
 			BasicdataGoodsAllocationEntity defaultGoodsAllocation = basicdataGoodsAllocationClient.findDefaultGoodsAllocation(warehouseConfigEntity.getWarehouseId());
-			BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.findEntityByQrCode(warehouseConfigEntity.getWarehouseId(), warehouseConfigEntity.getDefaultAllocation());
+			if (!Objects.isNull(defaultGoodsAllocation)) {
-			if (!Objects.isNull(defaultGoodsAllocation) || !Strings.isBlank(warehouseConfigEntity.getDefaultAllocation())) {
+				BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.findEntityByQrCode(warehouseConfigEntity.getWarehouseId(), warehouseConfigEntity.getDefaultAllocation());
-				flag = basicdataGoodsAllocationClient.closeDefaultAllocation(goodsAllocationEntity.getId());
+				if (!Objects.isNull(goodsAllocationEntity)){
+					flag = basicdataGoodsAllocationClient.closeDefaultAllocation(goodsAllocationEntity.getId());
+				}
 			}
 			//关闭配置进行默认库位的清理
 			warehouseConfigEntity.setDefaultAllocation("");