From 0c846e1bed005f73b4bff6bc44526d1389cb3dbd Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 16 Oct 2023 16:12:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=98=E7=82=B9=E6=95=B0=E6=8D=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/QuestDetailChildEntity.java | 1 - .../com/logpm/warehouse/vo/QuestDetailVO.java | 10 ++++- .../com/logpm/warehouse/vo/TaskQuestVO.java | 8 +++- .../controller/TaskQuestController.java | 36 ++++++++++++++++++ .../warehouse/mapper/TaskQuestMapper.java | 6 +++ .../warehouse/mapper/TaskQuestMapper.xml | 37 +++++++++++++++++++ .../warehouse/service/ITaskQuestService.java | 6 +++ .../service/impl/TaskQuestServiceImpl.java | 18 +++++++++ 8 files changed, 117 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailChildEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailChildEntity.java index 84385f3bf..37ce330b1 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailChildEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailChildEntity.java @@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; 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 29d8949b7..f2335b21e 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 @@ -16,11 +16,14 @@ */ package com.logpm.warehouse.vo; +import com.logpm.warehouse.entity.QuestDetailChildEntity; import com.logpm.warehouse.entity.QuestDetailEntity; -import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.ArrayList; +import java.util.List; + /** * 盘点明细 视图实体类 * @@ -31,5 +34,8 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QuestDetailVO extends QuestDetailEntity { private static final long serialVersionUID = 1L; - + /** + * 盘点明细子表List + */ + List list = new ArrayList<>(); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskQuestVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskQuestVO.java index 04218df3e..84f032cb2 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskQuestVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskQuestVO.java @@ -16,10 +16,8 @@ */ package com.logpm.warehouse.vo; -import com.logpm.warehouse.entity.TaskQuestChildEntity; import com.logpm.warehouse.entity.TaskQuestEntity; import io.swagger.annotations.ApiModelProperty; -import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -58,4 +56,10 @@ public class TaskQuestVO extends TaskQuestEntity { */ @ApiModelProperty(value = "子表（商场）") List list = new ArrayList<>(); + + /** + * 子表（盘点详情） + */ + @ApiModelProperty(value = "子表（盘点详情）") + List questDetailVOList = new ArrayList<>(); } 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 5eae2f646..2512cfffb 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 @@ -17,6 +17,7 @@ package com.logpm.warehouse.controller; import com.logpm.warehouse.dto.TaskQuestDTO; +import com.logpm.warehouse.vo.QuestDetailVO; import com.logpm.warehouse.wrapper.TaskQuestVOWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -72,6 +73,41 @@ public class TaskQuestController extends BladeController { return R.data(TaskQuestWrapper.build().entityVO(detail)); } + + + /** + * 盘点任务 任务下的包条 + */ + @GetMapping("/SelectStrip") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入taskQuest") + public R> SelectStrip(Long id, Query query) { + IPage list = taskQuestService.SelectStrip(Condition.getPage(query),id); + return R.data(list); + } + + /** + * 盘点任务 任务下的库存品 + */ + @GetMapping("/SelectInventory") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入id") + public R> SelectInventory(Long id,Query query) { + IPage list = taskQuestService.SelectInventory(Condition.getPage(query),id); + return R.data(list); + } + + /** + * 盘点任务 任务下的零担 + */ + @GetMapping("/SelectZreo") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入id") + public R> SelectZero(Long id,Query query) { + IPage 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.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index 1c4e7cecb..ea5213ba5 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 @@ -76,4 +76,10 @@ public interface TaskQuestMapper extends BaseMapper { * @return */ List selectZeroOrderTratInfo(@Param("stockArticleId") Long id,@Param("warehouseId") Long warehouseId); + + IPage selectStripListByQuestId(IPage page,@Param("questId") Long id); + + IPage selectInventoryListByQuestId(IPage page,@Param("questId") Long id); + + IPage selectZeroListByQuestId(IPage page,@Param("questId") Long id); } 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 ca82dc181..99f9ddb34 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 @@ -139,6 +139,43 @@ + + + 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 c65b71b40..dfd61eec3 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 @@ -103,4 +103,10 @@ public interface ITaskQuestService extends BaseService { */ R trayListInfo(IPage page, TaskSearchDTO taskSearchDTO); void saveNewQuestDetail(TaskSearchDTO taskSearchDTO); + + IPage SelectStrip(IPage page,Long id); + + IPage SelectInventory(IPage page,Long id); + + IPage SelectZero(IPage page,Long id); } 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 3339b02a8..d0dbf877a 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 @@ -968,6 +968,24 @@ public class TaskQuestServiceImpl extends BaseServiceImpl SelectStrip(IPage page,Long id) { + IPage questDetailVOList = baseMapper.selectStripListByQuestId(page,id); + return questDetailVOList; + } + + @Override + public IPage SelectInventory(IPage page,Long id) { + IPage questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id); + return questDetailVOList; + } + + @Override + public IPage SelectZero(IPage page,Long id) { + IPage questDetailVOList = baseMapper.selectZeroListByQuestId(page,id); + return questDetailVOList; + } + private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId){ QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();