Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java =================================================================== diff -u -r16179 -r16236 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java (.../QualityMonitoringDefinitionAction.java) (revision 16179) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java (.../QualityMonitoringDefinitionAction.java) (revision 16236) @@ -18,9 +18,11 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; +import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition; import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItem; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.qualitymonitoring.definition.service.QualityMonitoringDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.tools.StrutsParamUtils; @@ -277,5 +279,60 @@ } return sourceStr; } + /** + * 质量监测页面通过篮筐条码和清洗记录id,获取位置信息 + * @return + */ + public String getPostionMsg() { + String barcode = StrutsParamUtils.getPraramValue("barcode", ""); + // 清洗记录的id + String washAndDisinfectRecordId = StrutsParamUtils.getPraramValue("qualityMonitoringWRRecordID", ""); + JSONObject obj = JSONUtil.buildJsonObject(false); + try{ + if (StringUtils.isNotBlank(barcode)) { + String positionMsg = null; + ClassifyBasket classifyBasket = null; + WashAndDisinfectRecord wrRecord = null; + if(StringUtils.isNotBlank(washAndDisinfectRecordId)){ + wrRecord = (WashAndDisinfectRecord) objectDao.getByProperty( + WashAndDisinfectRecord.class.getSimpleName(), "id", Long.valueOf(washAndDisinfectRecordId)); + if(wrRecord != null){ + for(ClassifyBasket cb : wrRecord.getClassifyBaskets()){ + if(barcode.equals(cb.getContainerBarcode())){ + classifyBasket = cb; + } + } + }else{ + obj.put("success", false); + obj.put("message", "获取不到清洗记录!"); + StrutsResponseUtils.output(obj); + return null; + } + } + + // 通过篮筐的条码实例,查询到清洗的位置信息 + if(classifyBasket != null && StringUtils.isNotBlank(classifyBasket.getPosition())){ + positionMsg = wrRecord.getDisinfectIdentification() + " : " + classifyBasket.getPosition(); + obj.put("success", true); + obj.put("positionMsg", positionMsg); + obj.put("message", "获取位置成功!"); + }else{ + obj.put("success", false); + if(classifyBasket == null){ + obj.put("message", "找不到篮筐或清洗记录没有该篮筐!"); + }else{ + obj.put("message", "找不到篮筐位置信息!"); + } + } + }else{ + obj.put("success", false); + obj.put("message", "篮筐条码不能为空!"); + } + }catch(Exception ex){ + obj = JSONUtil.buildJsonObject(false, ex.getMessage()); + } + StrutsResponseUtils.output(obj); + return null; + } } Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r16223 -r16236 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 16223) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 16236) @@ -639,7 +639,7 @@ function getPostionByBasketBarcode(tempBarcode,positionId){ if(tempBarcode){ Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/qualityMonitoringConfigAction!getPostionMsg.do', + url : WWWROOT + '/disinfectSystem/qualityMonitoringDefinitionAction!getPostionMsg.do', params : {barcode : tempBarcode,qualityMonitoringWRRecordID : qualityMonitoringWRRecordID}, success : function(response,options){ var result = Ext.decode(response.responseText);