add:增加对盘点任务中未盘点明细的导出功能

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

@@ -25,6 +25,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO;
 import com.logpm.warehouse.dto.TaskSearchDTO;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import com.logpm.warehouse.excel.QuestContrastExcel;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.logpm.warehouse.service.ITaskQuestService;
 import com.logpm.warehouse.vo.QuestContrastVO;
@@ -164,6 +165,25 @@ public class TaskQuestController extends BladeController {
 		return R.data(page);
 	}
 
+	/**
+	 * 盘点任务 未盘点数据导出
+	 * @return
+	 */
+	@GetMapping("/exportContrastStockInfo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "盘点任务 未盘点数据导出", notes = "传入id")
+	public void exportContrastStockInfo( HttpServletResponse response,QuestDetailDTO questDetailDTO,Query query){
+//		IPage<QuestDetailVO> page = taskQuestService.selectTaskDataInfo(questDetailDTO,Condition.getPage(query));
+
+		List<TaskQueryDataExcel> data =taskQuestService.exportContrastStockInfo(questDetailDTO);
+//		List<QuestContrastExcel> list = taskQuestService.exportGetContrastInfo(questDetailDTO);
+
+
+		ExcelUtil.export(response, "未盘点任务数据" + DateUtil.time(), "未盘点任务数据数据表", data, TaskQueryDataExcel.class);
+
+	}
+
+
 	/**
 	 *盘点任务 查询盘点对比数据
  	 * @return

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java

@@ -0,0 +1,100 @@
+package com.logpm.warehouse.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class TaskQueryDataExcel  implements Serializable {
+
+
+
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String marketName;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String orderPackageCode;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("品类")
+	private String questTarget;
+
+	@ColumnWidth(20)
+	@ExcelProperty("盘点状态")
+	private String questStatus;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("货位")
+	private String positionCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private String materialName;
+
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private String stockNum;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("托盘名称")
+	private String trayName;
+
+	/**
+	 * 一级名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级名称")
+	private String oneProduct;
+	/**
+	 * 二级名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级名称")
+	private String twoProduct;
+	/**
+	 * 三级名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级名称")
+	private String thirdProduct;
+
+	/**
+	 * 产品名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("产品名称")
+	private String categoryName;
+
+	/**
+	 * 物料编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料编码")
+	private String materialCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("品牌名称")
+	private String brandName;
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java

@@ -22,6 +22,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity;
 import com.logpm.warehouse.entity.QuestDetailEntity;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import com.logpm.warehouse.entity.WarehouseTrayEntity;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.vo.*;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -186,4 +187,6 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 	List<QuestDetailVO> findListByTrayCode(@Param("questNum") String questNum, @Param("trayCode") String trayCode);
 
 	List<DistributionStockListEntity> findStockList(@Param("param") TaskSearchDTO taskSearchDTO);
+
+	List<TaskQueryDataExcel> selectContrastStockInfo(@Param("questNum") String questNum);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -653,5 +653,23 @@
             </foreach>
         </if>
     </select>
+    <select id="selectContrastStockInfo" resultType="com.logpm.warehouse.excel.TaskQueryDataExcel">
+        select
+        order_code,
+        order_package_code,
+        quest_target,
+        tray_name,
+        position_code,
+        firsts oneProduct,
+        second as twoProduct,
+        third_product as thirdProduct,
+        market_name,
+        material_name,
+        stock_num,
+        brand_name,
+        material_code,
+        category_name
+        from ${questNum} lqd where quest_status =0
+    </select>
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java

@@ -26,6 +26,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity;
 import com.logpm.warehouse.entity.QuestDetailEntity;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import com.logpm.warehouse.excel.QuestContrastExcel;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.logpm.warehouse.vo.*;
 import org.springblade.core.mp.base.BaseService;
@@ -295,4 +296,10 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 
 	List<DistributionStockListEntity> findStockList(TaskSearchDTO taskSearchDTO);
 
+	/**
+	 * 导出未盘点数据
+	 * @param questDetailDTO
+	 * @return
+	 */
+	List<TaskQueryDataExcel> exportContrastStockInfo(QuestDetailDTO questDetailDTO);
 }

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

@@ -38,6 +38,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO;
 import com.logpm.warehouse.dto.TaskSearchDTO;
 import com.logpm.warehouse.entity.*;
 import com.logpm.warehouse.excel.QuestContrastExcel;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.logpm.warehouse.mapper.TaskQuestMapper;
 import com.logpm.warehouse.mapper.WarehouseTrayGoodsMapper;
@@ -924,53 +925,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		IPage<QuestDetailEntity> questDetailEntityIPage = baseMapper.selectTaskInfoIPage(page, questDetailDTO.getQuestNum(), questDetail);
 		IPage<QuestDetailVO> page1 = new Page<>();
 		List<QuestDetailVO> questDetailVOS = new ArrayList<>();
-		questDetailEntityIPage.getRecords().stream().forEach(i -> {
+		questDetailEntityIPage.getRecords().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());
-					questDetailVO.setFirsts(stockArticleInfo.get(0).getDescriptionGoods());
-					questDetailVO.setDescriptionGoods(stockArticleInfo.get(0).getDescriptionGoods());
-
-				}
-
-			}else if(i.getQuestTarget().equals(3) && ObjectUtils.isNull(i.getOrderPackageId())){
-				//库存平 无数据的
-				DistributionStockListEntity stockListById = distributionStockListClient.getStockListById(i.getStockId());
-				if(ObjectUtils.isNotNull( stockListById)){
-					questDetailVO.setOrderCode(stockListById.getIncomingBatch());
-					questDetailVO.setMaterialName(stockListById.getDescriptionGoods() );
-					questDetailVO.setMaterialCode(stockListById.getCargoNumber () );
-					questDetailVO.setBrandName(stockListById.getBrandName());
-				}
-			}*/
-			/*if(ObjectUtils.isNotNull(i.getTrayId())){
-				//查询托盘名称
-				List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId());
-				if(ObjectUtils.isNotNull(trayEntityList)){
-				questDetailVO.setTrayName(trayEntityList.get(0).getPalletName());
-				}
-			}*/
 			if (!i.getQuestStatus().equals(0)) {
 				R<List<User>> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser()));
 				if (ObjectUtils.isNotNull(listR.getData())) {
@@ -3365,6 +3322,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		return R.data(taskContractVOS);
 	}
 
+	@Override
+	public List<TaskQueryDataExcel> exportContrastStockInfo(QuestDetailDTO questDetailDTO) {
+
+
+		List<TaskQueryDataExcel> datas =baseMapper.selectContrastStockInfo( questDetailDTO.getQuestNum());
+		return datas;
+
+
+
+	}
 
 	private String getQuestNum(String warehouseCode) {
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -3398,4 +3365,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		}
 	}
 
+
+
 }