From 0b6306e3a9f9ff0dc1cc5fb8029e8014bb365e88 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Mon, 30 Sep 2024 00:13:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=84=E6=A0=BC=E3=80=81=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E5=93=81=E7=89=8C=E3=80=81=E5=88=B6=E9=80=A0=E5=95=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/mappers/MaterialMapperEx.java | 8 ++++ .../service/material/MaterialComponent.java | 12 +++++- .../erp/service/material/MaterialService.java | 18 +++++---- .../resources/mapper_xml/MaterialMapperEx.xml | 40 ++++++++++++++++--- 4 files changed, 63 insertions(+), 15 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 6b42c859b..5e368c4f5 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,7 +19,11 @@ public interface MaterialMapperEx { List selectByConditionMaterial( @Param("materialParam") String materialParam, + @Param("standard") String standard, + @Param("model") String model, @Param("color") String color, + @Param("brand") String brand, + @Param("mfrs") String mfrs, @Param("materialOther") String materialOther, @Param("weight") String weight, @Param("expiryNum") String expiryNum, @@ -35,7 +39,11 @@ public interface MaterialMapperEx { Long countsByMaterial( @Param("materialParam") String materialParam, + @Param("standard") String standard, + @Param("model") String model, @Param("color") String color, + @Param("brand") String brand, + @Param("mfrs") String mfrs, @Param("materialOther") String materialOther, @Param("weight") String weight, @Param("expiryNum") String expiryNum, 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 1ed546750..f40d3f2ae 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 @@ -35,7 +35,11 @@ public class MaterialComponent implements ICommonQuery { String search = map.get(Constants.SEARCH); String categoryId = StringUtil.getInfo(search, "categoryId"); String materialParam = StringUtil.getInfo(search, "materialParam"); + String standard = StringUtil.getInfo(search, "standard"); + String model = StringUtil.getInfo(search, "model"); String color = StringUtil.getInfo(search, "color"); + String brand = StringUtil.getInfo(search, "brand"); + String mfrs = StringUtil.getInfo(search, "mfrs"); String materialOther = StringUtil.getInfo(search, "materialOther"); String weight = StringUtil.getInfo(search, "weight"); String expiryNum = StringUtil.getInfo(search, "expiryNum"); @@ -45,7 +49,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, materialOther, weight, expiryNum, + return materialService.select(materialParam, standard, model, color, brand, mfrs, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, position, enabled, remark, categoryId, mpList, QueryUtils.offset(map), QueryUtils.rows(map)); } @@ -54,7 +58,11 @@ public class MaterialComponent implements ICommonQuery { String search = map.get(Constants.SEARCH); String categoryId = StringUtil.getInfo(search, "categoryId"); String materialParam = StringUtil.getInfo(search, "materialParam"); + String standard = StringUtil.getInfo(search, "standard"); + String model = StringUtil.getInfo(search, "model"); String color = StringUtil.getInfo(search, "color"); + String brand = StringUtil.getInfo(search, "brand"); + String mfrs = StringUtil.getInfo(search, "mfrs"); String materialOther = StringUtil.getInfo(search, "materialOther"); String weight = StringUtil.getInfo(search, "weight"); String expiryNum = StringUtil.getInfo(search, "expiryNum"); @@ -64,7 +72,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, materialOther, weight, expiryNum, + return materialService.countMaterial(materialParam, standard, model, color, brand, mfrs, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, position, 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 2ddb0495c..fc1153b83 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 @@ -115,9 +115,10 @@ public class MaterialService { return list; } - public List select(String materialParam, String color, String materialOther, String weight, String expiryNum, - String enableSerialNumber, String enableBatchNumber, String position, String enabled, - String remark, String categoryId, String mpList, int offset, int rows) + public List select(String materialParam, String standard, String model, String color, String brand, String mfrs, + String materialOther, String weight, String expiryNum, String enableSerialNumber, + String enableBatchNumber, String position, String enabled, String remark, String categoryId, + String mpList, int offset, int rows) throws Exception{ String[] mpArr = new String[]{}; if(StringUtil.isNotEmpty(mpList)){ @@ -130,7 +131,7 @@ public class MaterialService { if(StringUtil.isNotEmpty(categoryId)){ idList = getListByParentId(Long.parseLong(categoryId)); } - list= materialMapperEx.selectByConditionMaterial(materialParam, color, materialOther, weight, expiryNum, + list= materialMapperEx.selectByConditionMaterial(materialParam, standard, model, color, brand, mfrs, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, position, enabled, remark, idList, mpList, offset, rows); if (null != list && list.size()>0) { Map currentStockMap = getCurrentStockMapByMaterialList(list); @@ -151,16 +152,17 @@ public class MaterialService { return resList; } - public Long countMaterial(String materialParam, String color, String materialOther, String weight, String expiryNum, - String enableSerialNumber, String enableBatchNumber, String position, String enabled, - String remark, String categoryId,String mpList)throws Exception { + public Long countMaterial(String materialParam, String standard, String model, String color, String brand, String mfrs, + String materialOther, String weight, String expiryNum, String enableSerialNumber, + String enableBatchNumber, String position, String enabled, String remark, String categoryId, + String mpList)throws Exception { Long result =null; try{ List idList = new ArrayList<>(); if(StringUtil.isNotEmpty(categoryId)){ idList = getListByParentId(Long.parseLong(categoryId)); } - result= materialMapperEx.countsByMaterial(materialParam, color, materialOther, weight, expiryNum, + result= materialMapperEx.countsByMaterial(materialParam, standard, model, color, brand, mfrs, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, position, 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 ef2105c52..48f2dff06 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -48,16 +48,31 @@ where 1=1 - and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or m.mnemonic like #{bindKey}) + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey}) + + + + and m.standard like #{bindStandard} + + + + and m.model like #{bindModel} and m.color like #{bindColor} + + + and m.brand like #{bindBrand} + + + + and m.mfrs like #{bindMfrs} + - 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.other_field1 like #{bindOther} or m.other_field2 like #{bindOther} or m.other_field3 like #{bindOther}) and m.weight = #{weight} @@ -109,14 +124,29 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or m.mnemonic like #{bindKey}) + + + and m.standard like #{bindStandard} + + + + and m.model like #{bindModel} + and m.color like #{bindColor} + + + and m.brand like #{bindBrand} + + + + and m.mfrs like #{bindMfrs} + - 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.other_field1 like #{bindOther} or m.other_field2 like #{bindOther} or m.other_field3 like #{bindOther}) and m.weight = #{weight}