From 7c05a4f5aa02d768b6772cd58038c051d1d303ae Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 3 Jan 2025 16:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=89=AB=E6=8F=8FBUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockupServiceImpl.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 20e33983a..971d537d5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -5919,7 +5919,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		boolean b = this.judgeIsPickingStaff(AuthUtil.getUser());
 		if (!b) {
 			return Resp.scanFail("当前操作人无此操作权限","当前操作人无此操作权限");
-		}else {
+		} else {
 			if (!stockupEntity.getForkliftId().equals(AuthUtil.getUserId())){
 				return Resp.scanFail("与任务指派拣货员不一致","与任务指派拣货员不一致");
 			}
@@ -5992,7 +5992,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		}
 
-		return R.fail("取消成功"+sum+"件");
+		return Resp.scanSuccess("取消成功"+sum+"件","取消成功"+sum+"件");
 	}
 
 	private List<DistributionAppStockUpZeroOrderDetailVO> handleStockupBillZeroOrder(DistrilbutionBillLadingEntity billLadingEntity) {
@@ -6553,6 +6553,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistrilbutionBillPackageEntity::getPacketBarCode, packetBarCode)
 			.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
 		);
+		if(packageEntityList.isEmpty()){
+			return Resp.scanFail("不在此备货计划中","不在此备货计划中");
+		}
 		if (packageEntityList.size() > 1) {
 			return Resp.scanFail("当前包件计划重复", "当前包件计划重复");
 		}
@@ -6653,8 +6656,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistributionReservationPackageEntity::getPacketBarCode, packetBarCode)
 			.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
 		);
-		if (!packageEntityList.isEmpty()) {
-			return Resp.scanFail("无此备货计划","无此备货计划");
+		if (packageEntityList.isEmpty()) {
+			return Resp.scanFail("不在此备货计划中","不在此备货计划中");
 		}
 		if (packageEntityList.size() > 1) {
 			return Resp.scanFail("当前包件计划重复", "当前包件计划重复");