From 9561741f271d4ff944e2165ab0ad8b0615c0797a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 13 Jun 2022 00:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B9=E6=8D=AE=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=92=8C=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/DepotItemController.java | 5 +++-- .../erp/datasource/mappers/DepotItemMapperEx.java | 2 ++ .../jsh/erp/service/depotItem/DepotItemService.java | 8 ++++---- .../main/resources/mapper_xml/DepotItemMapperEx.xml | 12 ++++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index f3e743f8..fd46d943 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -72,10 +72,11 @@ public class DepotItemController { @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, @RequestParam(value = "depotIds",required = false) String depotIds, + @RequestParam(value = "sku",required = false) String sku, @RequestParam("materialId") Long mId, HttpServletRequest request)throws Exception { Map objectMap = new HashMap<>(); - List list = depotItemService.findDetailByDepotIdsAndMaterialIdList(depotIds, mId, (currentPage-1)*pageSize, pageSize); + List list = depotItemService.findDetailByDepotIdsAndMaterialIdList(depotIds, sku, mId, (currentPage-1)*pageSize, pageSize); JSONArray dataArray = new JSONArray(); if (list != null) { for (DepotItemVo4DetailByTypeAndMId d: list) { @@ -102,7 +103,7 @@ public class DepotItemController { return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); } objectMap.put("rows", dataArray); - objectMap.put("total", depotItemService.findDetailByDepotIdsAndMaterialIdCount(depotIds, mId)); + objectMap.put("total", depotItemService.findDetailByDepotIdsAndMaterialIdCount(depotIds, sku, mId)); return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 6a619df7..73d493c1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -31,12 +31,14 @@ public interface DepotItemMapperEx { List findDetailByDepotIdsAndMaterialIdList( @Param("depotIdArray") String[] depotIdArray, + @Param("sku") String sku, @Param("mId") Long mId, @Param("offset") Integer offset, @Param("rows") Integer rows); Long findDetailByDepotIdsAndMaterialIdCount( @Param("depotIdArray") String[] depotIdArray, + @Param("sku") String sku, @Param("mId") Long mId); List getDetailList( diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 466a2eba..b9cf7be7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -168,28 +168,28 @@ public class DepotItemService { return list==null?0:list.size(); } - public List findDetailByDepotIdsAndMaterialIdList(String depotIds, Long mId, int offset, int rows)throws Exception { + public List findDetailByDepotIdsAndMaterialIdList(String depotIds, String sku, Long mId, int offset, int rows)throws Exception { String [] depotIdArray = null; if(StringUtil.isNotEmpty(depotIds)) { depotIdArray = depotIds.split(","); } List list =null; try{ - list = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdList(depotIdArray, mId, offset, rows); + list = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdList(depotIdArray, sku, mId, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long findDetailByDepotIdsAndMaterialIdCount(String depotIds, Long mId)throws Exception { + public Long findDetailByDepotIdsAndMaterialIdCount(String depotIds, String sku, Long mId)throws Exception { String [] depotIdArray = null; if(StringUtil.isNotEmpty(depotIds)) { depotIdArray = depotIds.split(","); } Long result =null; try{ - result = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdCount(depotIdArray, mId); + result = depotItemMapperEx.findDetailByDepotIdsAndMaterialIdCount(depotIdArray, sku, mId); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 2ab5fb98..1deb652c 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -165,6 +165,9 @@ #{depotId} ) + + and di.sku = #{sku} + and di.material_id = #{mId} and ifnull(dh.delete_flag,'0') !='1' union all @@ -183,6 +186,9 @@ #{depotId} ) + + and di.sku = #{sku} + and di.material_id = #{mId} and ifnull(dh.delete_flag,'0') !='1') tb order by tb.oTime desc @@ -204,6 +210,9 @@ #{depotId} ) + + and di.sku = #{sku} + and di.material_id =#{mId} and ifnull(dh.delete_flag,'0') !='1' union all @@ -216,6 +225,9 @@ #{depotId} ) + + and di.sku = #{sku} + and di.material_id = #{mId} and ifnull(dh.delete_flag,'0') !='1') tb