Merge branch 'dev' into pre-production

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

@@ -1481,10 +1481,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 			sendFanoutService.sendFanoutMsg(fanoutMsg);
 		}catch (Exception e){
-			log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+			log.error("upShelfStockList",e);
+			log.warn("###########upShelfStockList: 发送上架广播失败");
 		}
 
-
 		return Resp.scanSuccess(msg, "成功上架" + num + "件");
 	}
 
@@ -1714,7 +1714,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 
 		}catch (Exception e){
-			log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+			log.error("downPackage",e);
+			log.warn("###########downPackage: 发送下架广播失败");
 		}
 
 		return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
@@ -2028,7 +2029,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 
 		}catch (Exception e){
-			log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+			log.error("downPackageOrDelTray",e);
+			log.warn("###########downPackageOrDelTray: 发送下架广播失败");
 		}
 
 		return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
@@ -2146,7 +2148,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 						warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseEntity.getName(), AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
 
 					}catch (Exception e){
-						log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+						log.warn("###########downPackageAndDelTrayAndIsUpdate: 发送打托广播失败");
 					}
 
 
@@ -2241,7 +2243,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 						sendFanoutService.sendFanoutMsg(fanoutMsg);
 					}catch (Exception e){
-						log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+						log.error("downZeroOrder",e);
+						log.warn("###########downZeroOrder: 发送零担下架广播失败");
 					}
 
 
@@ -2383,7 +2386,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 						sendFanoutService.sendFanoutMsg(fanoutMsg);
 					}catch (Exception e){
-						log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+						log.error("downStock",e);
+						log.warn("###########downStock: 发送库存品下架广播失败");
 					}
 
 
@@ -3302,7 +3306,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 			});
 		}catch (Exception e){
-			log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+			log.error("changeUpdownGoodsToNewAllocation",e);
+			log.warn("###########changeUpdownGoodsToNewAllocation: 发送移库广播失败");
 		}
 
 	}
@@ -3648,7 +3653,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 			});
 		}catch (Exception e){
-			log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
+			log.error("saveTrayGoodsToAllocation",e);
+			log.warn("###########saveTrayGoodsToAllocation: 发送托盘上架广播失败");
 		}