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

修改获取批次商品列表信息的接口的查询逻辑

Browse Source
This commit is contained in:
季圣华
2023-04-01 23:26:07 +08:00
parent de6f8ba7c2
commit 426adf2ad6
4 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -845,16 +845,9 @@ public class DepotItemController {
DepotItem depotItem = depotItemService.getDepotItem(depotItemId);
number = depotHeadService.getDepotHead(depotItem.getHeaderId()).getNumber();
}
List<DepotItemVoBatchNumberList> reslist = new ArrayList<>();
List<DepotItemVoBatchNumberList> list = depotItemService.getBatchNumberList(number, name, depotId, barCode, batchNumber);
for(DepotItemVoBatchNumberList bn: list) {
if(bn.getTotalNum()!=null && bn.getTotalNum().compareTo(BigDecimal.ZERO)>0) {
reslist.add(bn);
}
bn.setExpirationDateStr(Tools.parseDateToStr(bn.getExpirationDate()));
}
map.put("rows", reslist);
map.put("total", reslist.size());
map.put("rows", list);
map.put("total", list.size());
res.code = 200;
res.data = map;
} catch (Exception e) {