From 6d9b4f5ad26722a2663db252b0851fbd18fe1b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 3 Mar 2022 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=92=8C=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 15 ++++++++++----- .../datasource/mappers/DepotHeadMapperEx.java | 8 ++++++-- .../service/depotHead/DepotHeadService.java | 19 ++++++++++--------- .../mapper_xml/DepotHeadMapperEx.xml | 16 ++++++++++++++++ 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 920846b0..a427badd 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -109,6 +109,7 @@ public class DepotHeadController { @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, @RequestParam("type") String type, + @RequestParam("remark") String remark, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); @@ -127,8 +128,9 @@ public class DepotHeadController { List resList = new ArrayList(); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findByAll(beginTime, endTime, type, materialParam, depotList, oId, number, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findByAllCount(beginTime, endTime, type, materialParam, depotList, oId, number); + List list = depotHeadService.findByAll(beginTime, endTime, type, materialParam, + depotList, oId, number, remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findByAllCount(beginTime, endTime, type, materialParam, depotList, oId, number, remark); map.put("total", total); //存放数据json数组 if (null != list) { @@ -188,7 +190,8 @@ public class DepotHeadController { List resList = new ArrayList<>(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotList, oId, (currentPage-1)*pageSize, pageSize); + List list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, materialParam, + depotList, oId, (currentPage-1)*pageSize, pageSize); int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, materialParam, depotList, oId); map.put("total", total); //存放数据json数组 @@ -233,6 +236,7 @@ public class DepotHeadController { @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, @RequestParam("subType") String subType, + @RequestParam("remark") String remark, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); @@ -261,8 +265,9 @@ public class DepotHeadController { } beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, number, materialParam, depotList, depotFList, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotList, depotFList); + List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, number, materialParam, + depotList, depotFList, remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotList, depotFList, remark); map.put("rows", list); map.put("total", total); res.code = 200; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index dbd4d3dc..12fb3644 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -61,6 +61,7 @@ public interface DepotHeadMapperEx { @Param("depotList") List depotList, @Param("oId") Integer oId, @Param("number") String number, + @Param("remark") String remark, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -71,7 +72,8 @@ public interface DepotHeadMapperEx { @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("oId") Integer oId, - @Param("number") String number); + @Param("number") String number, + @Param("remark") String remark); List findInOutMaterialCount( @Param("beginTime") String beginTime, @@ -99,6 +101,7 @@ public interface DepotHeadMapperEx { @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("depotFList") List depotFList, + @Param("remark") String remark, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -109,7 +112,8 @@ public interface DepotHeadMapperEx { @Param("number") String number, @Param("materialParam") String materialParam, @Param("depotList") List depotList, - @Param("depotFList") List depotFList); + @Param("depotFList") List depotFList, + @Param("remark") String remark); List findStatementAccount( @Param("beginTime") String beginTime, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index fdaee8e7..da04f645 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -421,27 +421,28 @@ public class DepotHeadService { } public List findByAll(String beginTime, String endTime, String type, String materialParam, - List depotList, Integer oId, String number,Integer offset, Integer rows) throws Exception{ + List depotList, Integer oId, String number, String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findByAll(beginTime, endTime, type, materialParam, depotList, oId, number, offset, rows); + list =depotHeadMapperEx.findByAll(beginTime, endTime, type, materialParam, depotList, oId, number, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findByAllCount(String beginTime, String endTime, String type, String materialParam, List depotList, Integer oId, String number) throws Exception{ + public int findByAllCount(String beginTime, String endTime, String type, String materialParam, List depotList, Integer oId, String number, String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, materialParam, depotList, oId, number); + result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, materialParam, depotList, oId, number, remark); }catch(Exception e){ JshException.readFail(logger, e); } return result; } - public List findInOutMaterialCount(String beginTime, String endTime, String type, String materialParam, List depotList, Integer oId, Integer offset, Integer rows)throws Exception { + public List findInOutMaterialCount(String beginTime, String endTime, String type, String materialParam, + List depotList, Integer oId, Integer offset, Integer rows)throws Exception { List list = null; try{ list =depotHeadMapperEx.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotList, oId, offset, rows); @@ -462,10 +463,10 @@ public class DepotHeadService { } public List findAllocationDetail(String beginTime, String endTime, String subType, String number, - String materialParam, List depotList, List depotFList, Integer offset, Integer rows) throws Exception{ + String materialParam, List depotList, List depotFList, String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findAllocationDetail(beginTime, endTime, subType, number, materialParam, depotList, depotFList, offset, rows); + list =depotHeadMapperEx.findAllocationDetail(beginTime, endTime, subType, number, materialParam, depotList, depotFList, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } @@ -473,10 +474,10 @@ public class DepotHeadService { } public int findAllocationDetailCount(String beginTime, String endTime, String subType, String number, - String materialParam, List depotList, List depotFList) throws Exception{ + String materialParam, List depotList, List depotFList, String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotList, depotFList); + result =depotHeadMapperEx.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotList, depotFList, remark); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index add48ce2..8500541a 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -222,6 +222,10 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + + + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark}) + and dh.sub_type!='调拨' and ifnull(dh.delete_flag,'0') !='1' ORDER BY oper_time DESC,number desc @@ -259,6 +263,10 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + + + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark}) + and dh.sub_type!='调拨' and ifnull(dh.delete_flag,'0') !='1' ORDER BY oper_time DESC,number desc @@ -390,6 +398,10 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or dh.remark like #{bindKey}) + + + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark}) + and ifnull(dh.delete_flag,'0') !='1' ORDER BY oper_time DESC,number desc @@ -428,6 +440,10 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or dh.remark like #{bindKey}) + + + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark}) + and ifnull(dh.delete_flag,'0') !='1' ORDER BY oper_time DESC,number desc