From b64a0948e19ee55a293187aa40d93f4f073025f3 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 5 Feb 2026 18:14:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/index/IndexHomeDetailsMapper.xml | 21 ++++++++++ .../index/controller/IndexHomeController.java | 10 +---- .../IndexHomeDetailsController.java | 42 +++++++++++++------ .../bonus/index/dao/IndexHomeDetailsDao.java | 2 + .../service/IndexHomeDetailsService.java | 12 ++---- .../service/IndexHomeDetailsServiceImp.java | 10 ++++- .../bonus/index/service/IndexHomeService.java | 2 +- .../index/service/IndexHomeServiceImp.java | 13 ++---- 8 files changed, 72 insertions(+), 40 deletions(-) diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml index 0c000da..afc6587 100644 --- a/resources/mybatis/index/IndexHomeDetailsMapper.xml +++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml @@ -1457,4 +1457,25 @@ and tpd.`NAME` like concat('%', #{maName}, '%') + + diff --git a/src/com/bonus/index/controller/IndexHomeController.java b/src/com/bonus/index/controller/IndexHomeController.java index a68dfbb..8db0904 100644 --- a/src/com/bonus/index/controller/IndexHomeController.java +++ b/src/com/bonus/index/controller/IndexHomeController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.bonus.index.beans.*; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,13 +15,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import com.bonus.core.DateTimeHelper; -import com.bonus.index.beans.IndexDetailVo; -import com.bonus.index.beans.IndexHomeBean; -import com.bonus.index.beans.IndexHomeResourseBean; -import com.bonus.index.beans.IndexProAndNum; -import com.bonus.index.beans.PartFiveBean; -import com.bonus.index.beans.PartSixBean; -import com.bonus.index.beans.PartThreeBean; import com.bonus.index.service.IndexHomeService; import com.bonus.sys.AjaxRes; import com.bonus.sys.BaseController; @@ -233,7 +227,7 @@ public class IndexHomeController extends BaseController { /** * 查询工程领料、退料、维修检验、机具报废、修试后入库、新购入库、库存盘点数量等数据 - * + * * @param o * @return */ diff --git a/src/com/bonus/index/controller/IndexHomeDetailsController.java b/src/com/bonus/index/controller/IndexHomeDetailsController.java index d452419..1ff15da 100644 --- a/src/com/bonus/index/controller/IndexHomeDetailsController.java +++ b/src/com/bonus/index/controller/IndexHomeDetailsController.java @@ -9,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; +import com.bonus.index.beans.*; import com.bonus.ma.beans.pickDetailsBean; import com.bonus.sys.*; import com.bonus.sys.beans.UserBean; @@ -22,15 +23,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import com.bonus.exp.POIOutputHelper; -import com.bonus.index.beans.IndexCheckWarnBean; -import com.bonus.index.beans.IndexHomeCalendarBean; -import com.bonus.index.beans.IndexHomeDetailsBean; -import com.bonus.index.beans.IndexHomeTaskBean; -import com.bonus.index.beans.IndexInuseWarnBean; -import com.bonus.index.beans.IndexProjectBean; -import com.bonus.index.beans.IndexStorageWarnBean; -import com.bonus.index.beans.IndexTodoWarnBean; -import com.bonus.index.beans.IndexTotalWarnBean; import com.bonus.index.service.IndexHomeDetailsService; @Controller @@ -245,6 +237,32 @@ public class IndexHomeDetailsController extends BaseController list = service.getNewlyStored(o); + ar.setSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + @RequestMapping(value = "getInventoryStored", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getInventoryStored(IndexHomeBean o) { + AjaxRes ar = getAjaxRes(); + try { + List list = service.getInventoryStored(o); + ar.setSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } // 库存不足-导出 @RequestMapping(value = "exportStorageWarn", method = RequestMethod.GET) public void export(HttpServletResponse response, IndexStorageWarnBean o) { @@ -255,7 +273,7 @@ public class IndexHomeDetailsController extends BaseController list, String filename) throws Exception { if (list != null) { @@ -280,7 +298,7 @@ public class IndexHomeDetailsController extends BaseController outMaLeaseBeanToMap(int i, IndexStorageWarnBean o) { Map maps = new LinkedHashMap(); maps.put("id", i + 1); @@ -291,7 +309,7 @@ public class IndexHomeDetailsController extends BaseController reportHeader() { ArrayList list = new ArrayList(); list.add("序号"); diff --git a/src/com/bonus/index/dao/IndexHomeDetailsDao.java b/src/com/bonus/index/dao/IndexHomeDetailsDao.java index 0cfbd02..9397093 100644 --- a/src/com/bonus/index/dao/IndexHomeDetailsDao.java +++ b/src/com/bonus/index/dao/IndexHomeDetailsDao.java @@ -46,6 +46,8 @@ public interface IndexHomeDetailsDao extends BaseDao { List getMaInTask(IndexHomeTaskBean o); List getStorageWarn(IndexStorageWarnBean o); + List getNewlyStored(IndexStorageWarnBean o); + List getInventoryStored(IndexStorageWarnBean o); List getCheckWarn(IndexCheckWarnBean o); diff --git a/src/com/bonus/index/service/IndexHomeDetailsService.java b/src/com/bonus/index/service/IndexHomeDetailsService.java index 95ce145..d3e7d34 100644 --- a/src/com/bonus/index/service/IndexHomeDetailsService.java +++ b/src/com/bonus/index/service/IndexHomeDetailsService.java @@ -2,15 +2,7 @@ package com.bonus.index.service; import java.util.List; -import com.bonus.index.beans.IndexCheckWarnBean; -import com.bonus.index.beans.IndexHomeCalendarBean; -import com.bonus.index.beans.IndexHomeDetailsBean; -import com.bonus.index.beans.IndexHomeTaskBean; -import com.bonus.index.beans.IndexInuseWarnBean; -import com.bonus.index.beans.IndexProjectBean; -import com.bonus.index.beans.IndexStorageWarnBean; -import com.bonus.index.beans.IndexTodoWarnBean; -import com.bonus.index.beans.IndexTotalWarnBean; +import com.bonus.index.beans.*; import com.bonus.sys.BaseService; public interface IndexHomeDetailsService extends BaseService { @@ -36,6 +28,8 @@ public interface IndexHomeDetailsService extends BaseService getMaInTask(IndexHomeTaskBean o); List getStorageWarn(IndexStorageWarnBean o); + List getNewlyStored(IndexStorageWarnBean o); + List getInventoryStored(IndexStorageWarnBean o); List getCheckWarn(IndexCheckWarnBean o); diff --git a/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java b/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java index c65330e..21d62ff 100644 --- a/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java +++ b/src/com/bonus/index/service/IndexHomeDetailsServiceImp.java @@ -128,6 +128,14 @@ public class IndexHomeDetailsServiceImp extends BaseServiceImp getStorageWarn(IndexStorageWarnBean o) { return dao.getStorageWarn(o); } + @Override + public List getNewlyStored(IndexStorageWarnBean o) { + return dao.getNewlyStored(o); + } + @Override + public List getInventoryStored(IndexStorageWarnBean o) { + return dao.getInventoryStored(o); + } @Override public List getCheckWarn(IndexCheckWarnBean o) { @@ -218,7 +226,7 @@ public class IndexHomeDetailsServiceImp extends BaseServiceImp getProjectSub(IndexProjectBean o) { diff --git a/src/com/bonus/index/service/IndexHomeService.java b/src/com/bonus/index/service/IndexHomeService.java index ac9e836..3392706 100644 --- a/src/com/bonus/index/service/IndexHomeService.java +++ b/src/com/bonus/index/service/IndexHomeService.java @@ -37,7 +37,7 @@ public interface IndexHomeService extends BaseService { /** * 查询工程领料、退料、维修检验、机具报废、修试后入库、新购入库、库存盘点数量 - * + * * @param o * @return */ diff --git a/src/com/bonus/index/service/IndexHomeServiceImp.java b/src/com/bonus/index/service/IndexHomeServiceImp.java index 5de8a2b..5c9cdcd 100644 --- a/src/com/bonus/index/service/IndexHomeServiceImp.java +++ b/src/com/bonus/index/service/IndexHomeServiceImp.java @@ -8,20 +8,12 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import com.bonus.index.beans.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.core.DateTimeHelper; -import com.bonus.index.beans.IndexDetailVo; -import com.bonus.index.beans.IndexHomeBean; -import com.bonus.index.beans.IndexHomeResourseBean; -import com.bonus.index.beans.IndexProAndNum; -import com.bonus.index.beans.PartFiveBean; -import com.bonus.index.beans.PartOneBean; -import com.bonus.index.beans.PartSixBean; -import com.bonus.index.beans.PartThreeBean; -import com.bonus.index.beans.PartTwoBean; import com.bonus.index.dao.IndexHomeDao; import com.bonus.sys.BaseServiceImp; import com.bonus.sys.UserShiroHelper; @@ -166,4 +158,7 @@ public class IndexHomeServiceImp extends BaseServiceImp implement return pageInfo; } + + List getStorageWarn(IndexStorageWarnBean o); + }