Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java =================================================================== diff -u -r15916 -r16772 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java (.../WashAndDisinfectRecordTableManager.java) (revision 15916) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java (.../WashAndDisinfectRecordTableManager.java) (revision 16772) @@ -127,4 +127,8 @@ { return rinserManager.isDefineDeviceInterface(rinserName); } + + public String findWashRecordMaterials(String washRecordId){ + return washAndDisinfectRecordManager.loadWashRecordMaterials(washRecordId).toString(); + } } Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r15916 -r16772 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 15916) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 16772) @@ -153,6 +153,7 @@ Ext.onReady(function() { Ext.QuickTips.init(); + Ext4.tip.QuickTipManager.init(); // 记录cookie（3步） function renderColor(v, p, record) { var status = record.data['washStatus']; @@ -347,6 +348,55 @@ dwrCallParams // 这个参数只是占位作用 ); + var tableContent; + grid.on('mouseover', function(e) {// 添加mouseover事件 + var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置 + if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false） + var record = this.getStore().getAt(index); + tableContent = record.data['htmlContent'];// + if(!tableContent){ + var content = ""; + DWREngine.setAsync(false); + WashAndDisinfectRecordTableManager.findWashRecordMaterials(record.data['id'],function(resultStr){ + var result = Ext4.decode(resultStr); + for(var i=0;i" + amount+"" + barcode+""; + content +=""; + //筐内材料 + var materialArray = result.baskets[i].items; + if(materialArray != null && materialArray.length > 0){ + for ( var j = 0; j < materialArray.length; j++) { + var material = materialArray[j]; + content +="   " + material.name +"" + material.amount+""; + content +=" "; + } + } + } + //筐外材料 + for(var i=0;i" + amount+" "; + content +=""; + } + }); + DWREngine.setAsync(true); + tableContent = (""); + tableContent += "" + content + "

物品名称

申请数量

条码


"; + record.set("htmlContent",tableContent); + } + var maxHeight = grid.getInnerHeight(); + var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象 + rowEl.set({ + 'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':' 清洗记录物品列表:'},false); + } + }); + var viewport = new Ext.Viewport({ layout : 'border', items : [{ Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r16383 -r16772 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 16383) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 16772) @@ -83,4 +83,6 @@ public String validateRinserIsWashEnd(WashAndDisinfectRecord washRecord); public void setWashRecordWorkLoadInfo(WashAndDisinfectRecord washRecord); + + public JSONObject loadWashRecordMaterials(String id); } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java =================================================================== diff -u -r16344 -r16772 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 16344) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java (.../WashAndDisinfectRecordAction.java) (revision 16772) @@ -538,54 +538,10 @@ */ public void findWashMaterialByWashID() { String id = StrutsParamUtils.getPraramValue("id", ""); - JSONArray basktArray = new JSONArray(); - JSONArray materialArray = new JSONArray(); - if (StringUtils.isNotBlank(id)) { - WashAndDisinfectRecord washAndDisinfectRecord = washAndDisinfectRecordManager - .getWashAndDisinfectRecordById(id); - List list = washAndDisinfectRecord.getClassifyBaskets(); - if(list != null){ - for (ClassifyBasket classifyBasket : list) { - if(classifyBasket.classifiedItemsIsEmpty()){ - continue; - } - Long classifyBasketId = classifyBasket.getId(); - Set classifiedItems = classifyBasket.getClassfiedItems(); - JSONArray array = beCleanItemManager.getJsonArrayRemovedUnderScoreStringInName(classifiedItems, false); - String personInCharge = StringUtils.defaultIfEmpty(classifyBasket.getPersonInCharge(), ""); - String personInChargeCode = StringUtils.defaultIfEmpty(classifyBasket.getPersonInChargeCode(), ""); - String position = StringUtils.defaultIfEmpty(classifyBasket.getPosition(), ""); - - JSONObject baskeJson = new JSONObject(); - baskeJson.put("classifyBasketId", classifyBasketId); - baskeJson.put("containerName", classifyBasket.getContainerName()); - baskeJson.put("amount", 1); - baskeJson.put("containerBarcode", classifyBasket.getContainerBarcode()); - baskeJson.put("personInCharge", personInCharge); - baskeJson.put("personInChargeCode", personInChargeCode); - baskeJson.put("position", position); - baskeJson.put("items", array); - basktArray.add(baskeJson); - } - } - List materials = washAndDisinfectRecord - .getWashAndDisinfectMaterials(); - if(materials != null){ - for (WashAndDisinfectRecordMaterial material : materials) { - JSONObject materialJson = new JSONObject(); - materialJson.put("id", material.getId()); - materialJson.put("name", material.getName()); - materialJson.put("amount", material.getAmount()); - materialArray.add(materialJson); - } - } - } - JSONObject result = new JSONObject(); - result.put("baskets", basktArray); - result.put("materials", materialArray); + JSONObject result = washAndDisinfectRecordManager.loadWashRecordMaterials(id); StrutsResponseUtils.output(result); } - + public void getPendingWashAndDisinfectTousseAndBasket(){ try { // String status = StrutsParamUtils.getPraramValue("status", ""); Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r16484 -r16772 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 16484) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 16772) @@ -20,7 +20,6 @@ import net.sf.json.util.JSONStringer; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang.StringUtils; import org.hibernate.Query; @@ -37,7 +36,6 @@ import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager; import com.forgon.disinfectsystem.basedatamanager.rinser.service.RinserManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; @@ -58,7 +56,6 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; -import com.forgon.log.service.LogManagerImpl; import com.forgon.security.model.User; import com.forgon.security.service.UserManager; import com.forgon.serialnumber.model.SerialNum; @@ -1349,4 +1346,53 @@ return params; } + + @Override + public JSONObject loadWashRecordMaterials(String id) { + JSONArray basktArray = new JSONArray(); + JSONArray materialArray = new JSONArray(); + if (StringUtils.isNotBlank(id)) { + WashAndDisinfectRecord washAndDisinfectRecord = getWashAndDisinfectRecordById(id); + List list = washAndDisinfectRecord.getClassifyBaskets(); + if(list != null){ + for (ClassifyBasket classifyBasket : list) { + if(classifyBasket.classifiedItemsIsEmpty()){ + continue; + } + Long classifyBasketId = classifyBasket.getId(); + Set classifiedItems = classifyBasket.getClassfiedItems(); + JSONArray array = beCleanItemManager.getJsonArrayRemovedUnderScoreStringInName(classifiedItems, false); + String personInCharge = StringUtils.defaultIfEmpty(classifyBasket.getPersonInCharge(), ""); + String personInChargeCode = StringUtils.defaultIfEmpty(classifyBasket.getPersonInChargeCode(), ""); + String position = StringUtils.defaultIfEmpty(classifyBasket.getPosition(), ""); + + JSONObject baskeJson = new JSONObject(); + baskeJson.put("classifyBasketId", classifyBasketId); + baskeJson.put("containerName", classifyBasket.getContainerName()); + baskeJson.put("amount", 1); + baskeJson.put("containerBarcode", classifyBasket.getContainerBarcode()); + baskeJson.put("personInCharge", personInCharge); + baskeJson.put("personInChargeCode", personInChargeCode); + baskeJson.put("position", position); + baskeJson.put("items", array); + basktArray.add(baskeJson); + } + } + List materials = washAndDisinfectRecord + .getWashAndDisinfectMaterials(); + if(materials != null){ + for (WashAndDisinfectRecordMaterial material : materials) { + JSONObject materialJson = new JSONObject(); + materialJson.put("id", material.getId()); + materialJson.put("name", material.getName()); + materialJson.put("amount", material.getAmount()); + materialArray.add(materialJson); + } + } + } + JSONObject result = new JSONObject(); + result.put("baskets", basktArray); + result.put("materials", materialArray); + return result; + } }