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

优化商品导出excel的功能

Browse Source
This commit is contained in:
神话
2022-05-03 16:30:41 +08:00
parent ccec596c93
commit 15743a2952
4 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,9 @@ public class MaterialService {
return result;
}
public List<MaterialVo4Unit> findByAll(String barCode, String name, String standard, String model, String categoryId)throws Exception {
public List<MaterialVo4Unit> 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<MaterialVo4Unit> resList = new ArrayList<>();
List<MaterialVo4Unit> 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);
}