Merge branch 'dev' into pre-production

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

@@ -2489,7 +2489,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//下架解托
 					warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
 					//维护订单状态
-					String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描签收,装车方式:扫描装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
+					String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getSigningUser()+"扫描签收,装车方式:扫描装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
 					JSONObject trunklinePackageTrackLog= new JSONObject();
 					trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
 					trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
@@ -2594,9 +2594,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
 					trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
 					trunklinePackageTrackLog.put("content",content);
-					trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
+					trunklinePackageTrackLog.put("operator",distributionLoadscanEntity.getScanUser());
 					aaa.add(trunklinePackageTrackLog);
-					orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
+					orderPackageCodes.add(distributionLoadscanEntity.getOrderPackageCode());
 
 
 				}