diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index 8310af7b6..1c92c0d2d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -1461,15 +1461,15 @@ public class DistributionStockupAppController extends BladeController {
 						String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue());
 
 						//进行备货库位上架
-						if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
-							JSONObject jsonObject = new JSONObject();
-							jsonObject.put("warehouseId", myCurrentWarehouse.getId());
-							jsonObject.put("code",packetBarCode);
-							jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
-							jsonObject.put("type", 2);
-							jsonObject.put("num", 1);
-							warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
-						}
+//						if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
+//							JSONObject jsonObject = new JSONObject();
+//							jsonObject.put("warehouseId", myCurrentWarehouse.getId());
+//							jsonObject.put("code",packetBarCode);
+//							jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+//							jsonObject.put("type", 2);
+//							jsonObject.put("num", 1);
+//							warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+//						}
 
 						//扫码成功
 						return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);
@@ -1591,12 +1591,6 @@ public class DistributionStockupAppController extends BladeController {
 					entity.setBillLadingId(reservationId);
 					DistributionStockupEntity byId = distributionStockupService.getById(stockupId);
 					entity.setStockupArea(byId.getStockupArea());
-
-					//修改包件备货状态
-//					one.setOrderPackageStockupStatus(StockupStatusConstant.yibeihuo.getValue());
-					//todo 待下架操作
-//						warehouseUpdownTypeClient.downPackage(stockupDTO.getPacketBarCode());
-//					distributionParcelListService.updateById(one);
 				} else {
 					entity.setReservationId(reservationId);
 				}
@@ -1656,16 +1650,16 @@ public class DistributionStockupAppController extends BladeController {
 				});
 				//查询是否货位数据是否该下架
 
-					if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
-						JSONObject jsonObject = new JSONObject();
-						jsonObject.put("warehouseId", myCurrentWarehouse.getId());
-						jsonObject.put("code",packetBarCode);
-						jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
-						jsonObject.put("type", 1);
-						jsonObject.put("num", 1);
-						//进行了备货库位的选择才进行备货库位的上架
-						warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
-					}
+//					if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
+//						JSONObject jsonObject = new JSONObject();
+//						jsonObject.put("warehouseId", myCurrentWarehouse.getId());
+//						jsonObject.put("code",packetBarCode);
+//						jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+//						jsonObject.put("type", 1);
+//						jsonObject.put("num", 1);
+//						//进行了备货库位的选择才进行备货库位的上架
+//						warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+//					}
 					//修改包件备货状态
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 				parcelListEntity.setId(entity.getParcelListId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java
index 4c9d87751..47659be92 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java
@@ -13,7 +13,7 @@ public class StockupDTO implements Serializable {
 	private String stockupDateEnd;//备货日期
 
 	private Integer status;//0未完成  1已完成
-	private Long stockupAllocationId;//0未完成  1已完成
+//	private Long stockupAllocationId;//0未完成  1已完成
 	private String stockupAllocationName;//0未完成  1已完成
 
 	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java
index cc4dbfc37..836306525 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java
@@ -22,7 +22,7 @@ public class StockupZeroDTO implements Serializable {
 	private String typeService;//备货类型 3 自提
 	private Long reservationId;//预约单id
 	private Integer num;//预约单id
-	private Long stockupAllocationId;//备货库位Id
+//	private Long stockupAllocationId;//备货库位Id
 	private String stockupAllocationName;//备货库位Id
 
 }
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 8cd285367..bb1a3a515 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
@@ -1997,14 +1997,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 				distributionStockService.saveBatch(list1);
 				//备货库位上架
-				JSONObject jsonObject = new JSONObject();
-				jsonObject.put("warehouseId", myCurrentWarehouse.getId());
-				jsonObject.put("code", stockupDTO.getTrayBarCode());
-//				jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
-				jsonObject.put("type", 4);
-				jsonObject.put("num", list1.size());
-//				TODO
-				warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+//				if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
+//					JSONObject jsonObject = new JSONObject();
+//					jsonObject.put("warehouseId", myCurrentWarehouse.getId());
+//					jsonObject.put("code", stockupDTO.getTrayBarCode());
+//				    jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+//					jsonObject.put("type", 4);
+//					jsonObject.put("num", list1.size());
+//					warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+//				}
 			}
 			int i = list1.isEmpty() ? 0 : list1.size();
 			return Resp.scanSuccess("整托拣货" + i + "件", "整托拣货" + i + "件");
@@ -2526,10 +2527,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				return Resp.scanFail("请输入正确备货数量 !", "请输入正确备货数量 !");
 			}
 		}
-		if (ObjectUtils.isNull(stockupDTO.getStockupAllocationId())) {
-			log.error(method + "零担备货参数缺失AllocationId", stockupDTO);
-			return R.fail(3002, "请扫描备货库位!");
-		}
+//		if (ObjectUtils.isNull(stockupDTO.getStockupAllocationId())) {
+//			log.error(method + "零担备货参数缺失AllocationId", stockupDTO);
+//			return R.fail(3002, "请扫描备货库位!");
+//		}
 		//查询预约
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId());
 		if (Func.isEmpty(reservationEntity)) {
@@ -2623,7 +2624,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		stockEntity.setMarketId(stockArticleEntity.getMallId());
 		stockEntity.setReservationCode(reservationEntity.getReservationCode());
 		stockEntity.setStockupArea(stockupDTO.getStockupAllocationName());
-		stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
+//		stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 		if (Func.isNotEmpty(stockupDTO.getAllocationId())) {
 			log.info(method + "库位备货");
 			//查询库位零担
@@ -2692,16 +2693,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			log.info(method + "无库位无托盘备货");
 		}
 		distributionStockService.save(stockEntity);
-		if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
-			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("warehouseId", myCurrentWarehouse.getId());
-			jsonObject.put("code", stockArticleEntity.getOrderCode());
-			jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
-			jsonObject.put("type", 3);
-			jsonObject.put("num", stockupDTO.getNum());
-			//备货库位上架
-			warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
-		}
+//		if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
+//			JSONObject jsonObject = new JSONObject();
+//			jsonObject.put("warehouseId", myCurrentWarehouse.getId());
+//			jsonObject.put("code", stockArticleEntity.getOrderCode());
+//			jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+//			jsonObject.put("type", 3);
+//			jsonObject.put("num", stockupDTO.getNum());
+//			//备货库位上架
+//			warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+//		}
 		return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
 	}
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
index a64eb3e5f..e37b7acf9 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
@@ -350,18 +350,10 @@
     <select id="findListByExistsAndOrderPackageCodes" resultType="String">
         select ltad.order_package_code
         from logpm_trunkline_advance_detail ltad
-        where exists(
-        select 1 from (
-        <foreach collection="orderPackageCodeGroup" index="ind" item="item">
-            <if test="ind == 0">
-                select #{item} orderPackageCode
-            </if>
-            <if test="ind != 0">
-                union all
-                select #{item} orderPackageCode
-            </if>
+        where ltad.order_package_code in
+        <foreach collection="orderPackageCodeGroup" index="ind" item="item" open="(" separator="," close=")">
+            #{item}
         </foreach>
-        ) orderPackageCodes where orderPackageCodes.orderPackageCode = ltad.order_package_code)
     </select>