装车代码

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

@@ -8001,12 +8001,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						.eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode())
 						.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 					);
-					if (list.isEmpty()) {
+					if (!list.isEmpty()) {
 						return Resp.scanFail("请在库存品页面扫描此码", "请在库存品页面扫描此码");
 					}else {
 						return Resp.scanFail("系统无编码", "系统无编码");
 					}
-
+				}
 				if (OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(parcelListEntity.getOrderPackageLoadingStatus())) {
 					return Resp.scanFail("此包件已装车", "此包件已装车");
 				}
@@ -8066,7 +8066,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				jsonObject.put("remark", "装车下架");
 				jsonObjects.add(jsonObject);
 				pushList.add(parcelListEntity);
-				}
 				break;
 			case 2:
 				if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
@@ -8198,7 +8197,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				}
 				String inventoryPackageCode = distrilbutionloadingscanDTO.getBarcode();
 				//查询库存品
-				Long reservationId = baseMapper.selectInventoryPackageByDeliveryIdAndInventoryPackageCode(deliveryId,inventoryPackageCode);
+				 reservationId = baseMapper.selectInventoryPackageByDeliveryIdAndInventoryPackageCode(deliveryId,inventoryPackageCode);
 				if (Objects.nonNull(reservationId)){
 					 parcelListEntity = distributionParcelListMapper.selectByOrderPackageCode(inventoryPackageCode, myCurrentWarehouse.getId());
 					if (!Objects.isNull(parcelListEntity)) {