修改盘点创建盘点数据

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -43,11 +43,16 @@ public interface IDistributionParcelListClient {
     String API_PREFIX = "/client";
     String TOP = API_PREFIX + "/top1";
     String TOPPARCELLIST = API_PREFIX + "/getParcelList";
+    String GETPARCELLISTID = API_PREFIX + "/getParcelListId";
     String GETPARCELLISTINFO = API_PREFIX + "/getParcelListInfo";
 
 	@PostMapping(TOPPARCELLIST)
 	List<DistributionParcelListEntity> getParcelList(@RequestBody DistributionParcelListEntity parcelListEntity);
 
+
+	@GetMapping(GETPARCELLISTID)
+	DistributionParcelListEntity getParcelListId(@RequestParam String id);
+
     /**
      * 获取在库订单包件清单列表
      *

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -66,6 +66,16 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		);
 	}
 
+	/**
+	 * 根据包件id查询数据
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public DistributionParcelListEntity getParcelListId(String id) {
+		return distributionParcelListService.getById(id);
+	}
+
 	@Override
     @GetMapping(TOP)
     public BladePage<DistributionParcelListEntity> top(Integer current, Integer size) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -99,7 +99,7 @@
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         <where>
-            ldsa.warehouse_id = #{param.warehouseId} and ldpl.order_package_status != '70'
+            ldsa.warehouse_id = #{param.warehouseId} and ldpl.order_package_status in (20,30,40)
             <if test="param.mallId != null and param.mallId != ''">  and ldsa.mall_id = #{param.mallId} </if>
             <if test="param.genre != null and param.genre != ''">and  ldsa.genre = #{param.genre}</if>
             <if test="param.isZero != null and param.isZero != ''">and ldsa.is_zero = #{param.isZero}</if>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -136,7 +136,7 @@ public class TaskQuestController extends BladeController {
 
 
 	/**
-	 * 查询盘点数据
+	 * 查询盘点明细数据
  	 * @return
 	 */
 	@GetMapping("/getDetailInfo")
@@ -270,7 +270,7 @@ public class TaskQuestController extends BladeController {
 	}
 
 	/**
-	 * 盘点任务 盘点后的数据修改
+	 * 盘点任务 盘点后的数据查询
 	 */
 	@GetMapping("/getQuestChildInfo")
 	@ApiOperationSupport(order = 5)

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -175,7 +175,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	BladeUser user = AuthUtil.getUser();
 	if(!parcelListInfo.isEmpty()){
 		List<QuestDetailEntity> detailEntityList = new ArrayList<>();
-		parcelListInfo.stream().forEach( i ->{
+		parcelListInfo.forEach( i ->{
 
 			QuestDetailEntity detailEntity = new QuestDetailEntity();
 			detailEntity.setId(getTaskID());
@@ -190,7 +190,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			detailEntity.setOrderId(i.getStockArticleId());
 //					detailEntity.setQuestType();
 			//盘点对象;1.定制品 2零担 3 库存品
-			detailEntity.setQuestTarget(i.getConditions());
+			if(ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(1) ){
+				detailEntity.setQuestTarget(i.getConditions());
+			}else if(ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(2)){
+				detailEntity.setQuestTarget(3); // 库存品
+			}else{
+				log.info("包件信息！数据信息不存在！！");
+				return;
+			}
+//			detailEntity.setQuestTarget(1);
 			detailEntity.setOrderPackageCode(i.getOrderPackageCode());
 			detailEntity.setWaybillNumber(i.getWaybillNumber());
 			detailEntity.setOrderPackageId(i.getId());
@@ -224,7 +232,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		stockArticle.setMallId(ObjectUtils.isNotNull(stockArticleEntity.getMallId()) ? stockArticleEntity.getMallId() : null);
 		stockArticle.setIsZero("1");
 		List<DistributionStockArticleEntity> stockArticleInfo = distributionStockArticleClient.getStockArticleInfo(stockArticle);
-		if(!stockArticleInfo.isEmpty()){
+		if(ObjectUtils.isNotNull(stockArticleInfo) && !stockArticleInfo.isEmpty()){
 			detailEntityList.addAll(handleIsZeroList(stockArticleInfo,taskQuest));
 		}
 		log.debug("零担 和 包件数据=={}",detailEntityList.size());
@@ -817,6 +825,37 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		questDetailEntityIPage.getRecords().stream().forEach( i ->{
 			QuestDetailVO questDetailVO = new QuestDetailVO();
 			BeanUtil.copyProperties(i,questDetailVO);
+			//查询包件信息
+			if(ObjectUtils.isNotNull(i.getOrderPackageId()) ){
+
+				DistributionParcelListEntity parcelListId = distributionParcelListClient.getParcelListId(String.valueOf(i.getOrderPackageId()));
+				if(ObjectUtils.isNotNull(parcelListId)){
+					questDetailVO.setFirsts(parcelListId.getFirsts());
+					questDetailVO.setSecond(parcelListId.getSecond());
+					questDetailVO.setThirdProduct(parcelListId.getThirdProduct());
+					questDetailVO.setMaterialName(parcelListId.getMaterialName());
+					questDetailVO.setMaterialCode(parcelListId.getMaterialCode());
+					questDetailVO.setBrandName(parcelListId.getBrandName());
+				}
+			}else if(i.getQuestTarget().equals(2)){
+				//零担
+				DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+				stockArticleEntity.setWarehouseId(i.getWarehouseId());
+				stockArticleEntity.setId(i.getOrderId());
+				List<DistributionStockArticleEntity> stockArticleInfo = distributionStockArticleClient.getStockArticleInfo(stockArticleEntity);
+				if(!stockArticleInfo.isEmpty()){
+					//
+					questDetailVO.setOrderCode(stockArticleInfo.get(0).getOrderCode());
+				}
+
+			}else if(i.getQuestTarget().equals(3) && ObjectUtils.isNull(i.getOrderPackageId())){
+				//库存平 无数据的
+				DistributionStockListEntity stockListById = distributionStockListClient.getStockListById(i.getStockId());
+				if(ObjectUtils.isNotNull( stockListById)){
+					questDetailVO.setOrderCode(stockListById.getIncomingBatch());
+				}
+			}
+
 			questDetailVOS.add(questDetailVO);
 
 		});
@@ -1072,7 +1111,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	@Override
 	public Boolean updateByInfo(TaskQuestDTO taskQuest) {
 
-		return baseMapper.updateById(taskQuest) > 0 ? true : false;
+		return baseMapper.updateById(taskQuest) > 0;
 	}
 
 	/**