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-22 23:48:42 +08:00
parent f52a4c34b0
commit 286bc0c375
4 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,7 +390,8 @@ public class MaterialService {
return idList;
}
public List<MaterialVo4Unit> findBySelectWithBarCode(Long categoryId, String q, Integer offset, Integer rows)throws Exception{
public List<MaterialVo4Unit> findBySelectWithBarCode(Long categoryId, String q, String enableSerialNumber,
String enableBatchNumber, Integer offset, Integer rows)throws Exception{
List<MaterialVo4Unit> list =null;
try{
List<Long> idList = new ArrayList<>();
@@ -402,14 +403,15 @@ public class MaterialService {
q = q.replace("'", "");
q = q.trim();
}
list= materialMapperEx.findBySelectWithBarCode(idList, q, offset, rows);
list= materialMapperEx.findBySelectWithBarCode(idList, q, enableSerialNumber, enableBatchNumber, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public int findBySelectWithBarCodeCount(Long categoryId, String q)throws Exception{
public int findBySelectWithBarCodeCount(Long categoryId, String q, String enableSerialNumber,
String enableBatchNumber)throws Exception{
int result=0;
try{
List<Long> idList = new ArrayList<>();
@@ -420,7 +422,7 @@ public class MaterialService {
if(StringUtil.isNotEmpty(q)) {
q = q.replace("'", "");
}
result = materialMapperEx.findBySelectWithBarCodeCount(idList, q);
result = materialMapperEx.findBySelectWithBarCodeCount(idList, q, enableSerialNumber, enableBatchNumber);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);