Merge branch 'dev' into pre-production

优化签收托盘下架

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java

@@ -53,6 +53,7 @@ public class DistributionSignforAppController {
 
 	private final IBasicdataWarehouseClient warehouseClient;
 
+
 	/**
 	 * 签收管理 列表
 	 */
@@ -209,6 +210,22 @@ public class DistributionSignforAppController {
 	public R newSignfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		try {
 			R r = distributionSignforService.newSignfor(distrilbutionloadingscanDTO);
+
+			if(r.getData()!=null){
+				String orderPackageCodes = null;
+				List<String> packageCodes= (List<String>) r.getData();
+				for (String packageCode : packageCodes) {
+					if (StringUtils.isBlank(orderPackageCodes)) {
+						orderPackageCodes = packageCode;
+					} else {
+						orderPackageCodes = orderPackageCodes + "," + packageCode;
+					}
+				}
+				// 执行下架解托盘代码
+				String remark="签收下架解托";
+				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+				updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), remark);
+			}
 			return r;
 		} catch (CustomerException e) {
 			log.error("#############signfor:签收报错", e);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -755,6 +755,12 @@
             <if test="param.waybillNumber !=null and param.waybillNumber != ''">
                 and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
             </if>
+            <if test="param.orderPackageStockupStatus!=null">
+                and ldpl.order_package_stockup_status = #{param.orderPackageStockupStatus}
+            </if>
+            <if test="param.orderPackageGroundingStatus!=null">
+                and ldpl.order_package_grounding_status = #{param.orderPackageGroundingStatus}
+            </if>
             <if test="param.serviceNumber !=null and param.serviceNumber != ''">
                 and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java

@@ -479,8 +479,9 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	/**
 	 * 自动维护签收表装车和签收数量
 	 * @param reservationId
+	 * @param user 如不是签收 不传入user
 	 */
-	void autoDpdateSignfor(@Param("reservationId")Long reservationId);
+	void autoDpdateSignfor(@Param("reservationId")Long reservationId,@Param("user") BladeUser user);
 
 	/**
 	 * 查询签收数量

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -109,6 +109,10 @@
         UPDATE logpm_distribution_signfor AS lds
         SET lds.loaded_number = ( SELECT IFNULL( sum( loaded_nub ), 0 ) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 ),
         lds.loadedin_number = ( SELECT IFNULL( sum( package_nub ), 0 ) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 ),
+        <if test="user!=null">
+            lds.signee_name=#{user.nickName},
+            lds.signee_id=#{user.userId},
+        </if>
         lds.received_quantity = (
         SELECT
         IFNULL( sum( received_quantity ), 0 )

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

@@ -376,33 +376,45 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	private void checkReservationAndDeliveryLoadingStatus(Long deliveryId, Long reservationId) {
 		//判断客户是否完成装车
 		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
+		if(Func.isEmpty(distributionReservationEntity)){
+			log.error("##########查询客户配送对象为null");
+			return ;
+		}
+		DistributionReservationEntity updateReservation  =new DistributionReservationEntity();
+		updateReservation.setId(distributionReservationEntity.getId());
+
 		int reservationPackageTotal = distributionReservationEntity.getReservationNum() + distributionReservationEntity.getReservationStockListNum();
 		if (reservationPackageTotal != 0) {
 			DistributionLoadingNumDTO reservationLoadingNum = distributionReservationMapper.selectReservationLoadingNum(distributionReservationEntity.getId());
 			if (Func.isNotEmpty(reservationLoadingNum)) {
 				int reservationLoadingQuantity = reservationLoadingNum.getPackageLoadingQuantity() + reservationLoadingNum.getInventoryLoadingQuantity();
 				if (reservationLoadingQuantity == reservationPackageTotal) {
-					distributionReservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
+					updateReservation.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
 				} else {
-					distributionReservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
+					updateReservation.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
 				}
-				distributionReservationMapper.updateById(distributionReservationEntity);
+				distributionReservationMapper.updateById(updateReservation);
 			}
 		} else {
 			log.error("##########查询客户配送数量为0");
 		}
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(deliveryId);
+		if(distributionDeliveryListEntity==null){
+			return ;
+		}
+		DistributionDeliveryListEntity update = new DistributionDeliveryListEntity();
+		update.setId(distributionDeliveryListEntity.getId());
 		int deliveryPackageTotal = distributionDeliveryListEntity.getDeliveryNumber();
 		if (deliveryPackageTotal != 0) {
 			DistributionLoadingNumDTO deliveryLoadingNum = distributionDeliveryListMapper.selectDeliveryLoadingNum(distributionDeliveryListEntity.getId());
 			if (Func.isNotEmpty(deliveryLoadingNum)) {
 				int deliveryLoadingQuantity = deliveryLoadingNum.getPackageLoadingQuantity() + deliveryLoadingNum.getInventoryLoadingQuantity();
 				if (deliveryPackageTotal == deliveryLoadingQuantity) {
-					distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
+					update.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
 				} else {
-					distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
+					update.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
 				}
-				distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
+				distributionDeliveryListMapper.updateById(update);
 			}
 		} else {
 			log.error("##########查询客户配送数量为0");
@@ -764,6 +776,12 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			return;
 		}
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelNumberEntity.getStockArticleId());
+		if(Func.isEmpty(stockArticleEntity)){
+			log.error("#################stockArticleEntity参数错误:{}", stockArticleEntity);
+			return ;
+		}
+		DistributionStockArticleEntity updateById =  new DistributionStockArticleEntity();
+		updateById.setId(stockArticleEntity.getId());
 		if (Func.equals(stockArticleEntity.getIsZero(), IsOrNoConstant.no.getValue())) {
 			log.error("#################查询订单异常,订单ID为:{}", parcelNumberEntity.getStockArticleId());
 			return;
@@ -776,12 +794,14 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		}
 		parcelNumberEntities.forEach(p -> {
 			DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p.getParcelListId());
+			DistributionParcelListEntity update = new DistributionParcelListEntity();
+			update.setId(parcelListEntity.getId());
 			if (Objects.equals(p.getOutboundQuantity(), p.getQuantity())) {
-				parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+				update.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 			} else {
-				parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue());
+				update.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue());
 			}
-			distributionParcelListService.updateById(parcelListEntity);
+			distributionParcelListService.updateById(update);
 		});
 		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 			.eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId()));
@@ -791,14 +811,14 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		}
 		int outboundQuantity = parcelNumberEntities.stream().mapToInt(DistributionParcelNumberEntity::getOutboundQuantity).sum();
 		if (outboundQuantity > 0 && outboundQuantity < stockArticleEntity.getTotalNumber()) {
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
-			stockArticleEntity.setDeliveryQuantity( outboundQuantity);
+			updateById.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
+			updateById.setDeliveryQuantity( outboundQuantity);
 		}
 		if (stockArticleEntity.getTotalNumber() == outboundQuantity) {
-			stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
-			stockArticleEntity.setDeliveryQuantity(outboundQuantity);
+			updateById.setOrderStatus(OrderStatusConstant.chuku.getValue());
+			updateById.setDeliveryQuantity(outboundQuantity);
 		}
-		distributionStockArticleService.updateById(stockArticleEntity);
+		distributionStockArticleService.updateById(updateById);
 		//维护预约客户和配送任务装车状态
 		checkReservationAndDeliveryLoadingStatus(deliveryId, reservationId);
 	}

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

@@ -8985,7 +8985,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//更新装车时间
 				distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 				//更新签收表的装车数量
-				distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+//				distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 				//进行解托操作
 				Map<String, Object> info = new HashMap<>();
 				info.put("orderPackageCode", parcelListEntity.getOrderPackageCode());
@@ -8995,7 +8995,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				}
 				//检查是否存在有装车异常,进行处理
 //				distributionSignforService.maintenanceSignfor(reservationId);
-				distributionSignforMapper.autoDpdateSignfor(reservationId);
+				distributionSignforMapper.autoDpdateSignfor(reservationId,null);
 				String content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 				JSONObject packageLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
 				packageLogs.add(packageLog);
@@ -9156,7 +9156,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								//更新装车时间
 								distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 								//更新签收表的装车数量
-								distributionSignforMapper.updateloadByReservationId(distrilbutionloadingscanDTO.getDeliveryId(), distrilbutionloadingscanDTO.getReservationId(), parcelListDTO.getLoadingNum());
+//								distributionSignforMapper.updateloadByReservationId(distrilbutionloadingscanDTO.getDeliveryId(), distrilbutionloadingscanDTO.getReservationId(), parcelListDTO.getLoadingNum());
 							}
 						} else {
 							log.error("#######################查询预约零担品类信息错误,reservationID:{}", distrilbutionloadingscanDTO.getReservationId());
@@ -9165,7 +9165,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						log.error("#######################查询预约订单信息错误,reservationID:{}", distrilbutionloadingscanDTO.getReservationId());
 					}
 //					distributionSignforService.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId());
-					distributionSignforMapper.autoDpdateSignfor(distrilbutionloadingscanDTO.getReservationId());
+					distributionSignforMapper.autoDpdateSignfor(distrilbutionloadingscanDTO.getReservationId(),null);
 
 				}
 				break;
@@ -10150,10 +10150,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		Integer j = distributionSignforMapper.updateloadByReservationId(zeroLoadscanEntity.getDeliveryId(), zeroLoadscanEntity.getReservationId(), zeroLoadscanEntity.getPackageNub());
 		//维护零担品类的数量
 		DistributionParcelNumberEntity parcelNumberEntity = zeroPackageMap.get(parcelNumberDTO.getParcelListId());
-		parcelNumberEntity.setOutboundQuantity(parcelNumberEntity.getOutboundQuantity() + parcelNumberDTO.getLoadingNum());
-		parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - parcelNumberDTO.getLoadingNum());
-		parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() - parcelNumberDTO.getLoadingNum());
-		distributionParcelNumberService.updateById(parcelNumberEntity);
+
+		DistributionParcelNumberEntity update = new DistributionParcelNumberEntity();
+		update.setId(parcelNumberEntity.getId());
+
+		update.setOutboundQuantity(parcelNumberEntity.getOutboundQuantity() + parcelNumberDTO.getLoadingNum());
+		update.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - parcelNumberDTO.getLoadingNum());
+		update.setHandQuantity(parcelNumberEntity.getHandQuantity() - parcelNumberDTO.getLoadingNum());
+		distributionParcelNumberService.updateById(update);
 		distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity, zeroLoadscanEntity.getDeliveryId(), zeroLoadscanEntity.getReservationId());
 	}
 

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

@@ -3919,6 +3919,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			if (signingNum == 0) {
 				updateEntity.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
 			}
+			if(signingNum.equals(reservationEntity.getReservationNum())){
+				updateEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
+
+			}
 
 			if (stockUpStatus) {
 				updateEntity.setStockStatus(ReservationStockupStatusConstant.yibeihuo.getValue());

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

@@ -1182,6 +1182,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionSignforEntity signforEntity = this.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
 			.eq(DistributionSignforEntity::getReservationId, reservationId)
 		);
+
+		DistributionSignforEntity update = new DistributionSignforEntity();
+		update.setId(signforEntity.getId());
+
 		if (Func.isEmpty(signforEntity)) {
 			log.error("维护签收异常是否存在异常包件失败");
 			return;
@@ -1193,9 +1197,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//查看当前客户是否都已经完成审核
 			boolean flag = loadscanAbnormalEntityList.stream().allMatch(p -> p.getAuditingStatus().equals(LoadingAbnormalAuditingStatusConstant.yishenhe.getValue()));
 			if (flag) {
-				signforEntity.setIsHaveAbnormalPackage(1);
+				update.setIsHaveAbnormalPackage(1);
 			} else {
-				signforEntity.setIsHaveAbnormalPackage(2);
+				update.setIsHaveAbnormalPackage(2);
 			}
 		}
 		//统计客户装车数
@@ -1208,8 +1212,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())
 				.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
 			.intValue();
-		signforEntity.setLoadedNumber(lad);
-		signforEntity.setLoadedinNumber(nad);
+		update.setLoadedNumber(lad);
+		update.setLoadedinNumber(nad);
 		//统计客户签收数
 		Integer lsad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda()
 			.eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId())
@@ -1219,9 +1223,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())
 			.eq(DistributionLoadscaninvnEntity::getSignforState, LoadScanSigningStatusConstant.yiqianshou.getValue())
 			.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())).intValue();
-		signforEntity.setReceivedQuantity(lsad);
-		signforEntity.setReceivedinQuantity(nsad);
-		this.updateById(signforEntity);
+		update.setReceivedQuantity(lsad);
+		update.setReceivedinQuantity(nsad);
+		this.updateById(update);
 	}
 
 	@Override
@@ -3005,9 +3009,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//更新签收人
 					Integer m = distributionSignforMapper.updateSignUser(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), AuthUtil.getUser());
 					//下架解托
-					if (StringUtils.isNotBlank(loadscanEntity.getOrderPackageCode())) {
-						warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
-					}
+//					if (StringUtils.isNotBlank(loadscanEntity.getOrderPackageCode())) {
+//						warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
+//					}
 					//维护订单状态
 					String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "扫描签收,装车方式:扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + distributionReservationEntity.getReservationCode();
 					JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
@@ -3535,7 +3539,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						packageLockIds.add(distributionLoadscanEntity.getPackageId());
 						pushDatas.add(distributionLoadscanEntity);
 						//更新签收人
-						Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
+//						Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
 						if (StringUtils.isNotBlank(distributionLoadscanEntity.getOrderPackageCode())) {
 							//下架解托
 							warehouseUpdownTypeClient.downPackageOrDelTray(distributionLoadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
@@ -3614,7 +3618,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						jsonObject.put("num", 1);
 						jsonObject.put("remark", "文员签收下架");
 						jsonObjects.add(jsonObject);
-						Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
+//						Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
 						//包件解托下架
 						content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "后台签收,装车方式:补录装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + distributionReservationEntity.getReservationCode();
 						try {
@@ -3634,7 +3638,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					sendNodeWorkDataBroadcast(parcelListEntity, distributionReservationEntity, distributionLoadscanEntity.getSigningTime(), myCurrentWarehouse);
 					//收集包件
 					orderpackages.add(updatePackage.getOrderPackageCode());
-					distributionSignforMapper.autoDpdateSignfor(distributionReservationEntity.getId());
+
 				} else {
 					//一个客户下出现重复包条码
 					log.error("############出现重复包条码：{}", collect);
@@ -3664,9 +3668,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
 			//维护配送任务
 			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
-			//维护签收异常状态
-			this.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId());
-
+//			//维护签收异常状态
+//			this.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId());
+			distributionSignforMapper.autoDpdateSignfor(distributionReservationEntity.getId(),AuthUtil.getUser());
 			// 推送作业节点
 
 			// 作业节点数据推送
@@ -3676,7 +3680,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 			return R.data(orderpackages, "签收成功");
 		} catch (Exception e) {
-			e.printStackTrace();
 			LogError logError = new LogError();
 			logError.setMessage(e.getMessage());
 			logClient.saveErrorLog(logError);
@@ -4110,7 +4113,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					}
 				}
 
-				distributionSignforMapper.autoDpdateSignfor(signforEntity.getReservationId());
+				distributionSignforMapper.autoDpdateSignfor(signforEntity.getReservationId(),user);
 				// 作业节点数据推送
 				NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN, signforTime);
 
@@ -6123,10 +6126,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//更新装车时间
 		Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 		//更新装车人
-		Integer m = distributionSignforMapper.updateSignUser(distributionDeliveryListEntity.getId(), distributionSignfor.getReservationId(), AuthUtil.getUser());
+//		Integer m = distributionSignforMapper.updateSignUser(distributionDeliveryListEntity.getId(), distributionSignfor.getReservationId(), AuthUtil.getUser());
 		//维护配送任务状态
 		distributionDeliveryListService.maintenanceDeliveryInfo(distributionDeliveryListEntity.getId());
-		distributionSignforMapper.autoDpdateSignfor(distributionSignforEntity.getReservationId());
+		distributionSignforMapper.autoDpdateSignfor(distributionSignforEntity.getReservationId(),user);
 		//批量维护订单信息
 		if (Func.isNotEmpty(orderCodes)) {
 			String orderCode = orderCodes.stream().distinct().collect(Collectors.joining(","));
@@ -8080,6 +8083,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		BladeUser user = AuthUtil.getUser();
 		List<Long> packageLockIds = new ArrayList<>();
 		List<String> orderCodes = new ArrayList<>();
+		// 签收下架的包条码
+		List<String> orderPackageCodesByUnTray = new ArrayList<>();
 		List<DistributionLoadscanEntity> pushList = new ArrayList<>();
 		List<DistributionLoadscaninvnEntity> pushInventoryList = new ArrayList<>();
 		//配置项
@@ -8087,10 +8092,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Objects.isNull(distributionDeliverySelfEntity)){
 			return Resp.scanFail("查询司机信息错误!!!", "查询司机信息错误!!!");
 		}
-		if (Objects.isNull(distributionDeliverySelfEntity)) {
-			return Resp.scanFail("当前操作人无此包件签收权限!!!", "当前操作人无此包件签收权限!!!");
-		}
-		switch (type) {
+        switch (type) {
 			case 1:
 				if (Func.isEmpty(distrilbutionloadingscanDTO.getBarcode())) {
 					log.error(method + "Barcode参数缺失");
@@ -8152,7 +8154,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity = updateSignDistributionLoadscanEntity(loadscanEntity, user, parcelListEntity);
 
 						distributionLoadscanService.updateById(distributionLoadscanEntity);
-						updataSignforeExtracted(distributionLoadscanEntity.getDeliveryId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub(), user);
+//						updataSignforeExtracted(distributionLoadscanEntity.getDeliveryId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub(), user);
 
 
 						//维护订单状态
@@ -8177,7 +8179,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //						//更新签收人
 //						distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
 
-						updataSignforeExtracted(distributionLoadscanEntity.getDeliveryId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub(), user);
+//						updataSignforeExtracted(distributionLoadscanEntity.getDeliveryId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub(), user);
 
 						String content = "包件在" + myCurrentWarehouse.getName() + "由" + distributionLoadscanEntity.getSigningUser() + "扫描签收,装车方式:补录装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
@@ -8190,10 +8192,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					log.info("------------------orderPackageCodes={}",orderPackageCodes);
 					log.info("------------------warehouseId={}",warehouseId);
 					log.info("------------------remark={}",remark);
-					warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes, warehouseId, remark);
+					orderPackageCodesByUnTray.add(orderPackageCodes);
+					// 该方法已移动到外部进行执行
+//					warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes, warehouseId, remark);
                     pushList.add(distributionLoadscanEntity);
 					packageLockIds.add(parcelListEntity.getId());
 
+
 					DistributionParcelListEntity updateE= new DistributionParcelListEntity();
 					updateE.setId(parcelListEntity.getId());
 					updateE.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
@@ -8397,7 +8402,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								deliveryQuantity = deliveryQuantity - loadscanEntity.getLoadedNub();
 								distributionLoadscanService.save(loadscanEntity);
 								//维护签收数量
-								distributionSignforMapper.updateSignforNum(deliveryId, reservationId, loadscanEntity.getReceivedQuantity());
+//								distributionSignforMapper.updateSignforNum(deliveryId, reservationId, loadscanEntity.getReceivedQuantity());
 								pushList.add(loadscanEntity);
 								JSONObject jsonObject = new JSONObject();
 								jsonObject.put("code", zeroParcelListEntity.getOrderCode());
@@ -8475,7 +8480,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //							distributionSignforMapper.updatesignforByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
 //							distributionSignforMapper.updateSignUser(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), user);
 
-							updataSignforeExtracted(loadscaninvnEntity.getDeliveryId(),loadscaninvnEntity.getReservationId(),loadscaninvnEntity.getPackageNub(),user);
+//							updataSignforeExtracted(loadscaninvnEntity.getDeliveryId(),loadscaninvnEntity.getReservationId(),loadscaninvnEntity.getPackageNub(),user);
 
 						} else {
 							//存在配置要求必须装车才能进行签收
@@ -8528,9 +8533,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
 							pushInventoryList.add(distributionLoadscaninvnEntity);
 							//更新装车数量
-							Integer j = distributionSignforMapper.updateLoadAndsignforByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub());
+//							Integer j = distributionSignforMapper.updateLoadAndsignforByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub());
 							//更新签收人
-							Integer i = distributionSignforMapper.updateSignUser(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), AuthUtil.getUser());
+//							Integer i = distributionSignforMapper.updateSignUser(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), AuthUtil.getUser());
 							//扣减库存
 							distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(), distributionLoadscaninvnEntity.getLoadedNub());
 							packageLockIds.add(distributionLoadscaninvnEntity.getInventoryPackageId());
@@ -8557,7 +8562,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (!packageLockIds.isEmpty()) {
 			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryListEntity.getTrainNumber() + ":orderPackageCode:" + packageLockIds);
 			if (Func.isNotEmpty(a)) {
-				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
+				boolean flag = a.stream().anyMatch(packageLockIds::contains);
 				if (flag) {
 					//正在操作，请稍后重试
 					throw new CustomerException("该包件正在被操作,请稍后再试!!!");
@@ -8584,11 +8589,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			String collect = orderCodes.stream().distinct().collect(Collectors.joining(","));
 			distributionStockArticleService.maintenanceOrderInfo(collect, myCurrentWarehouse.getId());
 		}
-		distributionSignforMapper.autoDpdateSignfor(distrilbutionloadingscanDTO.getReservationId());
+		distributionSignforMapper.autoDpdateSignfor(distrilbutionloadingscanDTO.getReservationId(),user);
 
 //		String str = checkSignNum(distrilbutionloadingscanDTO);
 		Integer integer = distributionSignforMapper.signforNum(distrilbutionloadingscanDTO.getReservationId());
-		return Resp.scanSuccess(integer + "件", integer + "件");
+
+
+		return Resp.scanSuccessWithData(integer + "件", integer + "件",orderPackageCodesByUnTray);
 	}
 
 	/**

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

@@ -2017,11 +2017,12 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		for (String s : split) {
 			//查询订单
 			DistributionStockArticleEntity stockArticleEntity = this.findStockArticleByOrderCodeAndWarehouseId(s, warehouseId);
-			DistributionStockArticleEntity t = new DistributionStockArticleEntity();
 			if (Func.isEmpty(stockArticleEntity)) {
 				log.error(method + "订单不存在orderCode:{}", s);
 				throw new CustomerException("订单不存在");
 			}
+			DistributionStockArticleEntity t = new DistributionStockArticleEntity();
+			t.setId(stockArticleEntity.getId());
 			if (IsOrNoConstant.no.getValue().equals(stockArticleEntity.getIsZero())) {
 				//查询包件列表
 				List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
@@ -2141,46 +2142,46 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					log.info("############维护零担数量TotalNumber:{}", stockArticleEntity.getTotalNumber());
 					if (stockArticleEntity.getTotalNumber() == loadingQuantity) {
 						//此时的出库和总数一致，该零担此时全部进行出库
-						stockArticleEntity.setOrderStatus(OrderStatusConstant.chuku.getValue());
+						t.setOrderStatus(OrderStatusConstant.chuku.getValue());
 					} else if (stockArticleEntity.getTotalNumber() > loadingQuantity) {
-						stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
+						t.setOrderStatus(OrderStatusConstant.bufenchuku.getValue());
 					} else {
-						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
+						t.setOrderStatus(OrderStatusConstant.ruku.getValue());
 					}
 					if ((loadingQuantity + deliveryQuantity) == 0) {
 						if (stockArticleEntity.getTotalNumber() == inWarehouseQuantity) {
-							stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
-							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
+							t.setOrderStatus(OrderStatusConstant.ruku.getValue());
+							t.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
 						} else if (inWarehouseQuantity > 0) {
-							stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
+							t.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
 						}
 					} else {
 						if ((loadingQuantity + deliveryQuantity) == stockArticleEntity.getTotalNumber()) {
 							//无在库数量则无法进行预约
-							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+							t.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 						} else if ((loadingQuantity + deliveryQuantity) > 0) {
-							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+							t.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 						}
 					}
 					if (signingQuantity == 0) {
-						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
+						t.setOrderStatus(OrderStatusConstant.ruku.getValue());
 					} else {
 						if (stockArticleEntity.getTotalNumber() == signingQuantity) {
-							stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
+							t.setOrderStatus(OrderStatusConstant.qianshou.getValue());
 						} else if (stockArticleEntity.getTotalNumber() > signingQuantity) {
-							stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
+							t.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
 						}
 					}
 
 					//维护订单的在库件数
-					stockArticleEntity.setHandQuantity(inWarehouseQuantity);
+					t.setHandQuantity(inWarehouseQuantity);
 					//维护订单的配送件数
-					stockArticleEntity.setDeliveryQuantity(loadingQuantity);
-					stockArticleEntity.setSigninQuantity(signingQuantity);
+					t.setDeliveryQuantity(loadingQuantity);
+					t.setSigninQuantity(signingQuantity);
 					if (inWarehouseQuantity > 0) {
-						stockArticleEntity.setGenre(1);
+						t.setGenre(1);
 					}
-					this.updateById(stockArticleEntity);
+					this.updateById(t);
 				}
 
 			}

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

@@ -5633,22 +5633,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistributionStockEntity::getStockupId, stockupId)
 			.eq(DistributionStockEntity::getCancelStatus, Integer.parseInt(IsOrNoConstant.no.getValue()))
 		);
-		if (!packageEntityList.stream().allMatch(a-> Objects.isNull(a))) {
+		if (!packageEntityList.stream().allMatch(Objects::isNull)) {
 			//订制品
-			if (!packageEntityList.isEmpty() && packageEntityList.size() > 0) {
-				packageFlag = packageEntityList.stream().allMatch(a->OrderPackageStockupStatusConstant.yibeihu.getValue().equals(a.getOrderPackageStockupStatus()));
-			}else {
-				packageFlag = true;
-			}
-		}
+            packageFlag = packageEntityList.stream().allMatch(a -> OrderPackageStockupStatusConstant.yibeihu.getValue().equals(a.getOrderPackageStockupStatus()));
+        }
 		//库存品
-		if (!inventoryList.isEmpty() && inventoryList.size() > 0) {
+		if (!inventoryList.isEmpty()) {
 			inventoryFlag = inventoryList.stream().allMatch(b -> InventoryStockUpStatusConstant.yibeihuo.getValue().equals(b.getStockStatus()));
 		}else {
 			inventoryFlag = true;
 		}
 		//零担
-		if (!zeroEntityList.isEmpty() && zeroEntityList.size() > 0) {
+		if (!zeroEntityList.isEmpty()) {
 			//零担核对备货数量是否完成
 			int planNum = zeroEntityList.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 			List<Long> orderId = zeroEntityList.stream().map(DistributionReservationZeroPackageEntity::getStockArticleId).distinct().collect(Collectors.toList());

blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java

@@ -38,7 +38,7 @@ public class LargeScreenQueryXxlJob {
 	/**
 	 * 数据查询
 	 */
-	@XxlJob("largeScreenexExcute")
+//	@XxlJob("largeScreenexExcute")
 	public ReturnT<String> largeScreenexExcute(String param) {
 		XxlJobQueryVO xxlJobQueryVO = new XxlJobQueryVO();
 		xxlJobQueryVO.setMapWarehouse(mapWarehouseService.list());

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BillingDataServiceImpl.java

@@ -34,7 +34,7 @@ public class BillingDataServiceImpl implements IBillingDataService {
 	@Override
 	public BillingDataVO getBillingData() {
 
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
@@ -43,7 +43,7 @@ public class BillingDataServiceImpl implements IBillingDataService {
 
 	@Override
 	public List<WarehouseBillingDataVO> getWarehouseBillingData() {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
@@ -58,7 +58,7 @@ public class BillingDataServiceImpl implements IBillingDataService {
 
 	@Override
 	public List<MonthBillingDataVO> getMonthBillingData() {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new ArrayList<>();

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BinLocationServiceImpl.java

@@ -21,7 +21,7 @@ public class BinLocationServiceImpl implements IBinLocationService {
 
 	public BinLocationDataVO getBinLocationData() {
 
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new BinLocationDataVO();

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BusinessRationServiceImpl.java

@@ -24,7 +24,7 @@ public class BusinessRationServiceImpl implements IBusinessRationService {
 
 	@Override
 	public BusinessRatioDataVO getBusinessRatioData() {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 		if (largeScreenDataEntity == null) {
 			return new BusinessRatioDataVO();
 		}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/CarsLoadDataServiceImpl.java

@@ -34,7 +34,7 @@ public class CarsLoadDataServiceImpl implements ICarsLoadDataService {
 
 	@Override
 	public List<CareerLineDataVO> getCareerLineData(Integer isDelivery) {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new ArrayList<>();

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/DeliveryDataServiceImpl.java

@@ -24,7 +24,7 @@ public class DeliveryDataServiceImpl implements IDeliveryDataService {
 
 	@Override
 	public DeliveryDataVO getDeliveryAllData(Integer isYear) {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new DeliveryDataVO();

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/MapWarehouseServiceImpl.java

@@ -31,7 +31,7 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService {
 
 	@Override
 	public List<MapWarehouseVO> list() {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new ArrayList<>();

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/NodeDataServiceImpl.java

@@ -21,7 +21,7 @@ public class NodeDataServiceImpl implements INodeDataService {
 	@Override
 	public NodeDataVO getNodeData() {
 
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new NodeDataVO();

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/TrunkDataServiceImpl.java

@@ -25,7 +25,7 @@ public class TrunkDataServiceImpl implements ITrunkDataService {
 
 	@Override
 	public TrunkDataVO getTrunkData() {
-		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
+		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime).last("LIMIT 1"));
 
 		if (largeScreenDataEntity == null) {
 			return new TrunkDataVO();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java

@@ -289,9 +289,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				trunklineCostShareRecordEntity.setLoadingWarehouseId(warehouseId);
 				trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
 				trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
-				BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
-				if (!Objects.isNull(finalWarehouse)) {
-					trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+				if(Objects.isNull(finalNodeId)){
+					BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
+					if (!Objects.isNull(finalWarehouse)) {
+						trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+					}
 				}
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(unloadNodeName);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -884,42 +884,48 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						}
 					} else {
 						Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
-						BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
-						if (!Objects.isNull(basicdataClientEntity)) {
-							String clientType = basicdataClientEntity.getClientType();
-							if ("5".equals(clientType)) {
-								stockArticleEntity.setStoreId(basicdataClientEntity.getId());
-								stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
-								stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
-								//查询门店的父级商场
-								Long pid = basicdataClientEntity.getPid();
-								BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
-								if (!Objects.isNull(pidEntity)) {
-									String pidEntityClientType = pidEntity.getClientType();
-									if ("2".equals(pidEntityClientType)) {
-										//商城
-										stockArticleEntity.setMallId(pidEntity.getId());
-										stockArticleEntity.setMallName(pidEntity.getClientName());
-										stockArticleEntity.setMallCode(pidEntity.getClientCode());
-
-										BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
-										if (!Objects.isNull(basicdataStoreBusinessEntity)) {
-											stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+						if(!Objects.isNull(clientId)){
+							BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+							if (!Objects.isNull(basicdataClientEntity)) {
+								String clientType = basicdataClientEntity.getClientType();
+								if ("5".equals(clientType)) {
+									stockArticleEntity.setStoreId(basicdataClientEntity.getId());
+									stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
+									stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
+									//查询门店的父级商场
+									Long pid = basicdataClientEntity.getPid();
+									if(!Objects.isNull(pid)){
+										BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
+										if (!Objects.isNull(pidEntity)) {
+											String pidEntityClientType = pidEntity.getClientType();
+											if ("2".equals(pidEntityClientType)) {
+												//商城
+												stockArticleEntity.setMallId(pidEntity.getId());
+												stockArticleEntity.setMallName(pidEntity.getClientName());
+												stockArticleEntity.setMallCode(pidEntity.getClientCode());
+
+												BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
+												if (!Objects.isNull(basicdataStoreBusinessEntity)) {
+													stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+												}
+											}
 										}
 									}
-								}
-							} else if ("2".equals(clientType)) {
-								//商城
-								stockArticleEntity.setMallId(basicdataClientEntity.getId());
-								stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-								stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
 
-								BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
-								if (!Objects.isNull(basicdataStoreBusinessEntity)) {
-									stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+								} else if ("2".equals(clientType)) {
+									//商城
+									stockArticleEntity.setMallId(basicdataClientEntity.getId());
+									stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+									stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+
+									BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
+									if (!Objects.isNull(basicdataStoreBusinessEntity)) {
+										stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+									}
 								}
 							}
 						}
+
 					}
 					stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
 					stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -671,6 +671,9 @@
         <if test="param.payStatus != null">
             and lww.pay_status = #{param.payStatus}
         </if>
+        <if test="param.signUserName != null">
+            and lww.sign_user_name = #{param.signUserName}
+        </if>
         <if test="param.settlementStatus != null">
             and lww.settlement_status = #{param.settlementStatus}
         </if>