From e198b4d0025ef46f28c4d9a5f0ac965f8d9dfd9a Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 29 Jan 2026 15:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=A2=86=E9=80=80=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InventoryCountController.java | 28 ++++++++ .../entity/ProjectMaterialLedger.java | 9 +++ .../inventory/InventoryCountMapper.java | 14 ++++ .../inventory/InventoryCountService.java | 15 +++++ .../inventory/InventoryCountServiceImpl.java | 21 ++++++ .../backstage/InventoryCountMapper.xml | 64 +++++++++++++++++++ 6 files changed, 151 insertions(+) diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/controller/inventory/InventoryCountController.java b/src/main/java/com/bonus/aqgqj/business/backstage/controller/inventory/InventoryCountController.java index bfeaabf..5da2518 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/controller/inventory/InventoryCountController.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/controller/inventory/InventoryCountController.java @@ -3,12 +3,14 @@ package com.bonus.aqgqj.business.backstage.controller.inventory; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import com.bonus.aqgqj.business.backstage.entity.OutPlanVo; import com.bonus.aqgqj.business.backstage.entity.ProjectMaterialLedger; import com.bonus.aqgqj.business.backstage.entity.inventory.InventoryCountVo; import com.bonus.aqgqj.business.backstage.entity.inventory.ProjectMaterialLedgers; import com.bonus.aqgqj.business.backstage.service.inventory.InventoryCountService; import com.bonus.aqgqj.manager.annotation.DecryptAndVerify; import com.bonus.aqgqj.manager.core.entity.EncryptedReq; +import com.bonus.aqgqj.manager.webResult.AjaxResult; import com.bonus.aqgqj.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -51,6 +53,32 @@ public class InventoryCountController { return new PageInfo<>(projectMaterialLedgers); } + /** + * 获取工程利库详情 + * @param dto query参数 + * @return + */ + @GetMapping("getLkDetailsByProAndModel") + @DecryptAndVerify(decryptedClass = ProjectMaterialLedger.class) + public PageInfo getLkDetailsByProAndModel(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = service.getLkDetailsByProAndModel(dto.getData()); + return new PageInfo<>(list); + } + + /** + * 获取工程退料详情 + * @param dto query参数 + * @return + */ + @GetMapping("getBackDetailsByProAndModel") + @DecryptAndVerify(decryptedClass = ProjectMaterialLedger.class) + public PageInfo getBackDetailsByProAndModel(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = service.getBackDetailsByProAndModel(dto.getData()); + return new PageInfo<>(list); + } + /** * 查询安全工器具台账 * @param dto query参数 diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java b/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java index 326793a..e295064 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java @@ -111,4 +111,13 @@ public class ProjectMaterialLedger { * 计划数量 */ private String applyNum; + + /** + * 计划编码 + */ + private String planCode; + + private Integer queryType; + + private String backTime; } diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/mapper/inventory/InventoryCountMapper.java b/src/main/java/com/bonus/aqgqj/business/backstage/mapper/inventory/InventoryCountMapper.java index 1debb03..2f27b87 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/mapper/inventory/InventoryCountMapper.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/mapper/inventory/InventoryCountMapper.java @@ -50,4 +50,18 @@ public interface InventoryCountMapper { * @return List */ List getSafetyToolsLedger(ProjectMaterialLedgers data); + + /** + * 利库详情 + * @param data + * @return List + */ + List getLkDetailsByProAndModel(ProjectMaterialLedger data); + + /** + * 退料详情 + * @param data + * @return List + */ + List getBackDetailsByProAndModel(ProjectMaterialLedger data); } diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountService.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountService.java index 51e9d12..bccc37f 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountService.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountService.java @@ -4,6 +4,7 @@ import com.bonus.aqgqj.business.backstage.entity.ProjectMaterialLedger; import com.bonus.aqgqj.business.backstage.entity.inventory.InventoryApplyVo; import com.bonus.aqgqj.business.backstage.entity.inventory.InventoryCountVo; import com.bonus.aqgqj.business.backstage.entity.inventory.ProjectMaterialLedgers; +import com.bonus.aqgqj.manager.webResult.AjaxResult; import com.bonus.aqgqj.manager.webResult.ServerResponse; import java.util.List; @@ -46,4 +47,18 @@ public interface InventoryCountService { * @return List */ List getSafetyToolsLedger(ProjectMaterialLedgers data); + + /** + * 获取工程利库详情 + * @param data + * @return AjaxResult + */ + List getLkDetailsByProAndModel(ProjectMaterialLedger data); + + /** + * 获取工程退货详情 + * @param data + * @return AjaxResult + */ + List getBackDetailsByProAndModel(ProjectMaterialLedger data); } diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountServiceImpl.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountServiceImpl.java index ce44487..badff0d 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountServiceImpl.java @@ -4,6 +4,7 @@ import com.bonus.aqgqj.business.backstage.entity.ProjectMaterialLedger; import com.bonus.aqgqj.business.backstage.entity.inventory.InventoryCountVo; import com.bonus.aqgqj.business.backstage.entity.inventory.ProjectMaterialLedgers; import com.bonus.aqgqj.business.backstage.mapper.inventory.InventoryCountMapper; +import com.bonus.aqgqj.manager.webResult.AjaxResult; import com.bonus.aqgqj.manager.webResult.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -96,6 +97,26 @@ public class InventoryCountServiceImpl implements InventoryCountService{ } } + @Override + public List getLkDetailsByProAndModel(ProjectMaterialLedger data) { + try { + return mapper.getLkDetailsByProAndModel(data); + } catch (Exception e) { + log.error(e.toString(),e); + return new ArrayList<>(); + } + } + + @Override + public List getBackDetailsByProAndModel(ProjectMaterialLedger data) { + try { + return mapper.getBackDetailsByProAndModel(data); + } catch (Exception e) { + log.error(e.toString(),e); + return new ArrayList<>(); + } + } + /** * 计算差缺量 * @param outRecord 出库数量 diff --git a/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml b/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml index 41b0cb9..2e67c59 100644 --- a/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml +++ b/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml @@ -208,4 +208,68 @@ ) + + \ No newline at end of file