批量签收调整

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

@@ -2568,7 +2568,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
 					packageLockIds.add(distributionLoadscanEntity.getPackageId());
 
-					log.info("content 参数:>>>>>>>>>>Warehouse:{},ScanUser:{},TrainNumber:{},ReservationCode:{}",myCurrentWarehouse.getName(),distributionLoadscanEntity.getSigningUser(),deliveryListEntity.getTrainNumber(),distributionReservationEntity.getReservationCode());
 					String content = "包件在"+myCurrentWarehouse.getName()+"由"+distributionLoadscanEntity.getSigningUser()+"扫描签收,装车方式:补录装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
 					JSONObject trunklinePackageTrackLog= handleLogJSONObject(myCurrentWarehouse,AuthUtil.getUser(),parcelListEntity.getOrderPackageCode(),content,WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
 					aaa.add(trunklinePackageTrackLog);
@@ -3083,8 +3082,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			//查询装车扫描表
 			List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
-//				.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
-//				.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
 
@@ -5084,7 +5081,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					jsonObject.put("num",1);
 					jsonObject.put("remark","批量签收下架");
 					jsonObjects.add(jsonObject);
-					content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getSigningUser()+"司机一键签收,装车方式:扫描装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
+					content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getSigningUser()+"司机司机批量签收,装车方式:扫描装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
 					trunklinePackageTrackLog= handleLogJSONObject(myCurrentWarehouse,AuthUtil.getUser(),parcelListEntity.getOrderPackageCode(),content,WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode());
 
 				} else {
@@ -5106,7 +5103,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntities.setSigningTime(signingTime);
 						distributionLoadscanService.updateById(loadscanEntities);
 						packageLockIds.add(loadscanEntities.getPackageId());
-						content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntities.getSigningUser()+"司机一键签收,装车方式:补录装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
+						content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntities.getSigningUser()+"司机批量签收,装车方式:补录装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
 						trunklinePackageTrackLog= handleLogJSONObject(myCurrentWarehouse,AuthUtil.getUser(),parcelListEntity.getOrderPackageCode(),content,WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode());
 
 					}