From 15743a2952b4b540c2d85f68d89e1cfee7a157bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com> Date: Tue, 3 May 2022 16:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=AF=BC?= =?UTF-8?q?=E5=87=BAexcel=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/MaterialController.java | 10 ++++++- .../datasource/mappers/MaterialMapperEx.java | 6 ++++ .../erp/service/material/MaterialService.java | 7 +++-- .../resources/mapper_xml/MaterialMapperEx.xml | 28 ++++++++++++++++--- 4 files changed, 44 insertions(+), 7 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 160f3351..e3254d68 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 @@ -308,6 +308,12 @@ public class MaterialController { @RequestParam("name") String name, @RequestParam("standard") String standard, @RequestParam("model") String model, + @RequestParam("color") String color, + @RequestParam("weight") String weight, + @RequestParam("expiryNum") String expiryNum, + @RequestParam("enableSerialNumber") String enableSerialNumber, + @RequestParam("enableBatchNumber") String enableBatchNumber, + @RequestParam("remark") String remark, @RequestParam("mpList") String mpList, HttpServletRequest request, HttpServletResponse response) { try { @@ -316,7 +322,9 @@ public class MaterialController { mpArr= mpList.split(","); } List dataList = materialService.findByAll(StringUtil.toNull(barCode), StringUtil.toNull(name), - StringUtil.toNull(standard), StringUtil.toNull(model), StringUtil.toNull(categoryId)); + StringUtil.toNull(standard), StringUtil.toNull(model), StringUtil.toNull(color), StringUtil.toNull(weight), + StringUtil.toNull(expiryNum), StringUtil.toNull(enableSerialNumber), StringUtil.toNull(enableBatchNumber), + StringUtil.toNull(remark), StringUtil.toNull(categoryId)); String[] names = {"条码", "名称", "规格", "型号", "颜色", "类别", "扩展信息", "单位", "基础重量", "保质期", "采购价", "销售价", "零售价", "最低售价", "备注", "状态", "序列号", "批号"}; String title = "商品信息"; List objects = new ArrayList<>(); 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 095fcf54..8e48128b 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 @@ -67,6 +67,12 @@ public interface MaterialMapperEx { @Param("name") String name, @Param("standard") String standard, @Param("model") String model, + @Param("color") String color, + @Param("weight") String weight, + @Param("expiryNum") String expiryNum, + @Param("enableSerialNumber") String enableSerialNumber, + @Param("enableBatchNumber") String enableBatchNumber, + @Param("remark") String remark, @Param("idList") List idList); /** * 通过商品名称查询商品信息 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 195adac5..340790c7 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 @@ -432,7 +432,9 @@ public class MaterialService { return result; } - public List findByAll(String barCode, String name, String standard, String model, String categoryId)throws Exception { + public List findByAll(String barCode, String name, String standard, String model, String color, + String weight, String expiryNum, String enableSerialNumber, String enableBatchNumber, + String remark, String categoryId)throws Exception { List resList = new ArrayList<>(); List list =null; try{ @@ -440,7 +442,8 @@ public class MaterialService { if(StringUtil.isNotEmpty(categoryId)){ idList = getListByParentId(Long.parseLong(categoryId)); } - list= materialMapperEx.findByAll(barCode, name, standard, model, idList); + list= materialMapperEx.findByAll(barCode, name, standard, model, color, weight, expiryNum, + enableSerialNumber, enableBatchNumber, remark, idList); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml index 1746943d..d37b9f2b 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -216,22 +216,42 @@ left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' where 1=1 and me.default_flag=1 - + and me.bar_code like #{bindBarCode} - + and m.name like #{bindName} - + and m.standard like #{bindStandard} - + and m.model like #{bindModel} + + + and m.color like #{bindColor} + + + and m.weight = #{weight} + + + and m.expiry_num = #{expiryNum} + + + and m.enable_serial_number = #{enableSerialNumber} + + + and m.enable_batch_number = #{enableBatchNumber} + + + + and m.remark like #{bindRemark} + and m.category_id in