1.修改任务类型

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

@@ -63,7 +63,62 @@ public class QuestDetailVO extends QuestDetailEntity {
 
 
 //
+//	/**
+//	 * 货位
+//	 */
+//	@ApiModelProperty(value = "货位")
+//	private String goodsAllocation;
 //
-//
+//	/**
-//	List<QuestDetailChildEntity> list = new ArrayList<>();
+//	 * 托盘码
+//	 */
+//	@ApiModelProperty(value = "托盘码")
+//	private String trayCode;
+
+
+	/* ----------- 包条 --------------------- */
+
+
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brandName;
+
+	/**
+	 * 一级品
+	 */
+	@ApiModelProperty(value = "一级品")
+	private String firsts;
+
+	/**
+	 * 二级品
+	 */
+	@ApiModelProperty(value = "二级品")
+	private String second;
+
+	/**
+	 * 三级品
+	 */
+	@ApiModelProperty(value = "三级品")
+	private String thirdProduct;
+
+
+
+	/**
+	 * 发站仓
+	 */
+	@ApiModelProperty(value = "发站仓")
+	private String sendWarehouseName;
+
+	/**
+	 * 收货单位
+	 */
+	@ApiModelProperty(value = "发站仓")
+	private String consigneeUnit;
+
+
+	/* ----------- 库存品 --------------------- */
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -256,9 +256,9 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea")
 	public void visualizationwarehouse(@ApiIgnore @RequestParam Map<String, Object> visualization, HttpServletResponse response) {
-		Long areaId = Long.valueOf((String) visualization.get("areaId"));
+		Long warehouseId = Long.valueOf((String) visualization.get("areaId"));
 		Integer type = Integer.valueOf((String) visualization.get("type"));
-		basicdataGoodsAreaService.visualizationwarehouse(type,areaId,response);
+		basicdataGoodsAreaService.visualizationwarehouse(type,warehouseId,response);
 		//ExcelUtil.exports(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java

@@ -70,13 +70,13 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 
 	List<BasicdataNodeVO> selectFirstNode(@Param("array") List<Long> collect);
 
-	List<BasicdatavisualizationSheetOne> exportWarehouseByorderId(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationSheetOne> exportWarehouseByorderId(@Param("warehouseId") Long warehouseId);
 
 	void sqlMode();
 
-	List<BasicdatavisualizationSheetTwo> exportWarehouseByallocation(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationSheetTwo> exportWarehouseByallocation(@Param("warehouseId") Long warehouseId);
 
-	List<BasicdatavisualizationSheetThree> exportWarehouseByStrip(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationSheetThree> exportWarehouseByStrip(@Param("warehouseId") Long warehouseId);
 
 	/**
 	 * 查询仓库下的备货区
@@ -91,13 +91,13 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 	 */
 	List<BasicdataGoodsAreaEntity> getBasicdataGoodsAreaListdict(@Param("array") List<Long> collect);
 
-	List<BasicdatavisualizationKCSheetOne> exportWarehouseByCKStrip(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationKCSheetOne> exportWarehouseByCKStrip(@Param("warehouseId") Long warehouseId);
 
-	List<BasicdatavisualizationKCSheetTwo> exportWarehouseByKCallocation(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationKCSheetTwo> exportWarehouseByKCallocation(@Param("warehouseId") Long warehouseId);
 
-	List<BasicdatavisualizationKCSheetThree> exportWarehouseByCKService(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationKCSheetThree> exportWarehouseByCKService(@Param("warehouseId") Long warehouseId);
 
-	List<BasicdatavisualizationZreoSheetOne> exportWarehouseByWaybillNumber(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationZreoSheetOne> exportWarehouseByWaybillNumber(@Param("warehouseId") Long warehouseId);
 
-	List<BasicdatavisualizationZreoSheetTwo> exportWarehouseZreoByallocation(@Param("areaId") Long areaId);
+	List<BasicdatavisualizationZreoSheetTwo> exportWarehouseZreoByallocation(@Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -195,7 +195,7 @@
         JOIN logpm_distribution_parcel_list ldpl ON ldpl.stock_article_id = ldsa.id
         JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id
         <where>
-            ldpl.warehouse_id =#{areaId}
+            ldpl.warehouse_id =#{warehouseId}
         </where>
         GROUP BY ldsa.order_code,
         lwug.position_code
@@ -220,7 +220,7 @@
         JOIN
         logpm_distribution_parcel_list ldpl ON lwug.association_id = ldpl.id
         <where>
-            ldpl.warehouse_id =#{areaId}
+            ldpl.warehouse_id =#{warehouseId}
         </where>
         GROUP BY
         lwug.position_code;
@@ -251,7 +251,7 @@
         left JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         <where>
-            ldpl.warehouse_id =#{areaId}
+            ldpl.warehouse_id =#{warehouseId}
         </where>
     </select>
     <select id="selectStockUpArea" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
@@ -302,7 +302,7 @@
                 AND ldsli.market_id = ldsl.market_id
                 LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldsl.material_id
         <where>
-            ldsl.warehouse_id =#{areaId}
+            ldsl.warehouse_id =#{warehouseId} and lwug.association_type ='4'
         </where>
         GROUP BY
             ldsl.id
@@ -321,7 +321,7 @@
                 AND ldsl.incoming_batch = lwug.incoming_batch
                 AND ldsl.market_id = lwug.market_id
         <where>
-            ldsl.warehouse_id =#{areaId}
+            ldsl.warehouse_id =#{warehouseId}
         </where>
         GROUP BY
             lwug.position_code
@@ -346,7 +346,7 @@
                      AND ldsl.incoming_batch = lwug.incoming_batch
                      AND ldsl.market_id = lwug.market_id
         <where>
-            ldsl.warehouse_id =#{areaId}
+            ldsl.warehouse_id =#{warehouseId}
         </where>
                  GROUP BY ldsl.service_number,
                           lwug.position_code
@@ -376,7 +376,7 @@
                           JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldsa.id
                           LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldsa.id
         <where>
-            ldsa.warehouse_id =#{areaId}
+            ldsa.warehouse_id =#{warehouseId}
         </where>
                  GROUP BY ldsa.waybill_number,
                           lwug.position_code
@@ -393,7 +393,7 @@
             logpm_distribution_stock_article ldsa
                 JOIN logpm_warehouse_updown_goods lwug ON ldsa.id = lwug.association_id and ldsa.is_zero = '1'
         <where>
-            ldsa.warehouse_id =#{areaId}
+            ldsa.warehouse_id =#{warehouseId}
         </where>
         GROUP BY
             lwug.position_code

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java

@@ -117,7 +117,7 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	 *
 	 * @return
 	 */
-	void visualizationwarehouse(Integer type,Long areaId, HttpServletResponse response);
+	void visualizationwarehouse(Integer type,Long warehouseId, HttpServletResponse response);
 
 	/**
 	 * 查询当前操作人仓库下的备货区信息

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -329,17 +329,17 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 	}
 
 	@Override
-	public void visualizationwarehouse(Integer type,Long areaId, HttpServletResponse response) {
+	public void visualizationwarehouse(Integer type,Long warehouseId, HttpServletResponse response) {
 		//设置数据库格式
 		baseMapper.sqlMode();
 		if (type ==1){
 		//sheetOne
-		List<BasicdatavisualizationSheetOne> basicdatavisualizationSheetOnes = baseMapper.exportWarehouseByorderId(areaId);
+		List<BasicdatavisualizationSheetOne> basicdatavisualizationSheetOnes = baseMapper.exportWarehouseByorderId(warehouseId);
 			basicdatavisualizationSheetOnes.forEach(e->{
 				if (StringUtils.isNotBlank(e.getThirdProduct())){e.setThirdProduct(this.countUniqueProperties(e.getThirdProduct()));}
 			});
 		//sheetTwo
-		List<BasicdatavisualizationSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseByallocation(areaId);
+		List<BasicdatavisualizationSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseByallocation(warehouseId);
 		basicdatavisualizationSheetTwos.forEach(e->{
 			if (StringUtils.isNotBlank(e.getFirsts())){e.setFirsts(this.countUniqueProperties(e.getFirsts())); }
 			if (StringUtils.isNotBlank(e.getSecond())){e.setSecond(this.countUniqueProperties(e.getSecond()));}
@@ -348,7 +348,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 			if (StringUtils.isNotBlank(e.getMaterialName())){e.setMaterialName(this.countUniqueProperties(e.getMaterialName()));}
 		});
 		//sheetThree
-		List<BasicdatavisualizationSheetThree> basicdatavisualizationSheetThrees = baseMapper.exportWarehouseByStrip(areaId);
+		List<BasicdatavisualizationSheetThree> basicdatavisualizationSheetThrees = baseMapper.exportWarehouseByStrip(warehouseId);
 		//转换上架人
 		for (BasicdatavisualizationSheetThree basicdatavisualizationSheetThree : basicdatavisualizationSheetThrees) {
 			basicdatavisualizationSheetThree.setCreateUser(userClient.userInfoById(Long.valueOf(basicdatavisualizationSheetThree.getCreateUser())).getData().getName());
@@ -384,7 +384,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		}
 		}else if (type ==2){
 			//sheetOne
-			List<BasicdatavisualizationKCSheetOne> basicdatavisualizationSheetKCOnes = baseMapper.exportWarehouseByCKStrip(areaId);
+			List<BasicdatavisualizationKCSheetOne> basicdatavisualizationSheetKCOnes = baseMapper.exportWarehouseByCKStrip(warehouseId);
 			//转换上架人
 			basicdatavisualizationSheetKCOnes.forEach(e->{
 				if (StringUtils.isNotBlank(e.getUpUser())){
@@ -397,7 +397,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 				}
 			});
 			//sheetTwo
-			List<BasicdatavisualizationKCSheetTwo> basicdatavisualizationSheetKCTwos = baseMapper.exportWarehouseByKCallocation(areaId);
+			List<BasicdatavisualizationKCSheetTwo> basicdatavisualizationSheetKCTwos = baseMapper.exportWarehouseByKCallocation(warehouseId);
 			basicdatavisualizationSheetKCTwos.forEach(e->{
 				if (StringUtils.isNotBlank(e.getMarketName())){e.setMarketName(this.countUniqueProperties(e.getMarketName())); }
 				if (StringUtils.isNotBlank(e.getCargoNumber())){e.setCargoNumber(this.countUniqueProperties(e.getCargoNumber()));}
@@ -405,7 +405,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 				if (StringUtils.isNotBlank(e.getServiceNumber())){e.setServiceNumber(this.countUniqueProperties(e.getServiceNumber()));}
 			});
 			//sheetThree
-			List<BasicdatavisualizationKCSheetThree> basicdatavisualizationKCSheetThrees = baseMapper.exportWarehouseByCKService(areaId);
+			List<BasicdatavisualizationKCSheetThree> basicdatavisualizationKCSheetThrees = baseMapper.exportWarehouseByCKService(warehouseId);
 
 			try {
 				String fileName =	"仓库数据" + DateUtil.time();
@@ -438,7 +438,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 		}else if (type ==3){
 			//sheetOne
-			List<BasicdatavisualizationZreoSheetOne> basicdatavisualizationZreoSheetOnes = baseMapper.exportWarehouseByWaybillNumber(areaId);
+			List<BasicdatavisualizationZreoSheetOne> basicdatavisualizationZreoSheetOnes = baseMapper.exportWarehouseByWaybillNumber(warehouseId);
 			//转换上架人
 			basicdatavisualizationZreoSheetOnes.forEach(e->{
 				if (StringUtils.isNotBlank(e.getUpUser())){
@@ -451,7 +451,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 				}
 			});
 //			//sheetTwo
-			List<BasicdatavisualizationZreoSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseZreoByallocation(areaId);
+			List<BasicdatavisualizationZreoSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseZreoByallocation(warehouseId);
 
 
 			try {

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

@@ -80,7 +80,7 @@ public class TaskQuestController extends BladeController {
 	 */
 	@GetMapping("/SelectStrip")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入taskQuest")
+	@ApiOperation(value = "盘点任务 任务下的包条", notes = "传入taskQuest")
 	public R<IPage<QuestDetailVO>> SelectStrip(Long id, Query query) {
 		IPage<QuestDetailVO> list = taskQuestService.SelectStrip(Condition.getPage(query),id);
 		return R.data(list);
@@ -91,7 +91,7 @@ public class TaskQuestController extends BladeController {
 	 */
 	@GetMapping("/SelectInventory")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入id")
+	@ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id")
 	public R<IPage<QuestDetailVO>> SelectInventory(Long id,Query query) {
 		IPage<QuestDetailVO> list = taskQuestService.SelectInventory(Condition.getPage(query),id);
 		return R.data(list);
@@ -102,7 +102,7 @@ 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);
 		return R.data(list);

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

@@ -79,9 +79,9 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 
     List<WarehouseMaterialVO> findMaterialList(@Param("param") TaskSearchDTO taskSearchDTO);
 
-	IPage<QuestDetailVO> selectStripListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
+	List<QuestDetailVO> selectStripListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id);
 
-	IPage<QuestDetailVO> selectInventoryListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
+	List<QuestDetailVO> selectInventoryListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id);
 
-	IPage<QuestDetailVO> selectZeroListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
+	List<QuestDetailVO> selectZeroListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id);
 }

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

@@ -146,11 +146,29 @@
     </select>
     <select id="selectStripListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
-            lqd.*,
+        lqd.id id,
-               (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
+        lqd.order_code orderCode,
+        lqd.quest_id questId,
+        lqd.order_id orderId,
+        lqd.quest_type questType,
+        lqd.quest_status questStatus,
+        lqd.stock_num stockNum,
+        lqd.position_code positionCode,
+        lqd.grounding_position_code groundingPositionCode,
+        lqd.orde_package_code ordePackageCode,
+        lqd.order_package_id orderPackageId,
+        lqd.update_time updateTime,
+        ldpl.service_number serviceNumber,
+        ldpl.firsts firsts,
+        ldpl.second second,
+        ldpl.third_product thirdProduct,
+        ldpl.material_name materialName,
+        ldpl.brand_name brandName,
+        ldsa.consignee_unit consigneeUnit
         FROM
             logpm_quest_detail lqd
                 JOIN logpm_distribution_parcel_list ldpl ON lqd.order_package_id = ldpl.id
+                left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
                 AND lqd.quest_target =1
         <where>
             lqd.is_deleted =0 and lqd.quest_id = #{questId}
@@ -158,11 +176,17 @@
     </select>
     <select id="selectInventoryListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
-        lqd.*,
+        lqd.id id,
+        lqd.stock_id stockId,
+        lqd.quest_status questStatus,
+        lqd.stock_num stockNum,
+        lqd.material_code materialCode,
+        lqd.market_name marketName,
+        lqd.incoming_batch incomingBatch,
+        lqd.position_code positionCode,
+        lqd.material_name materialName,
         ldsl.service_number serviceNumber,
-        ldsl.description_goods descriptionGoods,
+        ldsl.description_goods descriptionGoods
-        ldsl.market_name marketName,
-        (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
         FROM
             logpm_quest_detail lqd
                 JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id
@@ -174,8 +198,7 @@
     </select>
     <select id="selectZeroListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
-            lqd.*,
+            lqd.*
-        (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
         FROM
             logpm_quest_detail lqd
                 JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id

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<TaskQuestVO> page,Long id);
+	IPage <QuestDetailVO> SelectStrip(IPage<QuestDetailVO> page,Long id);
 
-	IPage <QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id);
+	IPage <QuestDetailVO> SelectInventory(IPage<QuestDetailVO> page,Long id);
 
-	IPage <QuestDetailVO> SelectZero(IPage<TaskQuestVO> page,Long id);
+	IPage <QuestDetailVO> SelectZero(IPage<QuestDetailVO> page,Long id);
 
 	R questScanAllcation(TaskSearchDTO taskSearchDTO);
 

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

@@ -132,6 +132,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		//设置任务单号
 		String questNum = this.getQuestNum(myCurrentWarehouse.getWarehouseCode());
 		taskQuest.setQuestNum(questNum);
+		if (taskQuest.getList().size() ==0){taskQuest.setQuestType("2");}
 		boolean save = this.save(taskQuest);
 		//存入子表
 		if (taskQuest.getList().size() > 0) {
@@ -182,6 +183,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				taskQuestChildEntity.setQuestId(taskQuest.getId());
 			}
 			taskQuestChildService.saveBatch(list);
+		}else {
+			taskQuest.setQuestType("2");
 		}
 		boolean b = this.updateById(taskQuest);
 		return true;
@@ -1201,21 +1204,51 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id) {
+	public IPage<QuestDetailVO> SelectStrip(IPage<QuestDetailVO> page,Long id) {
-		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
+		List <QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
-		return questDetailVOList;
+		if (!questDetailVOList.isEmpty()){
+		for (QuestDetailVO questDetailVO : questDetailVOList) {
+			//查询子表
+			List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
+				.eq(QuestDetailChildEntity::getIsDeleted,0)
+				.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
+			);
+			questDetailVO.setList(list);
+		}
+		}
+		return page.setRecords(questDetailVOList);
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id) {
+	public IPage<QuestDetailVO> SelectInventory(IPage<QuestDetailVO> page,Long id) {
-		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id);
+		List<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id);
-		return questDetailVOList;
+		if (!questDetailVOList.isEmpty()){
+			for (QuestDetailVO questDetailVO : questDetailVOList) {
+				//查询子表
+				List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
+					.eq(QuestDetailChildEntity::getIsDeleted,0)
+					.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
+				);
+				questDetailVO.setList(list);
+			}
+		}
+		return page.setRecords(questDetailVOList);
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectZero(IPage<TaskQuestVO> page,Long id) {
+	public IPage<QuestDetailVO> SelectZero(IPage<QuestDetailVO> page,Long id) {
-		IPage<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id);
+		List<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id);
-		return questDetailVOList;
+		if (!questDetailVOList.isEmpty()){
+			for (QuestDetailVO questDetailVO : questDetailVOList) {
+				//查询子表
+				List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
+					.eq(QuestDetailChildEntity::getIsDeleted,0)
+					.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
+				);
+				questDetailVO.setList(list);
+			}
+		}
+		return page.setRecords(questDetailVOList);
 	}
 
 	@Override