From 286bc0c375845f961dbc7594b285fccd1eaf41c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 22 May 2022 23:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E4=B8=AD=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=9A=84=E9=80=89=E6=8B=A9=E5=A2=9E=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=92=8C=E5=BA=8F=E5=88=97=E5=8F=B7=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/MaterialController.java | 21 +++++++++++++------ .../datasource/mappers/MaterialMapperEx.java | 6 +++++- .../erp/service/material/MaterialService.java | 10 +++++---- .../resources/mapper_xml/MaterialMapperEx.xml | 14 ++++++++++++- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index ddd20d54..1dcec1c1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -176,14 +176,18 @@ public class MaterialController { @RequestParam(value = "q", required = false) String q, @RequestParam("mpList") String mpList, @RequestParam(value = "depotId", required = false) Long depotId, + @RequestParam(value = "enableSerialNumber", required = false) String enableSerialNumber, + @RequestParam(value = "enableBatchNumber", required = false) String enableBatchNumber, @RequestParam("page") Integer currentPage, @RequestParam("rows") Integer pageSize, HttpServletRequest request) throws Exception{ JSONObject object = new JSONObject(); try { - List dataList = materialService.findBySelectWithBarCode(categoryId, q, (currentPage-1)*pageSize, pageSize); + List dataList = materialService.findBySelectWithBarCode(categoryId, q, enableSerialNumber, + enableBatchNumber, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); - int total = materialService.findBySelectWithBarCodeCount(categoryId, q); + int total = materialService.findBySelectWithBarCodeCount(categoryId, q, enableSerialNumber, + enableBatchNumber); object.put("total", total); JSONArray dataArray = new JSONArray(); //存放数据json数组 @@ -293,11 +297,16 @@ public class MaterialController { /** * 生成excel表格 - * @param barCode - * @param name - * @param standard - * @param model * @param categoryId + * @param materialParam + * @param color + * @param weight + * @param expiryNum + * @param enabled + * @param enableSerialNumber + * @param enableBatchNumber + * @param remark + * @param mpList * @param request * @param response */ diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java index 60b57e4a..69a801e5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java @@ -54,11 +54,15 @@ public interface MaterialMapperEx { List findBySelectWithBarCode(@Param("idList") List idList, @Param("q") String q, + @Param("enableSerialNumber") String enableSerialNumber, + @Param("enableBatchNumber") String enableBatchNumber, @Param("offset") Integer offset, @Param("rows") Integer rows); int findBySelectWithBarCodeCount(@Param("idList") List idList, - @Param("q") String q); + @Param("q") String q, + @Param("enableSerialNumber") String enableSerialNumber, + @Param("enableBatchNumber") String enableBatchNumber); List exportExcel( @Param("materialParam") String materialParam, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 5b058826..6c6228d0 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -390,7 +390,8 @@ public class MaterialService { return idList; } - public List findBySelectWithBarCode(Long categoryId, String q, Integer offset, Integer rows)throws Exception{ + public List findBySelectWithBarCode(Long categoryId, String q, String enableSerialNumber, + String enableBatchNumber, Integer offset, Integer rows)throws Exception{ List list =null; try{ List idList = new ArrayList<>(); @@ -402,14 +403,15 @@ public class MaterialService { q = q.replace("'", ""); q = q.trim(); } - list= materialMapperEx.findBySelectWithBarCode(idList, q, offset, rows); + list= materialMapperEx.findBySelectWithBarCode(idList, q, enableSerialNumber, enableBatchNumber, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findBySelectWithBarCodeCount(Long categoryId, String q)throws Exception{ + public int findBySelectWithBarCodeCount(Long categoryId, String q, String enableSerialNumber, + String enableBatchNumber)throws Exception{ int result=0; try{ List idList = new ArrayList<>(); @@ -420,7 +422,7 @@ public class MaterialService { if(StringUtil.isNotEmpty(q)) { q = q.replace("'", ""); } - result = materialMapperEx.findBySelectWithBarCodeCount(idList, q); + result = materialMapperEx.findBySelectWithBarCodeCount(idList, q, enableSerialNumber, enableBatchNumber); }catch(Exception e){ logger.error("异常码[{}],异常提示[{}],异常[{}]", ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml index 19f406e2..b3004c38 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -290,7 +290,7 @@ where m.enabled=1 and me.id is not null - and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or m.color like #{bindKey}) and m.category_id in @@ -298,6 +298,12 @@ #{item} + + and m.enable_serial_number = #{enableSerialNumber} + + + and m.enable_batch_number = #{enableBatchNumber} + and ifnull(m.delete_flag,'0') !='1' ORDER BY m.id desc, me.default_flag desc, me.id asc @@ -320,6 +326,12 @@ #{item} + + and m.enable_serial_number = #{enableSerialNumber} + + + and m.enable_batch_number = #{enableBatchNumber} + and ifnull(m.delete_flag,'0') !='1'