Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java =================================================================== diff -u -r13637 -r13907 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java (.../DisposableGoodsStorageRecordManagerImpl.java) (revision 13637) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java (.../DisposableGoodsStorageRecordManagerImpl.java) (revision 13907) @@ -38,6 +38,11 @@ JSONObject jsonObject = new JSONObject(); JSONArray jsonArray = new JSONArray(); boolean success = false; + //汇总信息 + long sumTotalAmount = 0; + long sumOutTotalAmount = 0; + double sumTotalPrice = 0.0; + double sumOutTotalPrice = 0.0; if(DatabaseUtil.isPoIdValid(disposableGoodsId)){ StringBuilder sb = new StringBuilder(); Set warehosueIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds(); @@ -114,7 +119,8 @@ if(price != null){ priceStr = String.format("%.2f",price.doubleValue()); } - String totalPrice = String.format("%.2f",resultSet.getDouble("totalPrice")); + double dTotalPrice = resultSet.getDouble("totalPrice"); + String totalPrice = String.format("%.2f",dTotalPrice); String subType = resultSet.getString("subType"); item.put("operator", resultSet.getString("operator")); @@ -129,12 +135,16 @@ item.put("totalPrice", totalPrice); item.put("outAmout", ""); item.put("outTotalPrice", ""); + sumTotalAmount += amout; + sumTotalPrice += dTotalPrice; }else{ item.put("amount", ""); item.put("price", ""); item.put("totalPrice", ""); item.put("outAmout", amout); item.put("outTotalPrice", totalPrice); + sumOutTotalAmount += amout; + sumOutTotalPrice += dTotalPrice; } item.put("name", name); item.put("specification", specification); @@ -150,6 +160,13 @@ DatabaseUtil.closeResultSetAndStatement(resultSet); } } + JSONObject item = new JSONObject(); + item.put("amount", sumTotalAmount); + item.put("totalPrice", String.format("%.2f",sumTotalPrice)); + item.put("outAmout", sumOutTotalAmount); + item.put("outTotalPrice", String.format("%.2f",sumOutTotalPrice)); + jsonArray.add(item); + jsonObject.put("data", jsonArray); jsonObject.put("success", success); return jsonObject;