From bb0c78977764e7c8806cb9df7f059a8e481a6489 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 19 Aug 2024 17:24:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TaskQuestController.java       | 11 +++++
 .../logpm/warehouse/dto/QuestDetailDTO.java   |  3 --
 .../warehouse/mapper/TaskQuestMapper.java     |  2 +
 .../warehouse/mapper/TaskQuestMapper.xml      | 41 +++++++++++++++++++
 .../warehouse/service/ITaskQuestService.java  |  1 +
 .../service/impl/TaskQuestServiceImpl.java    |  5 +++
 6 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
index c68b9a189..abafc1f87 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
+++ b/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);
+
+	}
+
+
 	/**
 	 * 导出数据
 	 */
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java
index 94613c953..456499d3d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java
+++ b/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;// 结束时间
 
-
-
-
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
index 524065ca7..6edcc1f82 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
+++ b/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);
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
index f51798213..d344c263a 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
+++ b/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>
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 7fb18f3a6..c963f81d4 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
@@ -309,4 +309,5 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 
 	List<QuestContrastPackageExcelVO> exportAllDataWithPackage(QuestDetailDTO questDetailDTO);
 
+	List<QuestContrastPackageExcelVO> exportPanDataWithPackage(QuestDetailDTO questDetailDTO);
 }
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 8e145f135..09b917b9d 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
@@ -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);