Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java =================================================================== diff -u -r28801 -r28802 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 28801) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 28802) @@ -414,6 +414,11 @@ }else{ correct = Arrays.asList(TousseInstance.STATUS_PACKED, TousseInstance.STATUS_REVIEWED).contains(status); + if(!correct){ + JSONUtil.addProperty(json, "returnType", "erroeStatus"); + JSONUtil.addProperty(json, "status", status); + return json.toString(); + } } //未审核的包禁止载入到篮筐内 if(!StringUtils.equals(TousseInstance.STATUS_REVIEWED, status) && !tousseInstance.getUnTraceableTousse() && !tousseInstance.getTousseFixedBarcode()){ @@ -467,11 +472,6 @@ } } - if(!correct){ - JSONUtil.addProperty(json, "returnType", "erroeStatus"); - JSONUtil.addProperty(json, "status", status); - return json.toString(); - } JSONObject jsonObj = tousseInstanceManager.buildTousseInstanceSuccessJson("tousseInstanceSuccess", tousseInstance); for(Object key : jsonObj.keySet()){ json.put(key, jsonObj.opt((String)key));