Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java

@@ -251,7 +251,9 @@ public class DistributionSignforAppController {
 				}
 			}
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(orderPackageCodes!=null){
 				updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托");
+			}
 		} catch (Exception e) {
 			log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes);
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java

@@ -554,7 +554,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 	public List<DisStockListDetailVO> selectDistributionAppDeliveryInventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
 		List<DisStockListDetailEntity> inventoryList = distributionReservationMapper.selectInventoryListByReservation(Long.parseLong(distributionAppDeliveryListDTO.getReservationId()));
 		if (Func.isEmpty(inventoryList)) {
-			log.error("##########查询该客户库存品信息为null");
+			log.warn("##########查询该客户库存品信息为null");
 			return null;
 		}
 		List<Long> stockListIds = inventoryList.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList());

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

@@ -1540,8 +1540,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		});
 
 		removeByIds(toNullUpdownTypeIds);
+		if (!updateAllocationIds.isEmpty()) {
 			basicdataGoodsAllocationClient.updateListAllocationStatus(updateAllocationIds, "1");
+		}
+		if (!deleteTrayAllocationList.isEmpty()) {
 			warehouseTaryAllocationService.removeBatchByIds(deleteTrayAllocationList);
+		}
 
 		updateUpdownTypeList.forEach(this::updateUpdownTypeNum);
 
@@ -1794,7 +1798,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	}
 
 
-
 	@Override
 	public R downZeroOrder(List<UpShelfZeroOrderDTO> upShelfPackageList, Long warehouseId, String remark) {
 		StringBuffer stringBuffer = new StringBuffer("下架零担订单成功");
@@ -3092,7 +3095,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	}
 
 
-
 	private void updateUpdownTypeNum(WarehouseUpdownTypeEntity updownTypeEntity) {
 		Long updownTypeId = updownTypeEntity.getId();
 		Long warehouseId = updownTypeEntity.getWarehouseId();