Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r14760 -r14772 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14760) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 14772) @@ -1533,7 +1533,6 @@ //获取grid数据 getEditerGridData(); - var submitActionUrl = WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!packForeignProxyDisinfection.do'; form.form.submit({ url : submitActionUrl, @@ -1555,7 +1554,11 @@ } }, failure : function(form, action) { - showResult(action.failureType); + if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.msg)){ + showResult(action.result.msg); + }else{ + showResult("操作失败!"); + } } }); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java =================================================================== diff -u -r14759 -r14772 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java (.../ForeignProxyDisinfectionAction.java) (revision 14759) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java (.../ForeignProxyDisinfectionAction.java) (revision 14772) @@ -147,9 +147,10 @@ boolean printTousse = JSONUtil.optBoolean(params, "printTousse", false); boolean printApplication = JSONUtil.optBoolean(params, "printApplication", false); ForeignProxyDisinfection retForeignProxyDisinfection = null; + jsonObj.put("success", false); try { try { - foreignProxyDisinfectionManager.packForeignProxyDisinfection(foreignProxyDisinfection,params); + retForeignProxyDisinfection = foreignProxyDisinfectionManager.packForeignProxyDisinfection(foreignProxyDisinfection,params); jsonObj.put("success", true); } catch (Exception e) { e.printStackTrace(); @@ -160,8 +161,8 @@ if(printApplication || printTousse){ try { Long id = foreignProxyDisinfection.getId(); - if(DatabaseUtil.isPoIdValid(id)){ - params.put("id", id); + if(retForeignProxyDisinfection!=null && retForeignProxyDisinfection.hasPacked()){ + params.put("id", retForeignProxyDisinfection.getId()); foreignProxyDisinfectionManager.getPrintInfo(jsonObj,params); jsonObj.put("success", true); }