商配新增日志增加

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

@@ -2020,10 +2020,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setStockupUserId(user.getUserId());
 		stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
-//		stockupEntity.setLoaderId(stockup.getLoaderId());
 		stockupEntity.setStockupArea(stockup.getGoodsAreaName());
 		stockupEntity.setOutboundDate(stockup.getOutboundDate());
-//		stockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
 		stockupEntity.setStockupDate(stockup.getStockupDate());
 		//编码生成规则 BH+仓库编码+年月日+序号00001
 		stockupEntity.setStockupCode(bianMa());
@@ -2161,7 +2159,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							distributionParcelListService.updateById(p);
 							packageLockIds.add(p.getId());
 							//这里根据包件进行订单状态的改变
-							String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"计划商配配送,操作方式:订单选择包件,预约任务号:"+reservation.getReservationCode()+",车次号:"+distributionDeliveryListEntity.getTrainNumber();
+							String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"计划商配配车,操作方式:订单选择包件,车次号:"+distributionDeliveryListEntity.getTrainNumber()+",预约任务号:"+reservationEntity.getReservationCode();
 							JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), p.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DELIVERY.getCode());
 							aaa.add(js);
 						});
@@ -2195,7 +2193,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 									distributionParcelListService.updateById(dp);
 									distributionAsyncService.checkStockArticleReservationStatus(dp);
 									packageLockIds.add(dp.getId());
-									String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"计划商配配送,操作方式:系统默认选择可用包件,预约任务号:"+reservation.getReservationCode()+",车次号:"+distributionDeliveryListEntity.getTrainNumber();
+									String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"计划商配配车,操作方式:系统默认选择可用包件,车次号:"+distributionDeliveryListEntity.getTrainNumber()+",预约任务号:"+reservationEntity.getReservationCode();
 									JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), dp.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DELIVERY.getCode());
 									aaa.add(js);
 								}