Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r12887 -r12980 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 12887) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 12980) @@ -95,6 +95,8 @@ public List getDisposableGoodsStockByDisposableGoodsIDs(String warehouseID,Collection ids); public List getDisposableGoodsBatchStocksByDisposableGoodsStockID(Long disposableGoodsID); + public List getDisposableGoodsBatchStocksExcludingZeroStockByDisposableGoodsStockID(Long disposableGoodsStockID); + public List getDisposableGoodsBatchStocksByDisposableGoodsID(Long disposableGoodsID); public List getDisposableGoodsByBatchBarcodes_ForUpdate(String warehouseID,Collection barcodes); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r12958 -r12980 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12958) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 12980) @@ -192,7 +192,7 @@ String disposableGoodsStockID = StrutsParamUtils.getPraramValue("id", ""); if (StringUtils.isNotBlank(disposableGoodsStockID) && disposableGoodsStockID.equals("0") == false) {// 初始化加载的数据 try { - List disposableGoodsBatchStocks = diposableGoodsManager.getDisposableGoodsBatchStocksByDisposableGoodsStockID(Long.valueOf(disposableGoodsStockID)); + List disposableGoodsBatchStocks = diposableGoodsManager.getDisposableGoodsBatchStocksExcludingZeroStockByDisposableGoodsStockID(Long.valueOf(disposableGoodsStockID)); String jsonString = JSONUtil.toJSONString(disposableGoodsBatchStocks, true); StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r12950 -r12980 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 12950) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 12980) @@ -1475,6 +1475,17 @@ return objectDao.findBySql(DisposableGoodsBatchStock.class.getSimpleName(),queryString); } + public List getDisposableGoodsBatchStocksExcludingZeroStockByDisposableGoodsStockID(Long disposableGoodsStockID){ + if(disposableGoodsStockID == null){ + return null; + } + String queryString = String + .format(" where po.storage>0 and %s ", + SqlUtils.getLongFieldPredicate("po.diposableGoods.id", disposableGoodsStockID)); + // 此时获取的是按照id升序排列的 + return objectDao.findBySql(DisposableGoodsBatchStock.class.getSimpleName(),queryString); + } + public List getDisposableGoodsBatchStocksByDisposableGoodsID(Long disposableGoodsID){ if(disposableGoodsID == null){ return null;