Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js =================================================================== diff -u -r23658 -r23739 --- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23658) +++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23739) @@ -240,7 +240,7 @@ } } else{ - showResult(obj.error); + showResult(obj.message); } }); DWREngine.setAsync(true); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r23701 -r23739 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 23701) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 23739) @@ -1944,7 +1944,7 @@ printByJsonPrintObject(obj, newP,false,0,true); } else{ - showResult(obj.error); + showResult(obj.message); } }); } Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r23718 -r23739 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23718) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23739) @@ -351,10 +351,9 @@ //更新完打印状态之后,及时刷新页面 grid.dwrReload(); }); - } }else{ - showResult(obj.error); + showResult(obj.message); } }); } Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js =================================================================== diff -u -r22880 -r23739 --- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 22880) +++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 23739) @@ -294,7 +294,7 @@ hideMessageBox(true); } else{ - showResult(obj.error); + showResult(obj.message); } }); DWREngine.setAsync(true); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r23736 -r23739 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23736) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23739) @@ -70,10 +70,6 @@ import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.SqlUtils; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; /** * @author songwei 2012-3-24 下午13:50:34 @@ -1014,10 +1010,10 @@ } catch (JSONException e) { logger.error("转化成JSON对象时出错：\r\n请求参数：" + jsonParams, e); - return JSONUtil.buildErrorMsgJsonResult("参数非JSON格式"); + return JSONUtil.buildJsonObject(false, "参数非JSON格式").toString(); } if (jsonObject == null) { - return JSONUtil.buildErrorMsgJsonResult("参数非JSON格式"); + return JSONUtil.buildJsonObject(false, "参数非JSON格式").toString(); } List printSummaryList = new ArrayList(); @@ -1051,21 +1047,15 @@ String printUser = AcegiHelper.getLoginUserFullName(); for (String dept : depts) { - Collection allTousseItems = getCustomTousseItems(tousseTypes,dept); - recyclingApplicationManager.populateSummaryList(printScope, allTousseItems, - printSummaryList, 8, - true, true, shiftName, "",false); - + printSummaryList, 8, true, true, shiftName, "",false); recyclingApplicationManager.setPrintInfo(printUser, printSummaryList); } } - } else{ - // 同一科室的多张申请单是否合并在一起打印 boolean isMergePrintMultiApplicationsOfSameDepart = true; if (PrintConfig.MERGE_PRINT_NO.equals(config @@ -1102,14 +1092,13 @@ } } else{ - return JSONUtil.buildErrorMsgJsonResult("未设置属于【" + shiftName + "】的科室，请设置后再打印！"); + return JSONUtil.buildJsonObject(false, "未设置属于【" + shiftName + "】的科室，请设置后再打印！").toString(); } } else{ - return JSONUtil.buildErrorMsgJsonResult("未找到打印分组定义，请检查打印分组设置"); + return JSONUtil.buildJsonObject(false, "未找到打印分组定义，请检查打印分组设置").toString(); } - } - else if ("print".equalsIgnoreCase(action)){ + }else if ("print".equalsIgnoreCase(action)){ String applicationIds = jsonObject.optString("ids",""); JSONObject printScope = jsonObject.optJSONObject("printScope"); @@ -1186,7 +1175,7 @@ recyclingApplicationManager.getPrintObject(printScope, invoicePlans, printSummaryList); } - JsonObject json = new JsonObject(); + JSONObject json = null; if (printSummaryList.size() >0){ //需要打印的部门名单 List needToPrintList = new LinkedList<>(); @@ -1198,25 +1187,19 @@ List noPrintListNames = this.handleNeedToShowNoPrintListNames(allNeedToPrintDept,needToPrintList); - json.addProperty("success", true); - Gson gson = new GsonBuilder().create(); - JsonArray jsonArray = gson.toJsonTree(printSummaryList).getAsJsonArray(); - json.add("data", jsonArray); - json.addProperty("totalPageAmount", pageAmount); + json = JSONUtil.buildJsonObject(true,JSONArray.fromObject(printSummaryList)); + json.put("totalPageAmount", pageAmount); if (CollectionUtils.isNotEmpty(noPrintListNames)){ - json.add("noPrintList",gson.toJsonTree(noPrintListNames).getAsJsonArray()); + json.put("noPrintList",JSONArray.fromObject(noPrintListNames)); } - - } - else{ - - json.addProperty("success", false); + }else{ + String message = null; if ("batchPrint".equalsIgnoreCase(action)){ - json.addProperty("error", "属于【" + shiftName + "】的科室没有需要打印的申请单。"); + message = "属于【" + shiftName + "】的科室没有需要打印的申请单。"; + }else{ + message = "该申请单没有符合条件的打印内容，请检查申请单状态和物品内容是否满足打印条件！"; } - else{ - json.addProperty("error", "该申请单没有符合条件的打印内容，请检查申请单状态和物品内容是否满足打印条件！"); - } + json = JSONUtil.buildJsonObject(false, message); } logger.debug("批量打印发货计划的日志:返回结果的json=" + json); return json.toString(); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r23718 -r23739 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 23718) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 23739) @@ -1865,9 +1865,6 @@ @Override public JSONObject getPrintObjectByTimePeriod(JSONObject printScope, String fromTime, String toTime, String printUser) { - - JSONObject printSummaryObj = new JSONObject(); - boolean printTousse = printScope.optBoolean("printTousse"); boolean printDisinfectGoods = printScope .optBoolean("printDisinfectGoods"); @@ -1934,17 +1931,16 @@ vo.setSerialNumber(i+1); totalGoodsAmount += vo.getGoodsAmount(); } - printSummaryObj.put("totalGoodsAmount", totalGoodsAmount); - - boolean success = true; + String message = null; if (printRowVos.size() == 0){ success = false; - printSummaryObj.put("error", "该时间段内没有需要打印的内容！"); + message = "该时间段内没有需要打印的内容！"; } - printSummaryObj.put("success", success); + JSONObject printSummaryObj = JSONUtil.buildJsonObject(success, message); + printSummaryObj.put("totalGoodsAmount", totalGoodsAmount); printSummaryObj.put("goods", printRowVos); printSummaryObj.put("tousses", printTousseVos);