Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r28350 -r28504 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 28350) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 28504) @@ -2545,12 +2545,24 @@ return result; } + /** + * 校验和构造灭菌篮筐返回的json + * @param container + * @return + */ private String buildJsonResultForSterileContainer(Container container) { if (!Container.CONTAINERTYPE_BASKET .equals(container.getContainerType())) {// 容器的类型必须是篮筐 return JSONUtil.buildErrorMsgJsonResult("此条码非篮筐"); } + //容器用途.判断是否为灭菌筐 + String purpose = container.getPurpose(); + if (!Container.CONTAINER_PURPOSE_DISINFECTION + .equals(purpose)) { + return JSONUtil.buildErrorMsgJsonResult("该篮筐是"+ purpose +",请扫描灭菌篮筐!"); + } + if (Container.CONTAINER_STATUS_STERILIZING .equals(container.getStatus())) { return JSONUtil.buildErrorMsgJsonResult("此篮筐正在灭菌");