Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java =================================================================== diff -u -r37769 -r37796 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java (.../OperationReservationTableManager.java) (revision 37769) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java (.../OperationReservationTableManager.java) (revision 37796) @@ -322,6 +322,9 @@ Map inStorageAmountMap = new HashMap(); Map amountMap = new HashMap(); + for (Long invoicePlanID : idList) { + amountMap.put(invoicePlanID, 0); + } ResultSet rs = null; try { rs = objectDao.executeSql(sql.toString()); @@ -352,10 +355,6 @@ DatabaseUtil.closeResultSetAndStatement(rs); } - if(MapUtils.isEmpty(amountMap)){ - return storageStatusMap; - } - for (Entry entry : amountMap.entrySet()) { Long invoicePlanID = entry.getKey(); //入库数量 @@ -365,6 +364,11 @@ if(amount == 0){ //没有入库记录 storageStatusMap.put(invoicePlanID, ""); + String endStatus = endStatusMap.get(invoicePlanID); + if(StringUtils.equals(endStatus, InvoicePlan.STATUS_END)){ + //没有入库记录的已终止申请单,取出状态也是已终止 + storageStatusMap.put(invoicePlanID, TAKE_OUT_STATUS_END); + } continue; } if(inStorageAmount == 0){