From 3db05194799c52a6a922353aef7a6c08ae4e2c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 20 Nov 2021 00:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=AD=89=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/DepotHeadController.java | 14 ++++++++------ .../datasource/mappers/DepotHeadMapperEx.java | 10 ++++++---- .../erp/service/depotHead/DepotHeadService.java | 17 +++++++++-------- .../resources/mapper_xml/DepotHeadMapperEx.xml | 16 ++++++++++++++++ 4 files changed, 39 insertions(+), 18 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 24e5c421..dc8e0d6d 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 @@ -85,6 +85,7 @@ public class DepotHeadController { * @param currentPage * @param pageSize * @param oId + * @param number * @param materialParam * @param depotId * @param beginTime @@ -98,6 +99,7 @@ public class DepotHeadController { public BaseResponseInfo findInDetail(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "organId", required = false) Integer oId, + @RequestParam("number") String number, @RequestParam("materialParam") String materialParam, @RequestParam(value = "depotId", required = false) Integer depotId, @RequestParam("beginTime") String beginTime, @@ -110,8 +112,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.findByAll(beginTime, endTime, type, materialParam, depotId, oId, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findByAllCount(beginTime, endTime, type, materialParam, depotId, oId); + List list = depotHeadService.findByAll(beginTime, endTime, type, materialParam, depotId, oId, number, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findByAllCount(beginTime, endTime, type, materialParam, depotId, oId, number); map.put("total", total); //存放数据json数组 if (null != list) { @@ -184,7 +186,7 @@ public class DepotHeadController { * 调拨明细统计 * @param currentPage * @param pageSize - * @param oId + * @param number * @param materialParam * @param depotIdF 调出仓库 * @param depotId 调入仓库 @@ -198,7 +200,7 @@ public class DepotHeadController { @ApiOperation(value = "调拨明细统计") public BaseResponseInfo findallocationDetail(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize, - @RequestParam(value = "organId", required = false) Integer oId, + @RequestParam("number") String number, @RequestParam("materialParam") String materialParam, @RequestParam(value = "depotId", required = false) Integer depotId, @RequestParam(value = "depotIdF", required = false) Integer depotIdF, @@ -211,8 +213,8 @@ public class DepotHeadController { try { beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, materialParam, depotId, depotIdF, oId, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, materialParam, depotId, depotIdF,oId); + List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, number, materialParam, depotId, depotIdF, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotId, depotIdF); 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 ce3dc0b2..a506d7be 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 @@ -60,6 +60,7 @@ public interface DepotHeadMapperEx { @Param("materialParam") String materialParam, @Param("depotId") Integer depotId, @Param("oId") Integer oId, + @Param("number") String number, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -69,7 +70,8 @@ public interface DepotHeadMapperEx { @Param("type") String type, @Param("materialParam") String materialParam, @Param("depotId") Integer depotId, - @Param("oId") Integer oId); + @Param("oId") Integer oId, + @Param("number") String number); List findInOutMaterialCount( @Param("beginTime") String beginTime, @@ -93,10 +95,10 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("subType") String subType, + @Param("number") String number, @Param("materialParam") String materialParam, @Param("depotId") Integer depotId, @Param("depotIdF") Integer depotIdF, - @Param("oId") Integer oId, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -104,10 +106,10 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("subType") String subType, + @Param("number") String number, @Param("materialParam") String materialParam, @Param("depotId") Integer depotId, - @Param("depotIdF") Integer depotIdF, - @Param("oId") Integer oId); + @Param("depotIdF") Integer depotIdF); 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 5f7add3b..2f5d5a58 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 @@ -420,20 +420,21 @@ public class DepotHeadService { return result; } - public List findByAll(String beginTime, String endTime, String type, String materialParam, Integer depotId, Integer oId, Integer offset, Integer rows) throws Exception{ + public List findByAll(String beginTime, String endTime, String type, String materialParam, + Integer depotId, Integer oId, String number,Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findByAll(beginTime, endTime, type, materialParam, depotId, oId, offset, rows); + list =depotHeadMapperEx.findByAll(beginTime, endTime, type, materialParam, depotId, oId, number, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findByAllCount(String beginTime, String endTime, String type, String materialParam, Integer depotId, Integer oId) throws Exception{ + public int findByAllCount(String beginTime, String endTime, String type, String materialParam, Integer depotId, Integer oId, String number) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, materialParam, depotId, oId); + result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, materialParam, depotId, oId, number); }catch(Exception e){ JshException.readFail(logger, e); } @@ -460,20 +461,20 @@ public class DepotHeadService { return result; } - public List findAllocationDetail(String beginTime, String endTime, String subType, String materialParam, Integer depotId, Integer depotIdF, Integer oId, Integer offset, Integer rows) throws Exception{ + public List findAllocationDetail(String beginTime, String endTime, String subType, String number, String materialParam, Integer depotId, Integer depotIdF, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findAllocationDetail(beginTime, endTime, subType, materialParam, depotId, depotIdF, oId, offset, rows); + list =depotHeadMapperEx.findAllocationDetail(beginTime, endTime, subType, number, materialParam, depotId, depotIdF, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findAllocationDetailCount(String beginTime, String endTime, String subType, String materialParam, Integer depotId, Integer depotIdF,Integer oId) throws Exception{ + public int findAllocationDetailCount(String beginTime, String endTime, String subType, String number, String materialParam, Integer depotId, Integer depotIdF) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findAllocationDetailCount(beginTime, endTime, subType, materialParam, depotId,depotIdF, oId); + result =depotHeadMapperEx.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotId,depotIdF); }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 12fecffb..27e53ec0 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -208,6 +208,10 @@ and dh.type=#{type} + + + and dh.number like #{bindNumber} + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) @@ -238,6 +242,10 @@ and dh.type=#{type} + + + and dh.number like #{bindNumber} + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) @@ -333,6 +341,10 @@ and dh.sub_type=#{subType} + + + and dh.number like #{bindNumber} + 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}) @@ -361,6 +373,10 @@ and dh.sub_type=#{subType} + + + and dh.number like #{bindNumber} + 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})