修复备货包条状态错误

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

@@ -6160,7 +6160,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (!packageLockIds.isEmpty()) {
 			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":orderPackageCode:");
 			if (Func.isNotEmpty(a)) {
-				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
+                assert a != null;
+                boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag) {
 					//正在操作，请稍后重试
 					throw new CustomerException("该包件正在被操作,请稍后再试!!!");

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

@@ -6698,7 +6698,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		BladeUser user = AuthUtil.getUser();
 		DistributionStockEntity stockEntity = generateDeliveryPackageStockEntity(reservationEntity, parcelListEntity, warehouseId, warehouseName, user, stockupDTO.getStockupId());
 
-		DistributionReservationPackageEntity distributionReservationPackageEntity = packageEntityList.get(0);
 		if (parcelListEntity.getOrderPackageGroundingStatus().equals(OrderPackageGroundingStatusConstant.yishangjia.getValue())) {
 			//进行下架处理
 			WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
@@ -6736,7 +6735,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		//修改包件备货状态
 		parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
-		distributionParcelListService.updateById(parcelListEntity);
+
+		DistributionParcelListEntity update = new DistributionParcelListEntity();
+		update.setId(parcelListEntity.getId());
+		update.setOrderPackageStockupStatus(parcelListEntity.getOrderPackageStockupStatus());
+		distributionParcelListService.updateById(update);
 		trunklinePackageTrackLogClient.addPackageTrackLog(packageLogList);
 		// 备货作业节点
 		NodeFanoutMsg<StockUpVO> nodeFanoutMsg = buildStockUpNodeData(stockupEntity, stockEntity, parcelListEntity);