修改仓库名称

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

@@ -2500,8 +2500,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
 					trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
 					trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
-					trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
-					trunklinePackageTrackLog.put("warehouseName",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
+					trunklinePackageTrackLog.put("warehouseId",myCurrentWarehouse.getId());
+					trunklinePackageTrackLog.put("warehouseName",myCurrentWarehouse.getName());
 					trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
 					trunklinePackageTrackLog.put("content",content);
 					trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
@@ -5190,6 +5190,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getSigningUser()+"司机一键签收,装车方式:扫描装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
 					trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
 					trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
+
 					trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
 					trunklinePackageTrackLog.put("updateUser",loadscanEntities.getUpdateUser());
 					trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
@@ -5197,8 +5198,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
 					trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
 					trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
-					trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntities.getWarehouseId());
-					trunklinePackageTrackLog.put("warehouseName",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntities.getWarehouseName());
+					trunklinePackageTrackLog.put("warehouseId",myCurrentWarehouse.getId());
+					trunklinePackageTrackLog.put("warehouseName",myCurrentWarehouse.getName());
 					trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
 				} else {
 					//存在装车数据