diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
index 3098be8d6..433eedf55 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
@@ -89,4 +89,11 @@ public interface IDistributionParcelListClient {
 	Integer SumEntityByOrderId(@RequestParam Long orderId,@RequestParam Long warehouseId);
 
 
+	/**
+	 * 查询订单下所有包件信息
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/getParcelListByStockArticleId")
+	List<DistributionParcelListEntity> getParcelListByStockArticleId(@RequestParam Long id);
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
index 0fb1e4da7..1e031bb57 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
@@ -98,7 +98,7 @@ public interface IDistributionStockArticleClient {
 	DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Long warehouseId);
 
 
-	@GetMapping(API_PREFIX + "/findStockArticleByCodeAndMarket")
-	DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(@RequestParam String orderCode,@RequestParam List<String> marketNames,@RequestParam Long warehosueId);
+	@GetMapping(API_PREFIX + "/findStockArticleByCodeAndMarketAndWarehouseId")
+	List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(@RequestParam String incomingBatch,@RequestParam String marketNames,@RequestParam Long warehouseId);
 
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java
index 60f191d43..adced4846 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java
@@ -32,4 +32,6 @@ public class DistributionPackadeliVO extends DistributionPackadeliEntity {
 	private static final long serialVersionUID = 1L;
 
 
+
+
 }
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
index 3904a756b..5713d1aeb 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
@@ -170,6 +170,11 @@ public class QuestDetailEntity extends TenantEntity {
 	 */
 	private String materialCode;
 
+	/**
+	 * 物料名称
+	 */
+	private String materialName;
+
 	/**
 	 * 商场名称
 	 */
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java
index e7e3dd86b..1b5d6922f 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java
@@ -3,6 +3,8 @@ package com.logpm.warehouse.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TaskContractVO {
 
@@ -18,7 +20,6 @@ public class TaskContractVO {
 	@ApiModelProperty(value = "订单号")
 	private Long orderId;
 
-
 	/**
 	 * 总件数
 	 */
@@ -36,4 +37,23 @@ public class TaskContractVO {
 	 */
 	@ApiModelProperty(value = "盘点件数")
 	private Integer unTotal;
+
+
+	/**
+	 * 是否是零担 0- 否  1-是
+	 */
+	@ApiModelProperty(value = "是否是零担 0- 否  1-是")
+	private Integer isZero;
+
+	/**
+	 * 是否是库存品 0- 否  1-是
+	 */
+	@ApiModelProperty(value = "是否是库存品 0- 否  1-是")
+	private Integer isInventory;
+
+	/**
+	 * 包件列表
+	 */
+	@ApiModelProperty(value = "包件列表")
+	List<TaskPackagelistVO> packagelistVOList;
 }
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java
new file mode 100644
index 000000000..9b4a2c0fe
--- /dev/null
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java
@@ -0,0 +1,65 @@
+package com.logpm.warehouse.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TaskPackagelistVO {
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderCode;
+
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderPackageCode;
+
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String waybillNub;
+
+	/**
+	 * 库位信息
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String allocation;
+
+	/**
+	 * 当前状态  只能是在库
+	 */
+	@ApiModelProperty(value = "当前状态  只能是在库")
+	private String currentStatus;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private Long orderId;
+
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private Integer quantity;
+
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "物料名称")
+	private String materialName;
+
+	/**
+	 * 物料编码
+	 */
+	@ApiModelProperty(value = "物料编码")
+	private String materialCode;
+
+
+
+}
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskStripApiVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskStripApiVO.java
index 8dcc00103..2dd97142c 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskStripApiVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskStripApiVO.java
@@ -79,6 +79,7 @@ public class TaskStripApiVO {
 
 
 	private String materialCode;
+
 	private String materialName;
 
 	private String waybillNo;
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java
index 27021aff2..2175c57a9 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java
@@ -56,4 +56,6 @@ public class TaskTrayVO {
 	 */
 	private List<QuestDetailVO>  list;
 
+
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
index 32517fbd3..819c2f75e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
@@ -151,4 +151,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		Integer i =	distributionParcelListService.selectSumByOrderId(orderId,warehouseId);
 		return i;
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> getParcelListByStockArticleId(Long id) {
+
+		return distributionParcelListService.getParcelListByStockArticleId(id);
+	}
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
index 9df9d8b58..bba65b68a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
@@ -177,8 +177,8 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 
 
 	@Override
-	public DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(String code, List<String> marketNames,Long warehouseId) {
-		return distributionStockArticleService.findStockArticleByCodeAndMarketAndWarehouseId(code,marketNames,warehouseId);
+	public List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(String incomingBatch, String marketNames,Long warehouseId) {
+		return distributionStockArticleService.findStockArticleByCodeAndMarketAndWarehouseId(incomingBatch,marketNames,warehouseId);
 	}
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java
index 979384bed..01ce2518f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java
@@ -163,7 +163,7 @@ public class DistributionStockListClient implements IDistributionStockListClient
 	public List<DistributionStockListEntity> getStockListByWarehouseIdAndMarketAndStockListInfo(String incomingBatch, List<String> marketNames, Long warehouseId) {
 		LambdaQueryWrapper<DistributionStockListEntity> stockListEntityLambdaQueryWrapper = Wrappers.<DistributionStockListEntity>query().lambda();
 		if (Func.isNotEmpty(incomingBatch)){
-			stockListEntityLambdaQueryWrapper.like(DistributionStockListEntity::getIncomingBatch,incomingBatch).or().like(DistributionStockListEntity::getMarketName,incomingBatch);
+			stockListEntityLambdaQueryWrapper.eq(DistributionStockListEntity::getIncomingBatch,incomingBatch).or().eq(DistributionStockListEntity::getMarketCode,incomingBatch);
 		}
 		if (Func.isNotEmpty(marketNames)){
 			stockListEntityLambdaQueryWrapper.in(DistributionStockListEntity::getMarketName,marketNames);
@@ -173,5 +173,4 @@ public class DistributionStockListClient implements IDistributionStockListClient
 		return distributionStockListService.list(stockListEntityLambdaQueryWrapper);
 	}
 
-
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 319fb19fe..5c556cc85 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -317,7 +317,7 @@
     </select>
     <select id="pageListOwe" parameterType="com.logpm.distribution.dto.DistributionStockArticleOweDTO"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
-        select DISTINCT ldsa.id, ldsa.tenant_id,
+        select ldsa.id, ldsa.tenant_id,
         ldsa.create_user,
         ldsa.create_time,
         ldsa.update_user,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
index 8de7d0a59..c5032d0a8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
@@ -132,4 +132,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	int getZeroUpdateMaterial(Map<String, Object> distributionParcelList);
 
     Integer selectSumByOrderId(Long orderId, Long warehouseId);
+
+	/**
+	 * 查询订单下所有包件信息
+	 * @param id
+	 * @return
+	 */
+	List<DistributionParcelListEntity> getParcelListByStockArticleId(Long id);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
index e1c28966a..5861a7427 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
@@ -180,5 +180,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 * @param marketNames
 	 * @return
 	 */
-    DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(String code, List<String> marketNames,Long warehouseId);
+	List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(String code, String marketNames,Long warehouseId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 5cc28f842..3d46a7403 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -481,6 +481,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				loadscanEntity.setIsAbnormalLoading(1);
 				//出库
 				warehouseUpdownTypeClient.downPackage(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
+				//订单扣减在库数量
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+				stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - parcelListEntity.getQuantity());
+				distributionStockArticleService.updateById(stockArticleEntity);
 				distributionLoadscanService.save(loadscanEntity);
 				//查询本车次是否第一次扫码,没有则更新上车时间
 				Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -489,7 +493,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//这里还需要一个维护状态的方法
 				//异步维护状态
 				distributionAsyncService.checkLoadingByPackage(parcelListEntity, distrilbutionloadingscanDTO.getDeliveryId());
-
 			} else if (parcelListEntityList.size() == 0) {
 				//查找出该包件信息
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 2f9025402..eb99b7b3c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -349,6 +349,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return null;
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> getParcelListByStockArticleId(Long id) {
+		return this.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId,id));
+	}
+
 	/**
 	 *
 	 * @param distributionParcelList
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index dd1f9663f..79a38f493 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -46,6 +46,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
+import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageGroundingStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.utils.CommonUtil;
@@ -1083,18 +1084,22 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(String code, List<String> marketNames,Long warehouseId) {
+	public List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(String code, String marketNames,Long warehouseId) {
 		if (Func.isEmpty(warehouseId)){
 			return null;
 		}
-		LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda().eq(DistributionStockArticleEntity::getAcceptWarehouseId,warehouseId);
+		ArrayList<String> str = new ArrayList<>();
+		str.add(OrderStatusConstant.qianshou.getValue());
+		str.add(OrderStatusConstant.chuku.getValue());
+		LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda()
+			.eq(DistributionStockArticleEntity::getAcceptWarehouseId,warehouseId).notIn(DistributionStockArticleEntity::getOrderStatus,str);
 		if (Func.isNotEmpty(code)){
-			lambda.like(DistributionStockArticleEntity::getOrderCode,code);
+			lambda.eq(DistributionStockArticleEntity::getOrderCode,code);
 		}
-		if (Func.isNotEmpty(marketNames) && marketNames.size()>0){
-			lambda.in(DistributionStockArticleEntity::getMallName,code);
+		if (Func.isNotEmpty(marketNames)){
+			lambda.in(DistributionStockArticleEntity::getMallName,Func.toStrList(",",marketNames));
 		}
-		return this.getOne(lambda);
+		return this.list(lambda);
 	}
 
 
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java
index 5cefd57fc..48e03a48d 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java
@@ -51,7 +51,7 @@ public class FactoryAuthServiceImpl implements IFactoryAuthService {
 		String tokenAbst = MD5Utils.md5Hex(token.getBytes(StandardCharsets.UTF_8));
 		//过期时间生成
 		LocalDateTime start = LocalDateTime.now();
-		LocalDateTime end = start.plusMinutes(30);
+		LocalDateTime end = start.plusMinutes(60*24*30);
 		Date date = Date.from( end.atZone( ZoneId.systemDefault()).toInstant());
 
 		//查询是否有当前账户的token数据
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
index 56e2fa7bf..33052b358 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
@@ -572,34 +572,57 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 //					distributionStockArticleEntity.setWarehouse(t.getName());
 //					distributionStockArticleEntity.setWarehouseId(t.getId());
 				}
-			}
 
-			String customerName = wayBillEntity.getTakeCompany();//客户名称
+				String customerName = wayBillEntity.getTakeCompany();//客户名称
 
-			//通过客户名称去查询客户的服务类型、
-			distributionStockArticleEntity.setTypeService("1");//默认商配
+				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
+				log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity);
+				if (!Objects.isNull(basicdataClientEntity)) {
+					//商城
+					distributionStockArticleEntity.setMallId(basicdataClientEntity.getId());
+					distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+					distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
 
-			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
-			log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity);
-			if (!Objects.isNull(basicdataClientEntity)) {
-				//商城
-				distributionStockArticleEntity.setMallId(basicdataClientEntity.getId());
-				distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-				distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
-
-				distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode());
-				distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName());
+					distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode());
+					distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName());
 
 
-				// todo  这里需要去查询门店 和新系统的门店ID 进行绑定
-				String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId());
-				log.info("订单同步peisongType {} ", peisongType);
+					// todo  这里需要去查询门店 和新系统的门店ID 进行绑定
+					String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId());
+					log.info("订单同步peisongType {} ", peisongType);
 
-				if (StringUtil.isNoneBlank(peisongType)) {
-					distributionStockArticleEntity.setTypeService(peisongType);
+					if (StringUtil.isNoneBlank(peisongType)) {
+						distributionStockArticleEntity.setTypeService(peisongType);
+					}
 				}
 			}
 
+
+
+			//通过客户名称去查询客户的服务类型、
+			distributionStockArticleEntity.setTypeService("1");//默认商配
+
+//			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
+//			log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity);
+//			if (!Objects.isNull(basicdataClientEntity)) {
+//				//商城
+//				distributionStockArticleEntity.setMallId(basicdataClientEntity.getId());
+//				distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+//				distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+//
+//				distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode());
+//				distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName());
+//
+//
+//				// todo  这里需要去查询门店 和新系统的门店ID 进行绑定
+//				String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId());
+//				log.info("订单同步peisongType {} ", peisongType);
+//
+//				if (StringUtil.isNoneBlank(peisongType)) {
+//					distributionStockArticleEntity.setTypeService(peisongType);
+//				}
+//			}
+
 			distributionStockArticleEntity.setGenre(1);
 			distributionStockArticleEntity.setAdvanceId(advanceId);
 			//--------------2023-07-06 新增字段处理
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
index 0f3bbff83..a3b368218 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
@@ -74,7 +74,7 @@ public class WarehouseTaskApiController {
 	}
 
 	/**
-	 * 合同号列表
+	 * 合同号查询列表
 	 */
 	@GetMapping("/contractList")
 	@ApiOperationSupport(order = 1)
@@ -86,7 +86,20 @@ public class WarehouseTaskApiController {
 
 
 	/**
-	 * 合同号扫描
+	 * 合同号订单详情
+	 */
+	@GetMapping("/contractQuestDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "合同号列表", notes = "code,type")
+	public R contractQuestDetail(TaskSearchDTO taskSearchDTO) {
+		R r = taskQuestService.contractQuestDetail(taskSearchDTO);
+		return r;
+	}
+
+
+
+	/**
+	 * 合同号方式添加查询
 	 */
 	@PostMapping("/queryContract")
 	@ApiOperationSupport(order = 1)
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
index 424966e3d..f86ac932b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
@@ -57,6 +57,12 @@ public class TaskSearchDTO {
 	@ApiModelProperty(value = "type(1-手动输入,2-扫描)")
 	private Integer type;
 
+	/**
+	 * 是否库存品
+	 */
+	@ApiModelProperty(value = "0 否 1是")
+	private Integer isInventory;
+
 	/**
 	 * goodsType 合同号类型
 	 */
@@ -75,10 +81,19 @@ public class TaskSearchDTO {
 	@ApiModelProperty(value = "列表存在订单ID")
 	private String stockArticleIds;
 
+	/**
+	 * 订单ID
+	 */
+	@ApiModelProperty(value = "订单ID")
+	private Long orderId;
+
 	private String trayCode;
 
 
 
+
+
+
 	/**
 	 * 商场名称
 	 */
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
index fa02448b6..bf23a93b5 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
@@ -116,6 +116,13 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	List<WarehouseMaterialVO> findMaterialList(TaskSearchDTO taskSearchDTO);
 
 
+	/**
+	 * 盘点合同查询详情
+	 * @param taskSearchDTO
+	 * @return
+	 */
+	R contractQuestDetail(TaskSearchDTO taskSearchDTO);
+
 	IPage <QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id);
 
 	IPage <QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
index 4e7c8eca3..fc120ac2d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
@@ -17,6 +17,7 @@
 package com.logpm.warehouse.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -29,6 +30,7 @@ import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.distribution.feign.IDistributionStockListClient;
+import com.logpm.distribution.vo.DistributionPackadeliVO;
 import com.logpm.distribution.vo.DistributionStockListVO;
 import com.logpm.warehouse.bean.Resp;
 import com.logpm.warehouse.dto.QuestDetailDTO;
@@ -96,8 +98,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	private final IWarehouseTaryAllocationService taryAllocationService;
 
 
-
-
 	@Override
 	public IPage<TaskQuestVO> selectTaskQuestPage(IPage<TaskQuestVO> page, TaskQuestVO taskQuest) {
 		//获取当前登录人仓库
@@ -226,45 +226,67 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		List<Long> collect = this.getmyWarehouseList();
 		baseMapper.setSqlMode();
 		String goodsType = taskSearchDTO.getGoodsType();
-		switch (goodsType){
-			case "1":
-				//订制品
-				List<TaskContractVO> list = baseMapper.selectcontractList(page, taskSearchDTO, collect);
-				break;
-			case "2":
-				//零担
-				break;
-			case "3":
-				//库存品
-				break;
+		LambdaQueryWrapper<QuestDetailEntity> queryWrapper = Wrappers.<QuestDetailEntity>query().lambda()
+			.eq(QuestDetailEntity::getQuestType, 3)
+			.eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId());
+		List<TaskContractVO> list = new ArrayList<>();
+		List<QuestDetailEntity> questDetailEntityList = questDetailService.list(queryWrapper);
+		if (Func.isEmpty(questDetailEntityList)){
+			return null;
 		}
-		List<TaskContractVO> list = baseMapper.selectcontractList(page, taskSearchDTO, collect);
-
-		if (!list.isEmpty()) {
-			for (TaskContractVO taskContractVO : list) {
-				Long orderId = taskContractVO.getOrderId();
-				String orderCode = taskContractVO.getOrderCode();
-				//查询该订单，如果是零担直接用在库数量
-				DistributionStockArticleEntity entityByStockArticle = distributionStockArticleClient.findEntityByStockArticleId(orderId);
-				if (entityByStockArticle.getIsZero().equals("1")) {
-					if (entityByStockArticle.getGenre() == 1) {
-						taskContractVO.setTotal(entityByStockArticle.getTotalNumber());
-						taskContractVO.setZktotal(entityByStockArticle.getTotalNumber());
-					}
-				} else if (entityByStockArticle.getIsZero().equals("0")) {
-					//包条
-					if (entityByStockArticle.getGenre() == 1) {
-						//查询该订单下包条的所有数量
-						Integer integer = distributionParcelListClient.SumEntityByOrderId(orderId, null);
-						Integer integer1 = distributionParcelListClient.SumEntityByOrderId(orderId, collect.get(0));
-						taskContractVO.setTotal(integer);
-						taskContractVO.setZktotal(integer1);
-					}
-
+		Map<Integer, List<QuestDetailEntity>> questDetailMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget));
+		//订制品
+		List<QuestDetailEntity> questDetailEntities = questDetailMap.get(1);
+		List<QuestDetailEntity> zeroQuestDetailEntities = questDetailMap.get(2);
+		List<QuestDetailEntity> inventoryQuestDetailEntities = questDetailMap.get(3);
+		if (Func.isNotEmpty(questDetailEntities)){
+			Map<Long, List<QuestDetailEntity>> orderMap = questDetailEntities.stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderId));
+			orderMap.forEach((k,v)->{
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(k);
+				List<QuestDetailEntity> detailEntities = orderMap.get(k);
+				TaskContractVO taskContractVO = new TaskContractVO();
+				taskContractVO.setIsInventory(0);
+				taskContractVO.setIsZero(0);
+				taskContractVO.setOrderCode(detailEntities.get(0).getOrderCode());
+				taskContractVO.setOrderId(k);
+				taskContractVO.setTotal(detailEntities.stream().mapToInt(QuestDetailEntity::getStockNum).sum());
+				taskContractVO.setZktotal(detailEntities.stream().mapToInt(QuestDetailEntity::getStockNum).sum());
+				taskContractVO.setUnTotal(detailEntities.stream().filter(q->Func.equals(q.getQuestStatus(),1)).mapToInt(QuestDetailEntity::getStockNum).sum());
+				list.add(taskContractVO);
+			});
+		}
+		if (Func.isNotEmpty(zeroQuestDetailEntities)){
+			for (QuestDetailEntity questDetailEntity : zeroQuestDetailEntities) {
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(questDetailEntity.getOrderId());
+				TaskContractVO taskContractVO = new TaskContractVO();
+				taskContractVO.setIsInventory(0);
+				taskContractVO.setIsZero(1);
+				taskContractVO.setOrderCode(questDetailEntity.getOrderCode());
+				taskContractVO.setOrderId(questDetailEntity.getOrderId());
+				taskContractVO.setTotal(stockArticleEntity.getTotalNumber());
+				taskContractVO.setZktotal(questDetailEntity.getStockNum());
+				taskContractVO.setUnTotal(questDetailEntity.getStockNum());
+				list.add(taskContractVO);
+			}
+		}
+		if (Func.isNotEmpty(inventoryQuestDetailEntities)){
+			for (QuestDetailEntity questDetailEntity : inventoryQuestDetailEntities) {
+				DistributionStockListEntity stockListEntity = distributionStockListClient.getStockListById(questDetailEntity.getStockId());
+				TaskContractVO taskContractVO = new TaskContractVO();
+				taskContractVO.setOrderCode(questDetailEntity.getOrderCode());
+				taskContractVO.setOrderId(questDetailEntity.getStockId());
+				taskContractVO.setTotal(stockListEntity.getQuantityStock());
+				taskContractVO.setIsZero(0);
+				taskContractVO.setIsInventory(1);
+				taskContractVO.setZktotal(questDetailEntity.getStockNum());
+				taskContractVO.setUnTotal(0);
+				if (questDetailEntity.getQuestStatus().equals(1)){
+					taskContractVO.setUnTotal(questDetailEntity.getStockNum());
 				}
-
+				list.add(taskContractVO);
 			}
 		}
+
 		return page.setRecords(list);
 	}
 
@@ -330,6 +352,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	/**
 	 * 出来托盘信息
+	 *
 	 * @return
 	 */
 	private List<TaskTrayVO> getTaskTrayInfo(List<QuestDetailEntity> list1){
@@ -337,7 +360,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		List<TaskTrayVO> list = new ArrayList<>();
 		list1.stream().collect(Collectors.groupingBy(QuestDetailEntity::getTrayId))
-			.forEach((k,v) ->{
+			.forEach((k, v) -> {
 				TaskTrayVO taskTrayVO = new TaskTrayVO();
 				taskTrayVO.setTrayId(k);
 				AtomicReference<Integer> num = new AtomicReference<>(0); //总数
@@ -345,10 +368,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				v.forEach( p ->{
 					taskTrayVO.setTrayCode(p.getTrayCode());
 					num.set(num.get() + p.getStockNum());
-					if(p.getQuestStatus().equals(1)){
+					if (p.getQuestStatus().equals(1)) {
 						unTotal.set(unTotal.get() + p.getQuestStatus());
 					}
-					switch (p.getQuestTarget()){
+					switch (p.getQuestTarget()) {
 						case 1:
 							taskTrayVO.setGoodsType("定制品");
 							break;
@@ -364,16 +387,17 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				taskTrayVO.setUnTotal(unTotal.get());
 				list.add(taskTrayVO);
 			});
+
 		return list;
 	}
 
 
+
 	/**
 	 * 托盘ID信息货物处理
 	 * @return
 	 */
 	private TaskTrayVO getTaskTrayInfoOwn(List<QuestDetailEntity> list1,String type){
-
 		TaskTrayVO taskTrayVO = new TaskTrayVO();
 		list1.stream().collect(Collectors.groupingBy(QuestDetailEntity::getTrayId))
 			.forEach((k,v) ->{
@@ -420,6 +444,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	/**
 	 * 查询托盘里面的信息
+	 *
 	 * @param taskSearchDTO
 	 * @param warehouseId
 	 * @param trayId
@@ -436,6 +461,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	/**
 	 * 盘点根据托盘id查询明细
+	 *
 	 * @param page
 	 * @param taskSearchDTO
 	 * @return
@@ -451,12 +477,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 
-
-
 	/**
 	 * 根据托盘ID查询托盘货位并添加
-	 * @param taskId 盘点ID
-	 * @param warehouseId 仓库ID
+	 *
+	 * @param taskId         盘点ID
+	 * @param warehouseId    仓库ID
 	 * @param trayByTrayCode 托盘
 	 * @return
 	 */
@@ -466,14 +491,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		List<TaskQuestChildEntity> list = taskQuestChildService.list(Wrappers.<TaskQuestChildEntity>query().lambda()
 			.eq(TaskQuestChildEntity::getQuestId, taskId)
 		);
-		if(!list.isEmpty()){
+		if (!list.isEmpty()) {
 			boolean b = list.stream().anyMatch(t -> ObjectUtils.isNotNull(t.getRefId()));
 			List<WarehouseTrayGoodsEntity> warehouseTrayGoodsEntities = warehouseTrayGoodsMapper.selectList(Wrappers.<WarehouseTrayGoodsEntity>query().lambda()
 				.eq(WarehouseTrayGoodsEntity::getTrayId, trayByTrayCode.getId())
 				.eq(WarehouseTrayGoodsEntity::getWarehouseId, warehouseId)
 			);
 
-			if(!warehouseTrayGoodsEntities.isEmpty()){
+			if (!warehouseTrayGoodsEntities.isEmpty()) {
 				List<QuestDetailEntity> questDetailList = new ArrayList<>();
 				for (int ii = 0; ii < warehouseTrayGoodsEntities.size(); ii++) {
 					WarehouseTrayGoodsEntity i = warehouseTrayGoodsEntities.get(ii);
@@ -573,7 +598,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				if(!questDetailList.isEmpty()){
 					questDetailService.saveBatch(questDetailList);
 					return 1;
-				}else{
+				} else {
 					log.debug("托盘盘点：没有物料信息");
 					return 3;
 				}
@@ -590,10 +615,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	/**
 	 * 包件，订单查询货位信息
+	 *
 	 * @return
 	 */
-	private WarehouseUpdownGoodsEntity getUpdownGoodsPack(Long associationId,String type,String associationValue,Long warehouseId){
-		return  warehouseUpdownGoodsMapper.selectOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
+	private WarehouseUpdownGoodsEntity getUpdownGoodsPack(Long associationId, String type, String associationValue, Long warehouseId) {
+		return warehouseUpdownGoodsMapper.selectOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
 			.eq(WarehouseUpdownGoodsEntity::getAssociationValue, associationValue)
 			.eq(WarehouseUpdownGoodsEntity::getAssociationId, associationId)
 			.eq(WarehouseUpdownGoodsEntity::getAssociationType, type)
@@ -603,9 +629,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	/**
 	 * 库存品查询货位信息
+	 *
 	 * @return
 	 */
-	private WarehouseUpdownGoodsEntity getUpdownGoodsStockList(Long marketId,String type,String incomingBatch,Long warehouseId,Long associationId ,String associationValue){
+	private WarehouseUpdownGoodsEntity getUpdownGoodsStockList(Long marketId, String type, String incomingBatch, Long warehouseId, Long associationId, String associationValue) {
 		return warehouseUpdownGoodsMapper.selectOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
 			.eq(WarehouseUpdownGoodsEntity::getAssociationValue, associationValue)
 			.eq(WarehouseUpdownGoodsEntity::getMarketId, marketId)
@@ -615,25 +642,26 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			.eq(WarehouseUpdownGoodsEntity::getWarehouseId, warehouseId)
 		);
 	}
+
 	/**
 	 * 订单ID查询订单信息
+	 *
 	 * @return
 	 */
-	private DistributionStockArticleEntity getStockArticleInfo(Long stockArticleID){
+	private DistributionStockArticleEntity getStockArticleInfo(Long stockArticleID) {
 		return distributionStockArticleClient.findEntityByStockArticleId(stockArticleID);
 	}
 
 	/**
 	 * 订单ID查询订单信息
+	 *
 	 * @return
 	 */
-	private DistributionStockListEntity getStockListInfo(DistributionStockListEntity distributionStockListEntity){
+	private DistributionStockListEntity getStockListInfo(DistributionStockListEntity distributionStockListEntity) {
 		return distributionStockListClient.getQueryData(distributionStockListEntity);
 	}
 
 
-
-
 	@Override
 	public List<QuestDetailEntity> allocationDetailByPackage(TaskSearchDTO taskSearchDTO) {
 
@@ -641,7 +669,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long warehouseId = taskSearchDTO.getWarehouseId();
 		Long questId = taskSearchDTO.getQuestId();
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		//先判断库位是否有数据
 		List<QuestDetailEntity> lsPackage = warehouseUpdownGoodsMapper.allocationDetailByPackage(taskSearchDTO);
@@ -656,12 +684,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		//先查询任务的过滤商场
 		QueryWrapper<TaskQuestChildEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("quest_id",questId)
-			.eq("is_deleted",0);
+		queryWrapper.eq("quest_id", questId)
+			.eq("is_deleted", 0);
 		List<TaskQuestChildEntity> questChildEntitys = taskQuestChildService.list(queryWrapper);
 		List<String> marketNames = null;
-		for (TaskQuestChildEntity childEntity:questChildEntitys) {
-			if(Objects.isNull(marketNames)){
+		for (TaskQuestChildEntity childEntity : questChildEntitys) {
+			if (Objects.isNull(marketNames)) {
 				marketNames = new ArrayList<>();
 			}
 			marketNames.add(childEntity.getRefName());
@@ -670,14 +698,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		//判断是否有明细数据存入
 		QueryWrapper<QuestDetailEntity> questDetailEntityQueryWrapper = new QueryWrapper<>();
-		questDetailEntityQueryWrapper.eq("quest_id",questId)
-			.eq("quest_type",2)
-			.eq("quest_target",1)
-			.eq("warehouse_id",warehouseId)
-			.eq("allocation_id",allocationId)
-			.eq("is_deleted",0);
+		questDetailEntityQueryWrapper.eq("quest_id", questId)
+			.eq("quest_type", 2)
+			.eq("quest_target", 1)
+			.eq("warehouse_id", warehouseId)
+			.eq("allocation_id", allocationId)
+			.eq("is_deleted", 0);
 		List<QuestDetailEntity> questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper);
-		if(!questDetailEntities.isEmpty()){
+		if (!questDetailEntities.isEmpty()) {
 			return questDetailEntities;
 		}
 
@@ -690,7 +718,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 //			throw new CustomerException(403,"未有数据在盘点计划中");
 //		}
 
-		questDetailService.saveList(list,questId);
+		questDetailService.saveList(list, questId);
 
 		return list;
 	}
@@ -702,16 +730,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long warehouseId = taskSearchDTO.getWarehouseId();
 
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		//先查询任务的过滤商场
 		QueryWrapper<TaskQuestChildEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("quest_id",questId)
-			.eq("is_deleted",0);
+		queryWrapper.eq("quest_id", questId)
+			.eq("is_deleted", 0);
 		List<TaskQuestChildEntity> questChildEntitys = taskQuestChildService.list(queryWrapper);
 		List<String> marketNames = null;
-		for (TaskQuestChildEntity childEntity:questChildEntitys) {
-			if(Objects.isNull(marketNames)){
+		for (TaskQuestChildEntity childEntity : questChildEntitys) {
+			if (Objects.isNull(marketNames)) {
 				marketNames = new ArrayList<>();
 			}
 			marketNames.add(childEntity.getRefName());
@@ -720,14 +748,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		//判断是否有明细数据存入
 		QueryWrapper<QuestDetailEntity> questDetailEntityQueryWrapper = new QueryWrapper<>();
-		questDetailEntityQueryWrapper.eq("quest_id",questId)
-			.eq("quest_type",2)
-			.eq("quest_target",2)
-			.eq("warehouse_id",warehouseId)
-			.eq("allocation_id",allocationId)
-			.eq("is_deleted",0);
+		questDetailEntityQueryWrapper.eq("quest_id", questId)
+			.eq("quest_type", 2)
+			.eq("quest_target", 2)
+			.eq("warehouse_id", warehouseId)
+			.eq("allocation_id", allocationId)
+			.eq("is_deleted", 0);
 		List<QuestDetailEntity> questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper);
-		if(!questDetailEntities.isEmpty()){
+		if (!questDetailEntities.isEmpty()) {
 			return questDetailEntities;
 		}
 
@@ -751,16 +779,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long warehouseId = taskSearchDTO.getWarehouseId();
 
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		//先查询任务的过滤商场
 		QueryWrapper<TaskQuestChildEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("quest_id",questId)
-			.eq("is_deleted",0);
+		queryWrapper.eq("quest_id", questId)
+			.eq("is_deleted", 0);
 		List<TaskQuestChildEntity> questChildEntitys = taskQuestChildService.list(queryWrapper);
 		List<String> marketNames = null;
-		for (TaskQuestChildEntity childEntity:questChildEntitys) {
-			if(Objects.isNull(marketNames)){
+		for (TaskQuestChildEntity childEntity : questChildEntitys) {
+			if (Objects.isNull(marketNames)) {
 				marketNames = new ArrayList<>();
 			}
 			marketNames.add(childEntity.getRefName());
@@ -769,14 +797,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		//判断是否有明细数据存入
 		QueryWrapper<QuestDetailEntity> questDetailEntityQueryWrapper = new QueryWrapper<>();
-		questDetailEntityQueryWrapper.eq("quest_id",questId)
-			.eq("quest_type",2)
-			.eq("quest_target",3)
-			.eq("warehouse_id",warehouseId)
-			.eq("allocation_id",allocationId)
-			.eq("is_deleted",0);
+		questDetailEntityQueryWrapper.eq("quest_id", questId)
+			.eq("quest_type", 2)
+			.eq("quest_target", 3)
+			.eq("warehouse_id", warehouseId)
+			.eq("allocation_id", allocationId)
+			.eq("is_deleted", 0);
 		List<QuestDetailEntity> questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper);
-		if(!questDetailEntities.isEmpty()){
+		if (!questDetailEntities.isEmpty()) {
 			return questDetailEntities;
 		}
 
@@ -800,10 +828,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long questId = taskSearchDTO.getQuestId();
 
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		List<QuestDetailDTO> questDetailList = taskSearchDTO.getQuestDetailList();
-		for (QuestDetailDTO questDetailDTO:questDetailList){
+		for (QuestDetailDTO questDetailDTO : questDetailList) {
 			Long questDetaiId = questDetailDTO.getId();//明细id
 			QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId);
 			if(Objects.isNull(detailEntity)){
@@ -841,42 +869,42 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long questId = taskSearchDTO.getQuestId();
 
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId);
-		if(Objects.isNull(goodsAllocationEntity)){
-			log.warn("###########updateQuestDetailAllocation: 库位信息不存在 allocationId={}",allocationId);
-			throw new CustomerException(403,"库位信息不存在");
+		if (Objects.isNull(goodsAllocationEntity)) {
+			log.warn("###########updateQuestDetailAllocation: 库位信息不存在 allocationId={}", allocationId);
+			throw new CustomerException(403, "库位信息不存在");
 		}
 		Long wid = goodsAllocationEntity.getWarehouseId();
-		if(!wid.equals(warehouseId)){
-			log.warn("###########updateQuestDetailAllocation: 库位不在当前仓 allocationId={}",allocationId);
-			throw new CustomerException(403,"库位不在当前仓");
+		if (!wid.equals(warehouseId)) {
+			log.warn("###########updateQuestDetailAllocation: 库位不在当前仓 allocationId={}", allocationId);
+			throw new CustomerException(403, "库位不在当前仓");
 		}
 		Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId();
 		BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId);
-		if(Objects.isNull(basicdataGoodsShelfEntity)){
-			log.warn("###########updateQuestDetailAllocation: 货架信息不存在 goodsShelfId={}",goodsShelfId);
-			throw new CustomerException(403,"货架信息不存在");
+		if (Objects.isNull(basicdataGoodsShelfEntity)) {
+			log.warn("###########updateQuestDetailAllocation: 货架信息不存在 goodsShelfId={}", goodsShelfId);
+			throw new CustomerException(403, "货架信息不存在");
 		}
 		Long goodsAreaId = basicdataGoodsShelfEntity.getGoodsAreaId();
 		BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
-		if(Objects.isNull(goodsAreaEntity)){
-			log.warn("###########updateQuestDetailAllocation: 货区信息不存在 goodsAreaId={}",goodsAreaId);
-			throw new CustomerException(403,"货区信息不存在");
+		if (Objects.isNull(goodsAreaEntity)) {
+			log.warn("###########updateQuestDetailAllocation: 货区信息不存在 goodsAreaId={}", goodsAreaId);
+			throw new CustomerException(403, "货区信息不存在");
 		}
 
 		List<QuestDetailDTO> questDetailList = taskSearchDTO.getQuestDetailList();
 		List<QuestDetailEntity> ls = new ArrayList<>();
-		for (QuestDetailDTO questDetailDTO:questDetailList){
+		for (QuestDetailDTO questDetailDTO : questDetailList) {
 			Long questDetaiId = questDetailDTO.getId();//明细id
 			QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId);
-			if(Objects.isNull(detailEntity)){
-				log.warn("###########updateQuestSetail: 存在不在盘点计划中的数据 questDetaiId={}",questDetaiId);
-				throw new CustomerException(403,"存在不在盘点计划中的数据");
+			if (Objects.isNull(detailEntity)) {
+				log.warn("###########updateQuestSetail: 存在不在盘点计划中的数据 questDetaiId={}", questDetaiId);
+				throw new CustomerException(403, "存在不在盘点计划中的数据");
 			}
 			detailEntity.setGroundingAllocationId(allocationId);
-			detailEntity.setGroundingPositionCode(goodsAreaEntity.getHeadline()+"-"+basicdataGoodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName());
+			detailEntity.setGroundingPositionCode(goodsAreaEntity.getHeadline() + "-" + basicdataGoodsShelfEntity.getGoodsShelfName() + "-" + goodsAllocationEntity.getGoodsAllocationName());
 			ls.add(detailEntity);
 		}
 		questDetailService.updateBatchById(ls);
@@ -890,16 +918,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long questId = taskSearchDTO.getQuestId();
 
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		List<QuestDetailDTO> questDetailList = taskSearchDTO.getQuestDetailList();
 		List<QuestDetailEntity> ls = new ArrayList<>();
-		for (QuestDetailDTO questDetailDTO:questDetailList){
+		for (QuestDetailDTO questDetailDTO : questDetailList) {
 			Long questDetaiId = questDetailDTO.getId();//明细id
 			QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId);
-			if(Objects.isNull(detailEntity)){
-				log.warn("###########deleteQuestDetail: 存在不在盘点计划中的数据 questDetaiId={}",questDetaiId);
-				throw new CustomerException(403,"存在不在盘点计划中的数据");
+			if (Objects.isNull(detailEntity)) {
+				log.warn("###########deleteQuestDetail: 存在不在盘点计划中的数据 questDetaiId={}", questDetaiId);
+				throw new CustomerException(403, "存在不在盘点计划中的数据");
 			}
 			detailEntity.setQuestStatus(3);
 			ls.add(detailEntity);
@@ -916,111 +944,110 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Long allocationId = taskSearchDTO.getAllocationId();
 
 		//先判定盘点任务是否已结束
-		verifyTask(questId,warehouseId);
+		verifyTask(questId, warehouseId);
 
 		Integer questType = taskSearchDTO.getQuestType();
 		Integer questTarget = taskSearchDTO.getQuestTarget();
 
 		String positionCode = null;
 		Long trayId = null;
-		if(questType == 2){//库位盘点
+		if (questType == 2) {//库位盘点
 			BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId);
-			if(Objects.isNull(goodsAllocationEntity)){
-				log.warn("###########saveNewQuestDetail: 库位信息不存在 allocationId={}",allocationId);
-				throw new CustomerException(403,"库位信息不存在");
+			if (Objects.isNull(goodsAllocationEntity)) {
+				log.warn("###########saveNewQuestDetail: 库位信息不存在 allocationId={}", allocationId);
+				throw new CustomerException(403, "库位信息不存在");
 			}
 			Long wid = goodsAllocationEntity.getWarehouseId();
-			if(!wid.equals(warehouseId)){
-				log.warn("###########saveNewQuestDetail: 库位不在当前仓 allocationId={}",allocationId);
-				throw new CustomerException(403,"库位不在当前仓");
+			if (!wid.equals(warehouseId)) {
+				log.warn("###########saveNewQuestDetail: 库位不在当前仓 allocationId={}", allocationId);
+				throw new CustomerException(403, "库位不在当前仓");
 			}
 			Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId();
 			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId);
-			if(Objects.isNull(basicdataGoodsShelfEntity)){
-				log.warn("###########saveNewQuestDetail: 货架信息不存在 goodsShelfId={}",goodsShelfId);
-				throw new CustomerException(403,"货架信息不存在");
+			if (Objects.isNull(basicdataGoodsShelfEntity)) {
+				log.warn("###########saveNewQuestDetail: 货架信息不存在 goodsShelfId={}", goodsShelfId);
+				throw new CustomerException(403, "货架信息不存在");
 			}
 			Long goodsAreaId = basicdataGoodsShelfEntity.getGoodsAreaId();
 			BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
-			if(Objects.isNull(goodsAreaEntity)){
-				log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}",goodsAreaId);
-				throw new CustomerException(403,"货区信息不存在");
+			if (Objects.isNull(goodsAreaEntity)) {
+				log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}", goodsAreaId);
+				throw new CustomerException(403, "货区信息不存在");
 			}
 
 			//判断库位是否有托盘
 			BasicdataTrayEntity trayEntity = taryAllocationService.getTrayByAllocationId(allocationId);
 			trayCode = trayEntity.getPalletCode();
 			BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
-			if(Objects.isNull(basicdataTrayEntity)){
-				log.warn("###########saveNewQuestDetail: 托盘信息不存在 trayCode={}",trayCode);
-				throw new CustomerException(403,"托盘信息不存在");
+			if (Objects.isNull(basicdataTrayEntity)) {
+				log.warn("###########saveNewQuestDetail: 托盘信息不存在 trayCode={}", trayCode);
+				throw new CustomerException(403, "托盘信息不存在");
 			}
 			trayId = basicdataTrayEntity.getId();
 
 			TrayTypeDataVO trayTypeDataVO = trayTypeService.getEntityByTrayCode(trayCode, warehouseId);
-			if(Objects.isNull(trayTypeDataVO)){
-				log.warn("###########saveNewQuestDetail: 托盘打托信息不存在 trayCode={}",trayCode);
-				throw new CustomerException(403,"托盘打托信息不存在");
+			if (Objects.isNull(trayTypeDataVO)) {
+				log.warn("###########saveNewQuestDetail: 托盘打托信息不存在 trayCode={}", trayCode);
+				throw new CustomerException(403, "托盘打托信息不存在");
 			}
 			String type = trayTypeDataVO.getType();
-			if(questTarget != Integer.parseInt(type)){
-				log.warn("###########saveNewQuestDetail: 托盘打托数据类型错误 trayCode={}",trayCode);
-				throw new CustomerException(403,"托盘打托数据类型错误");
+			if (questTarget != Integer.parseInt(type)) {
+				log.warn("###########saveNewQuestDetail: 托盘打托数据类型错误 trayCode={}", trayCode);
+				throw new CustomerException(403, "托盘打托数据类型错误");
 			}
-			positionCode = goodsAreaEntity.getHeadline()+"-"+basicdataGoodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName();
-		}else if(questType == 4){
+			positionCode = goodsAreaEntity.getHeadline() + "-" + basicdataGoodsShelfEntity.getGoodsShelfName() + "-" + goodsAllocationEntity.getGoodsAllocationName();
+		} else if (questType == 4) {
 			BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
-			if(Objects.isNull(basicdataTrayEntity)){
-				log.warn("###########saveNewQuestDetail: 托盘信息不存在 trayCode={}",trayCode);
-				throw new CustomerException(403,"托盘信息不存在");
+			if (Objects.isNull(basicdataTrayEntity)) {
+				log.warn("###########saveNewQuestDetail: 托盘信息不存在 trayCode={}", trayCode);
+				throw new CustomerException(403, "托盘信息不存在");
 			}
 			trayId = basicdataTrayEntity.getId();
 			TrayTypeDataVO trayTypeDataVO = trayTypeService.getEntityByTrayCode(trayCode, warehouseId);
-			if(Objects.isNull(trayTypeDataVO)){
-				log.warn("###########saveNewQuestDetail: 托盘打托信息不存在 trayCode={}",trayCode);
-				throw new CustomerException(403,"托盘打托信息不存在");
+			if (Objects.isNull(trayTypeDataVO)) {
+				log.warn("###########saveNewQuestDetail: 托盘打托信息不存在 trayCode={}", trayCode);
+				throw new CustomerException(403, "托盘打托信息不存在");
 			}
 			String type = trayTypeDataVO.getType();
-			if(questTarget != Integer.parseInt(type)){
-				log.warn("###########saveNewQuestDetail: 托盘打托数据类型错误 trayCode={}",trayCode);
-				throw new CustomerException(403,"托盘打托数据类型错误");
+			if (questTarget != Integer.parseInt(type)) {
+				log.warn("###########saveNewQuestDetail: 托盘打托数据类型错误 trayCode={}", trayCode);
+				throw new CustomerException(403, "托盘打托数据类型错误");
 			}
 
 			//判断托盘是否有库位信息
 			allocationId = taryAllocationService.getAllocationIdByTrayId(basicdataTrayEntity.getId());
 
-			if (!Objects.isNull(allocationId)){
+			if (!Objects.isNull(allocationId)) {
 				BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId);
-				if(Objects.isNull(goodsAllocationEntity)){
-					log.warn("###########saveNewQuestDetail: 库位信息不存在 allocationId={}",allocationId);
-					throw new CustomerException(403,"库位信息不存在");
+				if (Objects.isNull(goodsAllocationEntity)) {
+					log.warn("###########saveNewQuestDetail: 库位信息不存在 allocationId={}", allocationId);
+					throw new CustomerException(403, "库位信息不存在");
 				}
 				Long wid = goodsAllocationEntity.getWarehouseId();
-				if(!wid.equals(warehouseId)){
-					log.warn("###########saveNewQuestDetail: 库位不在当前仓 allocationId={}",allocationId);
-					throw new CustomerException(403,"库位不在当前仓");
+				if (!wid.equals(warehouseId)) {
+					log.warn("###########saveNewQuestDetail: 库位不在当前仓 allocationId={}", allocationId);
+					throw new CustomerException(403, "库位不在当前仓");
 				}
 				Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId();
 				BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId);
-				if(Objects.isNull(basicdataGoodsShelfEntity)){
-					log.warn("###########saveNewQuestDetail: 货架信息不存在 goodsShelfId={}",goodsShelfId);
-					throw new CustomerException(403,"货架信息不存在");
+				if (Objects.isNull(basicdataGoodsShelfEntity)) {
+					log.warn("###########saveNewQuestDetail: 货架信息不存在 goodsShelfId={}", goodsShelfId);
+					throw new CustomerException(403, "货架信息不存在");
 				}
 				Long goodsAreaId = basicdataGoodsShelfEntity.getGoodsAreaId();
 				BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
-				if(Objects.isNull(goodsAreaEntity)){
-					log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}",goodsAreaId);
-					throw new CustomerException(403,"货区信息不存在");
+				if (Objects.isNull(goodsAreaEntity)) {
+					log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}", goodsAreaId);
+					throw new CustomerException(403, "货区信息不存在");
 				}
-				positionCode = goodsAreaEntity.getHeadline()+"-"+basicdataGoodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName();
+				positionCode = goodsAreaEntity.getHeadline() + "-" + basicdataGoodsShelfEntity.getGoodsShelfName() + "-" + goodsAllocationEntity.getGoodsAllocationName();
 			}
 		}
 
 
-
 		QuestDetailDTO questDetail = taskSearchDTO.getQuestDetail();
 		QuestDetailEntity questDetailEntity = new QuestDetailEntity();
-		BeanUtil.copy(questDetail,questDetailEntity);
+		BeanUtil.copy(questDetail, questDetailEntity);
 		questDetailEntity.setQuestId(questId);
 		questDetailEntity.setQuestType(taskSearchDTO.getQuestType());
 		questDetailEntity.setQuestTarget(taskSearchDTO.getQuestTarget());
@@ -1033,7 +1060,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		questDetailEntity.setGroundingAllocationId(allocationId);
 		questDetailEntity.setGroundingPositionCode(positionCode);
 		questDetailEntity.setIsNew(1);
-
 		questDetailService.save(questDetailEntity);
 	}
 
@@ -1042,6 +1068,101 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		return baseMapper.findMaterialList(taskSearchDTO);
 	}
 
+	@Override
+	public R contractQuestDetail(TaskSearchDTO taskSearchDTO) {
+		if (Func.isEmpty(taskSearchDTO.getTaskId())){
+			log.error("#####################TaskId参数缺失:{}",taskSearchDTO.getTaskId());
+			return null;
+		}
+		if (Func.isEmpty(taskSearchDTO.getOrderId())){
+			log.error("#####################OrderId参数缺失:{}",taskSearchDTO.getOrderId());
+			return null;
+		}
+		if (Func.isEmpty(taskSearchDTO.getWarehouseId())){
+			log.error("#####################WarehouseId参数缺失:{}",taskSearchDTO.getWarehouseId());
+			return null;
+		}
+		Integer isInventory = taskSearchDTO.getIsInventory();
+		LambdaQueryWrapper<QuestDetailEntity> queryWrapper = Wrappers.<QuestDetailEntity>query().lambda()
+			.eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId())
+			.eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())
+			.eq(QuestDetailEntity::getQuestType, 3);
+		if (Func.equals(isInventory,1)){
+			queryWrapper.eq(QuestDetailEntity::getStockId, taskSearchDTO.getOrderId());
+		}else {
+			queryWrapper.eq(QuestDetailEntity::getOrderId, taskSearchDTO.getOrderId());
+		}
+		List<QuestDetailEntity> questDetailEntities = questDetailService.list(queryWrapper);
+		List<Integer> type = questDetailEntities.stream().filter(f -> Func.isNotEmpty(f.getQuestTarget())).map(QuestDetailEntity::getQuestTarget).distinct().collect(Collectors.toList());
+		if (Func.isEmpty(type)){
+			return null;
+		}
+		if (type.size() != 1){
+			log.error("###################orderId查询类型异常:{}",taskSearchDTO.getOrderId());
+			return null;
+		}
+		TaskContractVO contractVO = new TaskContractVO();
+		AtomicInteger total = new AtomicInteger();
+		AtomicInteger operationNum = new AtomicInteger();
+		ArrayList<TaskPackagelistVO> taskPackagelistVOS = new ArrayList<>();
+		List<String> orderCode = questDetailEntities.stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList());
+		if (orderCode.size() != 1){
+			log.error("###################orderId查询类型异常:{}",taskSearchDTO.getOrderId());
+			return null;
+		}
+		for (QuestDetailEntity questDetailEntity : questDetailEntities) {
+			TaskPackagelistVO packagelistVO = new TaskPackagelistVO();
+			total.getAndAdd(questDetailEntity.getStockNum());
+			if (questDetailEntity.getQuestStatus().equals(1)){
+				operationNum.getAndAdd(questDetailEntity.getStockNum());
+			}
+			packagelistVO.setOrderId(questDetailEntity.getOrderId());
+			if (type.get(0)==1){
+				packagelistVO.setOrderPackageCode(questDetailEntity.getOrdePackageCode());
+				packagelistVO.setQuantity(questDetailEntity.getStockNum());
+			}
+			if (type.get(0)==2){
+				packagelistVO.setWaybillNub(questDetailEntity.getWaybillNumber());
+				packagelistVO.setQuantity(questDetailEntity.getStockNum());
+			}
+			if(type.get(0)==3){
+				packagelistVO.setOrderId(questDetailEntity.getStockId());
+				packagelistVO.setQuantity(questDetailEntity.getStockNum());
+				packagelistVO.setMaterialCode(questDetailEntity.getMaterialCode());
+				packagelistVO.setMaterialName(questDetailEntity.getMaterialName());
+			}
+			packagelistVO.setAllocation(questDetailEntity.getPositionCode());
+			packagelistVO.setOrderCode(orderCode.get(0));
+			packagelistVO.setCurrentStatus("1");  // 默认在库
+			taskPackagelistVOS.add(packagelistVO);
+		}
+		List<Long> orderId = questDetailEntities.stream().map(QuestDetailEntity::getOrderId).distinct().collect(Collectors.toList());
+		if (type.get(0).equals(1)){
+			contractVO.setOrderId(orderId.get(0));
+			contractVO.setOrderCode(orderCode.get(0));
+			contractVO.setIsZero(0);
+			contractVO.setIsInventory(0);
+		}else if (type.get(0).equals(2)){
+			List<String> zeroOrderCode = questDetailEntities.stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList());
+			contractVO.setOrderId(orderId.get(0));
+			contractVO.setOrderCode(zeroOrderCode.get(0));
+			contractVO.setIsZero(1);
+			contractVO.setIsInventory(0);
+		}else if (type.get(0).equals(3)){
+			List<Long> inventoryOrderId = questDetailEntities.stream().map(QuestDetailEntity::getStockId).distinct().collect(Collectors.toList());
+			contractVO.setOrderId(inventoryOrderId.get(0));
+			contractVO.setIsZero(0);
+			contractVO.setIsInventory(1);
+		}else {
+			return null;
+		}
+		contractVO.setZktotal(total.get());
+		contractVO.setPackagelistVOList(taskPackagelistVOS);
+		contractVO.setTotal(total.get());
+		contractVO.setUnTotal(operationNum.get());
+		return R.data(contractVO);
+	}
+
 	@Override
 	public IPage<QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id) {
 		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
@@ -1094,132 +1215,252 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	@Override
 	@Transactional
 	public R queryContract(TaskSearchDTO taskSearchDTO) {
-		String goodsType = taskSearchDTO.getGoodsType();
+//		String goodsType = taskSearchDTO.getGoodsType();
 		Integer type = taskSearchDTO.getType();
-		if (type == 1){
+		if (Func.isEmpty(type)){
+			log.error("####################前端参数type传递有误:{}",type);
+			Resp.scanFail("操作失败", "服务器正忙...");
+		}
+		if (type == 1) {
 			String code = taskSearchDTO.getCode();
-			if (Func.isEmpty(code)){
+			if (Func.isEmpty(code)) {
 				log.error("####################订单合同号为空");
-				return Resp.scanFail("操作失败","请填写正确合同号");
+				return Resp.scanFail("操作失败", "请填写正确合同号");
 			}
 			//查询包件  赋予到订单上
-			List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCode(taskSearchDTO.getCode(), taskSearchDTO.getWarehouseId());
-			if (Func.isNotEmpty(entityListByOrderCode)){
-				DistributionParcelListEntity parcelListEntity = entityListByOrderCode.get(0);
-				taskSearchDTO.setCode(parcelListEntity.getOrderCode());
+			DistributionParcelListEntity entityListByOrderCode = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(taskSearchDTO.getCode(), taskSearchDTO.getWarehouseId());
+			if (Func.isNotEmpty(entityListByOrderCode) ) {
+				boolean flag = entityListByOrderCode.getConditions().equals(3);
+				if (flag){
+					log.error("####################扫描库存品包件:{}",flag);
+					return Resp.scanFail("操作失败", "请停止扫描库存品包件");
+				}
+				taskSearchDTO.setIncomingBatch(entityListByOrderCode.getOrderCode());
 			}
 		}
 		String incomingBatch = taskSearchDTO.getIncomingBatch();
-		if (Func.isEmpty(incomingBatch)){
+		if (Func.isEmpty(incomingBatch)) {
 			log.error("####################订单合同号为空");
-			return Resp.scanFail("操作失败","请输入正确合同号");
+			return Resp.scanFail("操作失败", "请输入正确合同号");
 		}
 		Long taskQuestId = taskSearchDTO.getTaskId();
-		verifyTask(taskQuestId,taskSearchDTO.getWarehouseId());
+		verifyTask(taskQuestId, taskSearchDTO.getWarehouseId());
 		List<TaskQuestChildEntity> taskQuestChildEntityList = taskQuestChildService.list(Wrappers.<TaskQuestChildEntity>query().lambda()
 			.eq(TaskQuestChildEntity::getQuestId, taskQuestId)
 			.eq(TaskQuestChildEntity::getRefType, 1));
-		DistributionStockArticleEntity stockArticleEntity = null;
-		AtomicInteger libNum = new AtomicInteger();
+		List<DistributionStockArticleEntity> stockArticleEntity = null;
 		List<String> marketNames = null;
-		if (Func.isEmpty(taskQuestId)){
+		if (Func.isEmpty(taskQuestId)) {
 			//全仓盘点
-			stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(incomingBatch,taskSearchDTO.getWarehouseId());
-		}else {
-			if (Func.isNotEmpty(taskQuestChildEntityList)){
-				 marketNames = taskQuestChildEntityList.stream().map(TaskQuestChildEntity::getRefName).collect(Collectors.toList());
-				stockArticleEntity = distributionStockArticleClient.findStockArticleByCodeAndMarketAndWarehouseId(taskSearchDTO.getCode(), marketNames,taskSearchDTO.getWarehouseId());
-			}else {
+			stockArticleEntity = distributionStockArticleClient.findStockArticleByCodeAndMarketAndWarehouseId(incomingBatch,"", taskSearchDTO.getWarehouseId());
+		} else {
+			if (Func.isNotEmpty(taskQuestChildEntityList)) {
+				marketNames = taskQuestChildEntityList.stream().map(TaskQuestChildEntity::getRefName).collect(Collectors.toList());
+				stockArticleEntity = distributionStockArticleClient.findStockArticleByCodeAndMarketAndWarehouseId(taskSearchDTO.getIncomingBatch(), String.join(",",marketNames), taskSearchDTO.getWarehouseId());
+			} else {
 				log.error("###################盘点任务查询失败");
 			}
 		}
-		switch (goodsType){
-			case "1":
-
-				if (Func.isEmpty(stockArticleEntity)){
-					log.error("###################此订单不属于该次盘点任务");
-					return Resp.scanFail("操作失败","不属于该任务");
-				}
-				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
-				parcelListEntity.setStockArticleId(stockArticleEntity.getId());
-				List<DistributionParcelListEntity> parcelList = distributionParcelListClient.getParcelList(parcelListEntity);
-				if (Func.isEmpty(parcelList)){
-					log.error("###################查询订单包件错误,订单ID:{}",stockArticleEntity.getId());
-				}
-				if (stockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){
-					parcelList.forEach(p->{
-						QuestDetailEntity questDetailEntity = new QuestDetailEntity();
-						if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yichuku.getValue()) && !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
-							WarehouseTrayEntity warehouseTrayEntity = baseMapper.selectTratInfo(p.getId(),taskSearchDTO.getWarehouseId());
-							WarehouseUpdownGoodsEntity updownGoodsPack = getUpdownGoodsPack(p.getId(), "3", p.getOrderPackageCode(), taskSearchDTO.getWarehouseId());
-							if (Func.isNotEmpty(warehouseTrayEntity)){
-								questDetailEntity.setTrayCode(warehouseTrayEntity.getPalletCode());
-								questDetailEntity.setTrayId(warehouseTrayEntity.getId());
-							}
-							if (Func.isNotEmpty(updownGoodsPack)){
-								questDetailEntity.setAllocationId(updownGoodsPack.getId());
-							}
-							questDetailEntity.setOrdePackageCode(p.getOrderPackageCode());
-							questDetailEntity.setOrderCode(p.getOrderCode());
-							questDetailEntity.setOrderId(p.getStockArticleId());
-							libNum.getAndAdd(p.getQuantity());
-							questDetailEntity.setIsNew(0);
-							questDetailEntity.setQuestId(taskQuestId);
-							questDetailEntity.setQuestStatus(0);
-							questDetailEntity.setQuestTarget(1);
-							questDetailEntity.setQuestType(3);
-							questDetailService.save(questDetailEntity);
+		List<TaskContractVO> taskContractVOS = new ArrayList<>();
+		String goodsType = taskSearchDTO.getGoodsType();
+		if (Func.isEmpty(goodsType)){
+			log.error("####################参数异常:{}",goodsType);
+		}
+		switch (goodsType) {
+			case "1" :
+				//查询任务表  是否需要进行盘点任务数据的插入
+				List<QuestDetailEntity> questDetailEntityList = questDetailService.list(Wrappers.<QuestDetailEntity>query().lambda()
+					.eq(QuestDetailEntity::getQuestId, taskQuestId)
+					.like(QuestDetailEntity::getOrderCode, incomingBatch)
+					.eq(QuestDetailEntity::getQuestType, 3)
+					.eq(QuestDetailEntity::getQuestTarget, 1)
+					.eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()));
+				if (Func.isNotEmpty(questDetailEntityList) && questDetailEntityList.size()>0){
+					TaskContractVO taskContractVO = new TaskContractVO();
+					Map<Long, List<QuestDetailEntity>> orderMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderId));
+					orderMap.forEach((k,v)->{
+						List<QuestDetailEntity> questDetailEntities = orderMap.get(k);
+						taskContractVO.setTotal(v.stream().mapToInt(QuestDetailEntity::getStockNum).sum());
+						taskContractVO.setZktotal(v.stream().mapToInt(QuestDetailEntity::getStockNum).sum());
+						taskContractVO.setOrderId(questDetailEntities.get(0).getOrderId());
+						taskContractVO.setOrderCode(questDetailEntities.get(0).getOrderCode());
+						taskContractVO.setIsZero(0);
+						taskContractVO.setIsInventory(0);
+						if (questDetailEntities.get(0).getQuestTarget().equals(2)){
+							taskContractVO.setIsZero(1);
 						}
+						taskContractVO.setUnTotal(v.stream().filter(f->Func.equals(f.getQuestStatus(),1)).mapToInt(QuestDetailEntity::getStockNum).sum());
+						taskContractVOS.add(taskContractVO);
 					});
 				}else {
-					QuestDetailEntity questDetailEntity = new QuestDetailEntity();
-					DistributionStockArticleEntity stockArticleInfo = getStockArticleInfo(stockArticleEntity.getId());
-					WarehouseUpdownGoodsEntity updownGoodsPack = getUpdownGoodsPack(stockArticleInfo.getId(), "1", stockArticleInfo.getOrderCode(), taskSearchDTO.getWarehouseId());
-					List<WarehouseTrayEntity> warehouseTrayEntities = baseMapper.selectZeroOrderTratInfo(stockArticleInfo.getId(),taskSearchDTO.getWarehouseId());
-					if (Func.isNotEmpty(warehouseTrayEntities)){
-						List<String> strings = warehouseTrayEntities.stream().map(WarehouseTrayEntity::getPalletCode).distinct().collect(Collectors.toList());
-						questDetailEntity.setTrayCode(String.join(",",strings));
+					if (Func.isEmpty(stockArticleEntity)) {
+						log.error("###################此订单不属于该次盘点任务");
+						return Resp.scanFail("操作失败", "不属于该任务");
 					}
-					if (Func.isNotEmpty(updownGoodsPack)){
-						questDetailEntity.setAllocationId(updownGoodsPack.getId());
+					for (DistributionStockArticleEntity distributionStockArticleEntity : stockArticleEntity) {
+						TaskContractVO taskContractVO = new TaskContractVO();
+						taskContractVO.setOrderId(distributionStockArticleEntity.getId());
+						taskContractVO.setOrderCode(distributionStockArticleEntity.getOrderCode());
+						taskContractVO.setTotal(distributionStockArticleEntity.getTotalNumber());
+						//查询已经【盘点的包件数量
+						Long count = questDetailService.count(Wrappers.<QuestDetailEntity>query().lambda()
+							.eq(QuestDetailEntity::getOrderId, distributionStockArticleEntity.getId())
+							.eq(QuestDetailEntity::getQuestId, taskQuestId)
+							.eq(QuestDetailEntity::getQuestType, 3)
+							.eq(QuestDetailEntity::getQuestStatus, 1));
+						taskContractVO.setUnTotal(count.intValue());
+						taskContractVOS.add(taskContractVO);
+						List<DistributionParcelListEntity> parcelList = distributionParcelListClient.getParcelListByStockArticleId(distributionStockArticleEntity.getId());
+						if (Func.isEmpty(parcelList)) {
+							log.error("###################查询订单包件错误,订单ID:{}", distributionStockArticleEntity.getId());
+						}
+						if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
+							AtomicInteger libNum = new AtomicInteger();
+							parcelList.forEach(p -> {
+								QuestDetailEntity questDetailEntity = new QuestDetailEntity();
+								if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yichuku.getValue()) && !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
+									WarehouseTrayEntity warehouseTrayEntity = baseMapper.selectTratInfo(p.getId(), taskSearchDTO.getWarehouseId());
+									WarehouseUpdownGoodsEntity updownGoodsPack = getUpdownGoodsPack(p.getId(), "3", p.getOrderPackageCode(), taskSearchDTO.getWarehouseId());
+									if (Func.isNotEmpty(warehouseTrayEntity)) {
+										questDetailEntity.setTrayCode(warehouseTrayEntity.getPalletCode());
+										questDetailEntity.setTrayId(warehouseTrayEntity.getId());
+									}
+									if (Func.isNotEmpty(updownGoodsPack)) {
+										questDetailEntity.setAllocationId(updownGoodsPack.getId());
+									}
+									questDetailEntity.setOrdePackageCode(p.getOrderPackageCode());
+									questDetailEntity.setOrderCode(p.getOrderCode());
+									questDetailEntity.setOrderId(p.getStockArticleId());
+									libNum.getAndAdd(p.getQuantity());
+									questDetailEntity.setIsNew(0);
+									questDetailEntity.setWaybillNumber(p.getWaybillNumber());
+									questDetailEntity.setOrderPackageId(p.getId());
+									questDetailEntity.setWarehouseId(taskSearchDTO.getWarehouseId());
+									questDetailEntity.setQuestId(taskQuestId);
+									questDetailEntity.setQuestStatus(0);
+									questDetailEntity.setQuestTarget(1);
+									questDetailEntity.setQuestType(3);
+									questDetailService.save(questDetailEntity);
+								}
+							});
+							taskContractVO.setZktotal(libNum.get());
+						} else {
+							//查询任务表  是否需要进行盘点任务数据的插入
+							List<QuestDetailEntity> zeroQuestDetailEntityList = questDetailService.list(Wrappers.<QuestDetailEntity>query().lambda()
+								.eq(QuestDetailEntity::getQuestId, taskQuestId)
+								.like(QuestDetailEntity::getOrderCode, incomingBatch)
+								.eq(QuestDetailEntity::getQuestType, 3)
+								.eq(QuestDetailEntity::getQuestTarget, 2)
+								.eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()));
+							if (Func.isNotEmpty(zeroQuestDetailEntityList)){
+								for (QuestDetailEntity questDetailEntity : zeroQuestDetailEntityList) {
+									TaskContractVO contractVO = new TaskContractVO();
+									contractVO.setTotal(questDetailEntity.getStockNum());
+									contractVO.setZktotal(questDetailEntity.getStockNum());
+									contractVO.setOrderId(questDetailEntity.getOrderId());
+									contractVO.setOrderCode(questDetailEntity.getOrderCode());
+									contractVO.setIsZero(0);
+									contractVO.setIsInventory(0);
+									contractVO.setUnTotal(0);
+									if (questDetailEntity.getQuestTarget().equals(2)){
+										taskContractVO.setIsZero(1);
+									}
+									if (questDetailEntity.getQuestStatus().equals(1)){
+										taskContractVO.setUnTotal(questDetailEntity.getStockNum());
+									}
+									taskContractVOS.add(contractVO);
+								}
+							}else {
+								AtomicInteger libNum = new AtomicInteger();
+								QuestDetailEntity questDetailEntity = new QuestDetailEntity();
+								DistributionStockArticleEntity stockArticleInfo = getStockArticleInfo(distributionStockArticleEntity.getId());
+								WarehouseUpdownGoodsEntity updownGoodsPack = getUpdownGoodsPack(stockArticleInfo.getId(), "1", stockArticleInfo.getOrderCode(), taskSearchDTO.getWarehouseId());
+								List<WarehouseTrayEntity> warehouseTrayEntities = baseMapper.selectZeroOrderTratInfo(stockArticleInfo.getId(), taskSearchDTO.getWarehouseId());
+								if (Func.isNotEmpty(warehouseTrayEntities)) {
+									List<String> strings = warehouseTrayEntities.stream().map(WarehouseTrayEntity::getPalletCode).distinct().collect(Collectors.toList());
+									questDetailEntity.setTrayCode(String.join(",", strings));
+								}
+								if (Func.isNotEmpty(updownGoodsPack)) {
+									questDetailEntity.setAllocationId(updownGoodsPack.getId());
+								}
+								questDetailEntity.setOrderCode(stockArticleInfo.getOrderCode());
+								questDetailEntity.setOrderId(stockArticleInfo.getId());
+								libNum.getAndAdd(stockArticleInfo.getHandQuantity());
+								questDetailEntity.setIsNew(0);
+								questDetailEntity.setQuestId(taskQuestId);
+								questDetailEntity.setWaybillNumber(stockArticleInfo.getWaybillNumber());
+								questDetailEntity.setWarehouseId(stockArticleInfo.getWarehouseId());
+								questDetailEntity.setQuestStatus(0);
+								questDetailEntity.setQuestTarget(1);
+								questDetailEntity.setStockNum(stockArticleInfo.getHandQuantity());
+								questDetailEntity.setQuestType(3);
+								questDetailService.save(questDetailEntity);
+							}
+						}
 					}
-					questDetailEntity.setOrderCode(stockArticleInfo.getOrderCode());
-					libNum.getAndAdd(stockArticleInfo.getHandQuantity());
-					questDetailEntity.setIsNew(0);
-					questDetailEntity.setQuestId(taskQuestId);
-					questDetailEntity.setQuestStatus(0);
-					questDetailEntity.setQuestTarget(1);
-					questDetailEntity.setQuestType(3);
-					questDetailService.save(questDetailEntity);
 				}
 				break;
 			case "2":
 				//库存品
-				List<DistributionStockListEntity> stockListByWarehouseIdAndMarketAndStockListInfo = distributionStockListClient.getStockListByWarehouseIdAndMarketAndStockListInfo(incomingBatch, marketNames, taskSearchDTO.getWarehouseId());
-				stockListByWarehouseIdAndMarketAndStockListInfo.forEach(s->{
-					QuestDetailEntity questDetailEntity = new QuestDetailEntity();
-					questDetailEntity.setOrderCode(s.getOrderCode());
-					questDetailEntity.setIsNew(0);
-					questDetailEntity.setQuestId(taskQuestId);
-					questDetailEntity.setQuestStatus(0);
-					questDetailEntity.setQuestTarget(1);
-					questDetailEntity.setQuestType(3);
-					libNum.getAndAdd(s.getQuantityStock() - s.getOutboundQuantity());
-					questDetailEntity.setStockId(s.getId());
-					questDetailService.save(questDetailEntity);
-				});
+				//查询任务表  是否需要进行盘点任务数据的插入
+				List<QuestDetailEntity> inventoryQuestDetailEntityList = questDetailService.list(Wrappers.<QuestDetailEntity>query().lambda()
+					.eq(QuestDetailEntity::getQuestId, taskQuestId)
+					.like(QuestDetailEntity::getOrderCode, incomingBatch)
+					.or()
+					.eq(QuestDetailEntity::getIncomingBatch,incomingBatch)
+					.eq(QuestDetailEntity::getQuestType, 3)
+					.eq(QuestDetailEntity::getQuestTarget, 3)
+					.eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()));
+				if (Func.isNotEmpty(inventoryQuestDetailEntityList) && inventoryQuestDetailEntityList.size()>0){
+					int sum = inventoryQuestDetailEntityList.stream().filter(iqd -> Func.equals(iqd.getQuestStatus(), 1)).mapToInt(QuestDetailEntity::getStockNum).sum();
+					inventoryQuestDetailEntityList.forEach(iqd->{
+						TaskContractVO taskContractVO = new TaskContractVO();
+						taskContractVO.setTotal(iqd.getStockNum());
+						taskContractVO.setZktotal(iqd.getStockNum());
+						taskContractVO.setOrderId(iqd.getStockId());
+						taskContractVO.setOrderCode(iqd.getOrderCode());
+						taskContractVO.setUnTotal(sum);
+						taskContractVO.setIsZero(0);
+						taskContractVO.setIsInventory(1);
+						taskContractVOS.add(taskContractVO);
+					});
+				}else {
+					List<DistributionStockListEntity> stockListByWarehouseIdAndMarketAndStockListInfo = distributionStockListClient.getStockListByWarehouseIdAndMarketAndStockListInfo(incomingBatch, marketNames, taskSearchDTO.getWarehouseId());
+					if (Func.isEmpty(stockListByWarehouseIdAndMarketAndStockListInfo)){
+						return Resp.scanFail("操作失败","该库存品不存在此任务中");
+					}
+					stockListByWarehouseIdAndMarketAndStockListInfo.forEach(s -> {
+						QuestDetailEntity questDetailEntity = new QuestDetailEntity();
+						questDetailEntity.setOrderCode(s.getOrderCode());
+						questDetailEntity.setIsNew(0);
+						questDetailEntity.setQuestId(taskQuestId);
+						questDetailEntity.setQuestStatus(0);
+						questDetailEntity.setQuestTarget(3);
+						questDetailEntity.setQuestType(3);
+						questDetailEntity.setMaterialName(s.getDescriptionGoods());
+						questDetailEntity.setMaterialCode(s.getCargoNumber());
+						questDetailEntity.setStockNum(s.getQuantityStock());
+						questDetailEntity.setWarehouseId(taskSearchDTO.getWarehouseId());
+						questDetailEntity.setIncomingBatch(s.getIncomingBatch());
+						questDetailEntity.setMarketName(s.getMarketName());
+						questDetailEntity.setStockId(s.getId());
+						questDetailEntity.setOrderCode(s.getOrderCode());
+						questDetailService.save(questDetailEntity);
+						TaskContractVO taskContractVO = new TaskContractVO();
+						taskContractVO.setOrderId(questDetailEntity.getStockId());
+						taskContractVO.setOrderCode(questDetailEntity.getOrderCode());
+						taskContractVO.setTotal(questDetailEntity.getStockNum());
+						taskContractVO.setZktotal(questDetailEntity.getStockNum());
+						taskContractVO.setUnTotal(0);
+						taskContractVOS.add(taskContractVO);
+					});
+				}
 				break;
 			default:
 				log.error("####################缺少货物类型字段");
 				break;
 		}
-		TaskContractVO taskContractVO = new TaskContractVO();
-		taskContractVO.setTotal(stockArticleEntity.getTotalNumber());
-		taskContractVO.setOrderId(stockArticleEntity.getId());
-		taskContractVO.setUnTotal(0);
-		taskContractVO.setZktotal(libNum.get());
-
-		return R.data(taskContractVO);
+		return R.data(taskContractVOS);
 	}
 
 
@@ -1229,23 +1470,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 
-	private void verifyTask(Long taskId,Long warehouseId){
+	private void verifyTask(Long taskId, Long warehouseId) {
 		TaskQuestEntity questEntity = getById(taskId);
-		if(Objects.isNull(questEntity)){
-			log.warn("###########verifyTask: 盘点任务不存在 taskId={}",taskId);
-			throw new CustomerException(403,"盘点任务不存在");
+		if (Objects.isNull(questEntity)) {
+			log.warn("###########verifyTask: 盘点任务不存在 taskId={}", taskId);
+			throw new CustomerException(403, "盘点任务不存在");
 		}
 		Long wid = questEntity.getWarehouseId();
-		if(!wid.equals(warehouseId)){
-			log.warn("###########verifyTask: 盘点任务不属于当前仓 taskId={}",taskId);
-			throw new CustomerException(403,"盘点任务不属于当前仓");
+		if (!wid.equals(warehouseId)) {
+			log.warn("###########verifyTask: 盘点任务不属于当前仓 taskId={}", taskId);
+			throw new CustomerException(403, "盘点任务不属于当前仓");
 		}
 		Long now = new Date().getTime();
 		String endTime = questEntity.getEndTime();
 		Long end = CommonUtil.StringToDate(endTime).getTime();
-		if(now > end){
-			log.warn("###########verifyTask: 盘点任务已结束 taskId={}",taskId);
-			throw new CustomerException(403,"盘点任务已结束");
+		if (now > end) {
+			log.warn("###########verifyTask: 盘点任务已结束 taskId={}", taskId);
+			throw new CustomerException(403, "盘点任务已结束");
 		}
 	}