From f31a06b137395d9748e4ecbe22e67a40139391f7 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 19 Oct 2023 10:58:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/entity/QuestDetailEntity.java   |  4 +++
 .../com/logpm/warehouse/vo/QuestDetailVO.java | 29 ++++++++++++++++++-
 .../controller/TaskQuestController.java       |  8 ++---
 .../warehouse/mapper/TaskQuestMapper.xml      | 23 +++++++++++----
 .../warehouse/service/ITaskQuestService.java  |  6 ++--
 .../service/impl/TaskQuestServiceImpl.java    |  6 ++--
 6 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
index 5713d1aeb..2669c6ad3 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
@@ -168,21 +168,25 @@ public class QuestDetailEntity extends TenantEntity {
 	/**
 	 * 物料编码
 	 */
+	@ApiModelProperty(value = "物料编码")
 	private String materialCode;
 
 	/**
 	 * 物料名称
 	 */
+	@ApiModelProperty(value = "物料名称")
 	private String materialName;
 
 	/**
 	 * 商场名称
 	 */
+	@ApiModelProperty(value = "商场名称")
 	private String marketName;
 
 	/**
 	 * 批次号
 	 */
+	@ApiModelProperty(value = "批次号")
 	private String incomingBatch;
 
 
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
index c7e952057..7ec2b8e0d 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
@@ -114,11 +114,38 @@ public class QuestDetailVO extends QuestDetailEntity {
 	/**
 	 * 收货单位
 	 */
-	@ApiModelProperty(value = "发站仓")
+	@ApiModelProperty(value = "收货单位")
 	private String consigneeUnit;
 
 
 	/* ----------- 库存品 --------------------- */
 
 
+	/* ----------- 零担 --------------------- */
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+
+	/**
+	 * 运单收货人
+	 */
+	@ApiModelProperty(value = "运单收货人")
+	private String consigneePerson;
+
+	/**
+	 * 运单收货地址
+	 */
+	@ApiModelProperty(value = "运单收货地址")
+	private String consigneeAddress;
+
+	/**
+	 * 运单收货电话
+	 */
+	@ApiModelProperty(value = "运单收货电话")
+	private String consigneeMobile;
+
+
 }
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 58910dc01..0473a8286 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
@@ -82,7 +82,7 @@ public class TaskQuestController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "盘点任务 任务下的包条", notes = "传入taskQuest")
 	public R<IPage<QuestDetailVO>> SelectStrip(Long id, Query query) {
-		IPage<QuestDetailVO> list = taskQuestService.SelectStrip(Condition.getPage(query),id);
+		IPage<QuestDetailVO> list = taskQuestService.selectStrip(Condition.getPage(query),id);
 		return R.data(list);
 	}
 
@@ -93,7 +93,7 @@ public class TaskQuestController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id")
 	public R<IPage<QuestDetailVO>> SelectInventory(Long id,Query query) {
-		IPage<QuestDetailVO> list = taskQuestService.SelectInventory(Condition.getPage(query),id);
+		IPage<QuestDetailVO> list = taskQuestService.selectInventory(Condition.getPage(query),id);
 		return R.data(list);
 	}
 
@@ -102,9 +102,9 @@ public class TaskQuestController extends BladeController {
 	 */
 	@GetMapping("/SelectZreo")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id")
+	@ApiOperation(value = "盘点任务 任务下的零担", notes = "传入id")
 	public R<IPage<QuestDetailVO>> SelectZero(Long id,Query query) {
-		IPage<QuestDetailVO> list = taskQuestService.SelectZero(Condition.getPage(query),id);
+		IPage<QuestDetailVO> list = taskQuestService.selectZero(Condition.getPage(query),id);
 		return R.data(list);
 	}
 
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 69983cb50..560233460 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
@@ -164,6 +164,7 @@
         ldpl.third_product thirdProduct,
         ldpl.material_name materialName,
         ldpl.brand_name brandName,
+        ldpl.send_warehouse_name sendWarehouseName,
         ldsa.consignee_unit consigneeUnit
         FROM
             logpm_quest_detail lqd
@@ -183,6 +184,7 @@
         lqd.material_code materialCode,
         lqd.market_name marketName,
         lqd.incoming_batch incomingBatch,
+        lqd.update_time updateTime,
         lqd.position_code positionCode,
         lqd.material_name materialName,
         ldsl.service_number serviceNumber,
@@ -190,7 +192,6 @@
         FROM
             logpm_quest_detail lqd
                 JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id
-                AND lqd.incoming_batch = ldsl.incoming_batch
                 AND lqd.quest_target =3
         <where>
             lqd.is_deleted =0 and lqd.quest_id = #{questId}
@@ -198,11 +199,23 @@
     </select>
     <select id="selectZeroListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
-            lqd.*
+        lqd.id id,
+        lqd.order_id orderId,
+        lqd.order_code orderCode,
+        ldsa.description_goods categoryName,
+        lqd.stock_num stockNum,
+        lqd.position_code positionCode,
+        lqd.quest_status questStatus,
+        lqd.update_time updateTime,
+        lqd.tray_code trayCode,
+        ldsa.waybill_number waybillNumber,
+        ldsa.consignee_person consigneePerson,
+        ldsa.consignee_address consigneeAddress,
+        ldsa.consignee_mobile consigneeMobile
         FROM
-            logpm_quest_detail lqd
-                JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id
-                AND lqd.quest_target =2
+        logpm_quest_detail lqd
+        JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id
+        AND lqd.quest_target =2
         <where>
             lqd.is_deleted =0 and lqd.quest_id = #{questId}
         </where>
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 a04f3c713..483e0430c 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
@@ -123,11 +123,11 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	 */
 	R contractQuestDetail(TaskSearchDTO taskSearchDTO);
 
-	IPage <QuestDetailVO> SelectStrip(IPage<QuestDetailVO> page,Long id);
+	IPage <QuestDetailVO> selectStrip(IPage<QuestDetailVO> page,Long id);
 
-	IPage <QuestDetailVO> SelectInventory(IPage<QuestDetailVO> page,Long id);
+	IPage <QuestDetailVO> selectInventory(IPage<QuestDetailVO> page,Long id);
 
-	IPage <QuestDetailVO> SelectZero(IPage<QuestDetailVO> page,Long id);
+	IPage <QuestDetailVO> selectZero(IPage<QuestDetailVO> page,Long id);
 
 	R questScanAllcation(TaskSearchDTO taskSearchDTO);
 
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 bb63ebfde..1a6405871 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
@@ -1249,7 +1249,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectStrip(IPage<QuestDetailVO> page,Long id) {
+	public IPage<QuestDetailVO> selectStrip(IPage<QuestDetailVO> page,Long id) {
 		List <QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
 		if (!questDetailVOList.isEmpty()){
 		for (QuestDetailVO questDetailVO : questDetailVOList) {
@@ -1265,7 +1265,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectInventory(IPage<QuestDetailVO> page,Long id) {
+	public IPage<QuestDetailVO> selectInventory(IPage<QuestDetailVO> page,Long id) {
 		List<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id);
 		if (!questDetailVOList.isEmpty()){
 			for (QuestDetailVO questDetailVO : questDetailVOList) {
@@ -1281,7 +1281,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectZero(IPage<QuestDetailVO> page,Long id) {
+	public IPage<QuestDetailVO> selectZero(IPage<QuestDetailVO> page,Long id) {
 		List<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id);
 		if (!questDetailVOList.isEmpty()){
 			for (QuestDetailVO questDetailVO : questDetailVOList) {