purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品查询增加查询条件接口

Browse Source
This commit is contained in:
神话
2022-05-01 23:48:39 +08:00
parent dd2f719770
commit b8fb7c7a69
4 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
View File

@@ -23,6 +23,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<Long> idList,
@Param("mpList") String mpList,
@Param("offset") Integer offset,
@@ -33,6 +39,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<Long> idList,
@Param("mpList") String mpList);

18
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java
View File

@@ -38,8 +38,15 @@ public class MaterialComponent implements ICommonQuery {
String name = StringUtil.getInfo(search, "name");
String standard = StringUtil.getInfo(search, "standard");
String model = StringUtil.getInfo(search, "model");
String color = StringUtil.getInfo(search, "color");
String weight = StringUtil.getInfo(search, "weight");
String expiryNum = StringUtil.getInfo(search, "expiryNum");
String enableSerialNumber = StringUtil.getInfo(search, "enableSerialNumber");
String enableBatchNumber = StringUtil.getInfo(search, "enableBatchNumber");
String remark = StringUtil.getInfo(search, "remark");
String mpList = StringUtil.getInfo(search, "mpList");
return materialService.select(barCode, name, standard, model,categoryId,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
return materialService.select(barCode, name, standard, model, color, weight, expiryNum,
enableSerialNumber, enableBatchNumber, remark, categoryId, mpList, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
@@ -50,8 +57,15 @@ public class MaterialComponent implements ICommonQuery {
String name = StringUtil.getInfo(search, "name");
String standard = StringUtil.getInfo(search, "standard");
String model = StringUtil.getInfo(search, "model");
String color = StringUtil.getInfo(search, "color");
String weight = StringUtil.getInfo(search, "weight");
String expiryNum = StringUtil.getInfo(search, "expiryNum");
String enableSerialNumber = StringUtil.getInfo(search, "enableSerialNumber");
String enableBatchNumber = StringUtil.getInfo(search, "enableBatchNumber");
String remark = StringUtil.getInfo(search, "remark");
String mpList = StringUtil.getInfo(search, "mpList");
return materialService.countMaterial(barCode, name, standard, model,categoryId,mpList);
return materialService.countMaterial(barCode, name, standard, model, color, weight, expiryNum,
enableSerialNumber, enableBatchNumber, remark, categoryId, mpList);
}
@Override

14
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -106,7 +106,9 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> select(String barCode, String name, String standard, String model, String categoryId,String mpList, int offset, int rows)
public List<MaterialVo4Unit> select(String barCode, String name, String standard, String model, String color,
String weight, String expiryNum, String enableSerialNumber, String enableBatchNumber,
String remark, String categoryId, String mpList, int offset, int rows)
throws Exception{
String[] mpArr = new String[]{};
if(StringUtil.isNotEmpty(mpList)){
@@ -119,7 +121,8 @@ public class MaterialService {
if(StringUtil.isNotEmpty(categoryId)){
idList = getListByParentId(Long.parseLong(categoryId));
}
list= materialMapperEx.selectByConditionMaterial(barCode, name, standard, model, idList, mpList, offset, rows);
list= materialMapperEx.selectByConditionMaterial(barCode, name, standard, model, color, weight, expiryNum,
enableSerialNumber, enableBatchNumber, remark, idList, mpList, offset, rows);
if (null != list) {
for (MaterialVo4Unit m : list) {
//扩展信息
@@ -149,14 +152,17 @@ public class MaterialService {
return resList;
}
public Long countMaterial(String barCode, String name, String standard, String model, String categoryId,String mpList)throws Exception {
public Long countMaterial(String barCode, String name, String standard, String model, String color,
String weight, String expiryNum, String enableSerialNumber, String enableBatchNumber,
String remark, String categoryId,String mpList)throws Exception {
Long result =null;
try{
List<Long> idList = new ArrayList<>();
if(StringUtil.isNotEmpty(categoryId)){
idList = getListByParentId(Long.parseLong(categoryId));
}
result= materialMapperEx.countsByMaterial(barCode, name, standard, model, idList, mpList);
result= materialMapperEx.countsByMaterial(barCode, name, standard, model, color, weight, expiryNum,
enableSerialNumber, enableBatchNumber, remark, idList, mpList);
}catch(Exception e){
JshException.readFail(logger, e);
}