From baf116d46a7d45676d10882b8da898680f2ea266 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, 15 Dec 2022 23:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=89=A9=E5=B1=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/datasource/mappers/MaterialMapperEx.java | 2 ++ .../jsh/erp/service/material/MaterialComponent.java | 6 ++++-- .../com/jsh/erp/service/material/MaterialService.java | 8 ++++---- .../src/main/resources/mapper_xml/MaterialMapperEx.xml | 10 ++++++++++ 4 files changed, 20 insertions(+), 6 deletions(-) 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 94e51841..bce74be0 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 @@ -19,6 +19,7 @@ public interface MaterialMapperEx { List selectByConditionMaterial( @Param("materialParam") String materialParam, @Param("color") String color, + @Param("materialOther") String materialOther, @Param("weight") String weight, @Param("expiryNum") String expiryNum, @Param("enableSerialNumber") String enableSerialNumber, @@ -33,6 +34,7 @@ public interface MaterialMapperEx { Long countsByMaterial( @Param("materialParam") String materialParam, @Param("color") String color, + @Param("materialOther") String materialOther, @Param("weight") String weight, @Param("expiryNum") String expiryNum, @Param("enableSerialNumber") String enableSerialNumber, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java index edb7623f..612bba7e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java @@ -36,6 +36,7 @@ public class MaterialComponent implements ICommonQuery { String categoryId = StringUtil.getInfo(search, "categoryId"); String materialParam = StringUtil.getInfo(search, "materialParam"); String color = StringUtil.getInfo(search, "color"); + String materialOther = StringUtil.getInfo(search, "materialOther"); String weight = StringUtil.getInfo(search, "weight"); String expiryNum = StringUtil.getInfo(search, "expiryNum"); String enableSerialNumber = StringUtil.getInfo(search, "enableSerialNumber"); @@ -43,7 +44,7 @@ public class MaterialComponent implements ICommonQuery { String enabled = StringUtil.getInfo(search, "enabled"); String remark = StringUtil.getInfo(search, "remark"); String mpList = StringUtil.getInfo(search, "mpList"); - return materialService.select(materialParam, color, weight, expiryNum, + return materialService.select(materialParam, color, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, enabled, remark, categoryId, mpList, QueryUtils.offset(map), QueryUtils.rows(map)); } @@ -53,6 +54,7 @@ public class MaterialComponent implements ICommonQuery { String categoryId = StringUtil.getInfo(search, "categoryId"); String materialParam = StringUtil.getInfo(search, "materialParam"); String color = StringUtil.getInfo(search, "color"); + String materialOther = StringUtil.getInfo(search, "materialOther"); String weight = StringUtil.getInfo(search, "weight"); String expiryNum = StringUtil.getInfo(search, "expiryNum"); String enableSerialNumber = StringUtil.getInfo(search, "enableSerialNumber"); @@ -60,7 +62,7 @@ public class MaterialComponent implements ICommonQuery { String enabled = StringUtil.getInfo(search, "enabled"); String remark = StringUtil.getInfo(search, "remark"); String mpList = StringUtil.getInfo(search, "mpList"); - return materialService.countMaterial(materialParam, color, weight, expiryNum, + return materialService.countMaterial(materialParam, color, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, enabled, remark, categoryId, mpList); } 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 6051cb8a..f6896851 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 @@ -111,7 +111,7 @@ public class MaterialService { return list; } - public List select(String materialParam, String color, String weight, String expiryNum, + public List select(String materialParam, String color, String materialOther, String weight, String expiryNum, String enableSerialNumber, String enableBatchNumber, String enabled, String remark, String categoryId, String mpList, int offset, int rows) throws Exception{ @@ -126,7 +126,7 @@ public class MaterialService { if(StringUtil.isNotEmpty(categoryId)){ idList = getListByParentId(Long.parseLong(categoryId)); } - list= materialMapperEx.selectByConditionMaterial(materialParam, color, weight, expiryNum, + list= materialMapperEx.selectByConditionMaterial(materialParam, color, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, enabled, remark, idList, mpList, offset, rows); if (null != list && list.size()>0) { Map currentStockMap = getCurrentStockMapByMaterialList(list); @@ -143,7 +143,7 @@ public class MaterialService { return resList; } - public Long countMaterial(String materialParam, String color, String weight, String expiryNum, + public Long countMaterial(String materialParam, String color, String materialOther, String weight, String expiryNum, String enableSerialNumber, String enableBatchNumber, String enabled, String remark, String categoryId,String mpList)throws Exception { Long result =null; @@ -152,7 +152,7 @@ public class MaterialService { if(StringUtil.isNotEmpty(categoryId)){ idList = getListByParentId(Long.parseLong(categoryId)); } - result= materialMapperEx.countsByMaterial(materialParam, color, weight, expiryNum, + result= materialMapperEx.countsByMaterial(materialParam, color, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, enabled, remark, idList, mpList); }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 914747a6..8d0f348f 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -51,6 +51,11 @@ and m.color like #{bindColor} + + + and (m.mfrs like #{bindOther} or m.other_field1 like #{bindOther} + or m.other_field2 like #{bindOther} or m.other_field3 like #{bindOther}) + and m.weight = #{weight} @@ -101,6 +106,11 @@ and m.color like #{bindColor} + + + and (m.mfrs like #{bindOther} or m.other_field1 like #{bindOther} + or m.other_field2 like #{bindOther} or m.other_field3 like #{bindOther}) + and m.weight = #{weight}