Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r14409 -r14455 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 14409) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 14455) @@ -279,6 +279,8 @@ if(returnType=="basketNotFound"){//条码不存在 showResult("找不到该包或篮筐。"); Ext.getCmp('barcode').setValue(''); + }else if(returnType == "noResult"){ + showResult('未找到相应的结果'); }else if(returnType == "tousseInstanceSuccess"){//扫描的是包 if(Ext.getCmp('basketBarcode').getValue() == '') { showResult('请先录入篮筐'); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r14452 -r14455 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 14452) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 14455) @@ -1464,7 +1464,7 @@ //3.根据条件进行查询 sql += "order by id"; - result.put("result", "tousseInstanceSuccess"); + result.put("returnType", "tousseInstanceSuccess"); result.put("result", objectDao.findBySql("TousseInstance", sql)); /*jsonStr = "{returnType:'tousseInstanceSuccess',tousseId:'"+tousseInstance.getId() + "',tousseName:'"+tousseInstance.getShowTousseName() + "',taskGroup:'" @@ -1704,19 +1704,18 @@ Map result = getTousseInstanceListByRange(barcode, barcodeEnd , TousseInstance.STATUS_PACKED); if(result != null && "tousseInstanceSuccess".equals(result.get("returnType"))){ List tousseInstanceList = (List)result.get("result"); - JSONObject jsonObj = new JSONObject(); if(CollectionUtils.isNotEmpty(tousseInstanceList)){ JSONArray tousses = new JSONArray(); - jsonObj.put("returnType", "multiTousseInstancesSuccess"); + json.put("returnType", "multiTousseInstancesSuccess"); for(int i = 0;i < tousseInstanceList.size();i++){ TousseInstance tousseInstance = (TousseInstance)tousseInstanceList.get(i); JSONObject tousse = buildTousseInstanceSuccessJson(tousseInstance); tousses.add(tousse); } - jsonObj.put("tousseInstances", tousses); + json.put("tousseInstances", tousses); }else{ - jsonObj.put("returnType", "noResult"); + json.put("returnType", "noResult"); } }else{ JSONUtil.addProperty(json, "returnType", result.get("returnType"));