1.修复仓库盘点任务明细导出

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

@@ -223,6 +223,17 @@ public class TaskQuestController extends BladeController {
 	}
 
 
+	@GetMapping("/export-panDataWithPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "导出已盘数据明细维度", notes = "传入questDetailDTO")
+	public void exportPanDataWithPackage(QuestDetailDTO questDetailDTO, HttpServletResponse response){
+		String questNum = questDetailDTO.getQuestNum();
+		List<QuestContrastPackageExcelVO> list = taskQuestService.exportPanDataWithPackage(questDetailDTO);
+		ExcelUtil.export(response, "盘点任务【"+questNum+"】数据" + DateUtil.time(), "盘点明细数据表", list, QuestContrastPackageExcelVO.class);
+
+	}
+
+
 	/**
 	 * 导出数据
 	 */

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

@@ -53,7 +53,4 @@ public class QuestDetailDTO extends QuestDetailEntity {
 
 	private  String endTime;// 结束时间
 
-
-
-
 }

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

@@ -201,4 +201,6 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
     Integer findStockNum(@Param("questDetailId") Long questDetailId, @Param("tableName") String tableName);
 
 	List<QuestContrastPackageExcelVO> exportAllDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO);
+
+	List<QuestContrastPackageExcelVO> exportPanDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO);
 }

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

@@ -747,4 +747,45 @@
         where is_deleted = 0
     </select>
 
+    <select id="exportPanDataWithPackage" resultType="com.logpm.warehouse.excel.QuestContrastPackageExcelVO">
+        select order_code orderCode,
+               waybill_number waybillNumber,
+               order_package_code orderPackageCode,
+               material_code materialCode,
+               material_name materialName,
+               firsts firsts,
+               `second` seconds,
+               third_product thirdProduct,
+               case when quest_type = 1 then '随机'
+                    when quest_type = 2 then '库位'
+                    when quest_type = 3 then '订单'
+                    when quest_type = 4 then '托盘'
+                    else '未知'
+                   end questType,
+               case when quest_target = 1 then '订制品'
+                    when quest_target = 2 then '零担'
+                    when quest_target = 3 then '库存品'
+                    else '未知'
+                   end questTarget,
+               case when quest_status = 1 then '已盘点'
+                    when quest_status = 3 then '已排除'
+                    else '未盘点'
+                   end questStatus,
+               category_name categoryName,
+               brand_name brandName,
+               market_name marketName,
+               stock_num stockNum,
+               incoming_batch incomingBatch,
+               send_warehouse_name sendWarehouseName,
+               tray_name trayName,
+               position_code positionCode,
+               new_tray_name newTrayName,
+               IFNULL(grounding_position_code,position_code) groundingPositionCode,
+               inventory_time inventoryTime,
+               inventory_user inventoryUser
+        from ${param.questNum}
+        where is_deleted = 0
+        AND quest_status = 1
+    </select>
+
 </mapper>

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

@@ -309,4 +309,5 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 
 	List<QuestContrastPackageExcelVO> exportAllDataWithPackage(QuestDetailDTO questDetailDTO);
 
+	List<QuestContrastPackageExcelVO> exportPanDataWithPackage(QuestDetailDTO questDetailDTO);
 }

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

@@ -3497,6 +3497,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		return baseMapper.exportAllDataWithPackage(questDetailDTO);
 	}
 
+	@Override
+	public List<QuestContrastPackageExcelVO> exportPanDataWithPackage(QuestDetailDTO questDetailDTO) {
+		return baseMapper.exportPanDataWithPackage(questDetailDTO);
+	}
+
 	private String getQuestNum(String warehouseCode) {
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
 //		return "PDRW_" + warehouseCode + "_" + simpleDateFormat.format(new Date()) + String.format("%03d", new Random().nextInt(900) + 100);