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

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

@@ -3305,6 +3305,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			return false;
 		}
 		Set<Long> parcelListIds = new HashSet<>();
+		try{
 			for (int i = 0; i < split.length; i++) {
 				String s = split[i];
 				//查询是不是上传图片
@@ -3383,6 +3384,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				// 回传老系统自提数据
 				sendOldSystem(Long.parseLong(s));
 			}
+		}catch (Exception e){
+			log.error(">>>>>",e);
+			return false;
+		}
+
 		// 回传工厂数据
 		sendFactory(myCurrentWarehouse, parcelListIds);
 
@@ -3467,7 +3473,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
 			rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
 		} catch (Exception e) {
-			log.error("入库推送失败：{}", e);
+			log.error("入库推送失败：", e);
 		}
 	}
 

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

@@ -2412,7 +2412,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		//空置的托盘打托id
 		removeByIds(toNullTrayTypeIds);
 		//更新托盘状态
+		if(!updateTrayIds.isEmpty()){
 			basicdataTrayClient.updateTrayStatusByTrayIds(updateTrayIds,1);
+		}
+
 		//添加下托日志
 		warehouseTrayGoodsLogService.saveBatch(addTrayGoodsLogEntities);
 		updateTrayTypeIds.forEach(trayTypeId -> {