Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r14357 -r14624 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 14357) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 14624) @@ -1005,15 +1005,44 @@ String wasteReason = StrutsParamUtils.getPraramValue("reason", null); - if (StringUtils.isNotBlank(ids)) { + JSONObject jobj = new JSONObject(); + + int successCount = 0; + String error = null; + try { + if(StringUtils.isBlank(wasteReason)){ + throw new RuntimeException("废弃原因不能为空!"); + } + if(StringUtils.isBlank(ids)){ + throw new RuntimeException("器械包id不能为空!"); + } for (String id : ids.split(";")) { if (StringUtils.isNotBlank(id)) { - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(id); - tousseInstanceManager.discardTousseInstance(tousseInstance, wasteReason); + try { + TousseInstance tousseInstance = tousseInstanceManager + .getTousseInstanceById(id); + if(tousseInstance == null){ + continue; + } + tousseInstanceManager.discardTousseInstance(tousseInstance, wasteReason); + ++successCount; + } catch (Exception e) { + e.printStackTrace(); + error = e.getMessage(); + } } } + } catch (Exception e) { + e.printStackTrace(); + error = e.getMessage(); } + if(StringUtils.isBlank(error)){ + jobj.put("success", true); + }else{ + jobj.put("success", false); + jobj.put("msg", error); + } + StrutsResponseUtils.output(jobj); } // 废弃全部器械包物品 Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r14623 -r14624 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 14623) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 14624) @@ -29,12 +29,18 @@ params : {ids : tousseInstancesIds,reason:remark}, success : function(response, options) { hideMessageBox(true); - showResult("废弃成功!"); - reloadTousseInstances(); + var retObj = JSON.parse(response.responseText); + if(isUndefinedOrNullOrEmpty(retObj.msg)){ + showResult("废弃成功!"); + }else{ + showResult(retObj.msg); + } + reloadTousseInstances(); }, failure : function(response, options) { hideMessageBox(true); showResult("废弃失败!"); + reloadTousseInstances(); } }); }else{