修改托盘ID查询

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java

@@ -1,8 +1,11 @@
 package com.logpm.warehouse.vo;
 
+import com.logpm.warehouse.entity.QuestDetailEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TaskTrayVO {
 
@@ -47,4 +50,10 @@ public class TaskTrayVO {
 	 */
 	@ApiModelProperty(value = "盘点件数")
 	private Integer unTotal;
+
+	/**
+	 *
+	 */
+	private List<QuestDetailEntity>  list;
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java

@@ -44,6 +44,9 @@ public class TaskSearchDTO {
 	@ApiModelProperty(value = "搜索code")
 	private String trayCode;
 
+	@ApiModelProperty(value = "托盘ID")
+	private Long trayId;
+
 	/**
 	 * type
 	 */

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

@@ -273,7 +273,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			List<QuestDetailEntity> list = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
 //			List<TaskTrayVO> list =	getTaskTrayInfo(page,taskSearchDTO,collect);// 查询有没有当次盘点任务的托盘数据
 			if (!list.isEmpty()){ //有盘点数据
-				return R.data(getTaskTrayInfo(list));
+				return R.data(getTaskTrayInfo(list,1));
 			}else{
 				//添加扫描的托盘信息
 				//添加托盘上面的数据
@@ -283,7 +283,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 						return Resp.scanFail("没有盘点信息！","没有盘点信息！");
 					case 1:
 						List<QuestDetailEntity> questDetailList = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
-						return R.data(getTaskTrayInfo(questDetailList));
+						return R.data(getTaskTrayInfo(questDetailList,1));
 					case 2:
 						return Resp.scanFail("托盘信息未找到！","托盘信息未找到！");
 					case 3:
@@ -298,7 +298,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			List<QuestDetailEntity> list1 = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
 			if(!list1.isEmpty()){
 //				int sum = list1.stream().mapToInt(QuestDetailEntity::getStockNum).sum(); //总数
-				return R.data(getTaskTrayInfo(list1));
+				return R.data(getTaskTrayInfo(list1,1));
 			}
 			return  null;
 		}
@@ -306,10 +306,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	/**
-	 * 查询托盘信息
+	 * 出来托盘信息
 	 * @return
 	 */
-	private List<TaskTrayVO> getTaskTrayInfo(List<QuestDetailEntity> list1){
+	private List<TaskTrayVO> getTaskTrayInfo(List<QuestDetailEntity> list1,int type){
 //		return 	baseMapper.selecttrayList(page,taskSearchDTO,collect);// 查询有没有当次盘点任务的托盘数据
 
 		List<TaskTrayVO> list = new ArrayList<>();
@@ -319,6 +319,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				taskTrayVO.setTrayId(k);
 				AtomicReference<Integer> num = new AtomicReference<>(0); //总数
 				AtomicReference<Integer> unTotal = new AtomicReference<>(0); //盘点数
+				if(type == 2){
+					//添加包件信息
+				taskTrayVO.setList(v);
+				}
 				v.forEach( p ->{
 					taskTrayVO.setTrayCode(p.getTrayCode());
 					num.set(num.get() + p.getStockNum());
@@ -360,9 +364,17 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		);
 	}
 
+	/**
+	 * 盘点根据托盘id查询明细
+	 * @param page
+	 * @param taskSearchDTO
+	 * @return
+	 */
 	@Override
 	public R trayListInfo(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
-		return null;
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		List<QuestDetailEntity> questDetailList = getQuestDetailList(taskSearchDTO, myCurrentWarehouse.getId(), taskSearchDTO.getTrayId());
+		return R.data(getTaskTrayInfo(questDetailList,2));
 	}
 
 
@@ -404,6 +416,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 									}
 								}
 								questDetail.setOrderId(i.getAssociationId());
+								questDetail.setOrderCode(i.getAssociationValue());
 								questDetail.setQuestTarget(2);//零担
 								questDetail.setCategoryName(i.getGoodsName());
 								WarehouseUpdownGoodsEntity updownGoodsEntity = getUpdownGoodsPack(i.getAssociationId(),"1",i.getAssociationValue(),warehouseId);
@@ -422,6 +435,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 									continue;
 								}
 								questDetail.setQuestTarget(1);//
+								questDetail.setOrderCode(distributionStockArticleEntity.getOrderCode());//
 								questDetail.setOrdePackageCode(i.getAssociationValue());//包条码
 								questDetail.setOrderPackageId(i.getAssociationId());//包件ID
 								DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
@@ -451,6 +465,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 								if(!list.stream().anyMatch(d -> d.getRefId().equals(stockListInfo.getMarketId()))){
 									continue;
 								}
+								stockListEntity.setOrderCode(stockListInfo.getOrderCode());
 								DistributionStockListVO queryData = distributionStockListClient.getQueryData(stockListEntity);
 								WarehouseUpdownGoodsEntity warehouseUpdownGoods = getUpdownGoodsStockList(i.getMarketId(),"4",i.getIncomingBatch(),warehouseId, i.getAssociationId(), i.getAssociationValue());
 								if(Optional.ofNullable(warehouseUpdownGoods).isPresent()){