Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js =================================================================== diff -u -r13520 -r14022 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js (.../materialDefinitionForm.js) (revision 13520) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js (.../materialDefinitionForm.js) (revision 14022) @@ -404,6 +404,20 @@ triggerAction : 'all', anchor : '95%' }] + },{ + columnWidth : 1, + layout : 'form', + labelWidth : 100, + items : [{ + xtype : 'textarea', + fieldLabel : '注意事项', + height : 50, + id : 'notice', + name : 'notice', + maxLength : 665, + allowBlank : true, + anchor : '100%' + }] } ]},{ columnWidth: 1, Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r13390 -r14022 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 13390) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 14022) @@ -37,7 +37,7 @@ for (var i=0; i'+materialName+'' + trData += ''+materialName+'' +''+materialAmount+''; } document.getElementById("myTable").innerHTML = "" + trData + "
"; @@ -52,14 +52,40 @@ $('#tousseOrMaterialImage').css('width','800px'); $('#MaterialID').remove(); } - +/** + * 材料被点击时触发 + * @param mName 材料名称,包括规格 + */ +function onMaterialItemClick(mName,tr){ + loadMaterialPic(mName,tr); + loadMaterialNotice(mName); +} //加载材料图片.mName:材料名称,tr:当前行对象 function loadMaterialPic(mName , tr){ document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + mName + '&number=' + number +'&time='+new Date(); $("#materialTable tr").css("background" , "#FFFFFF"); $(tr).css("background" , "#eeeeee"); } - +/** + * 加载材料定义的注意事项 + */ +function loadMaterialNotice(mName){ + $.ajax({ + type:'post', + url:'${ctx}/disinfectSystem/baseData/materialDefinitionAction!getMaterialNotice.do', + data:'materialName=' + mName, + dataType:'json', + success:function(result){ + if(result.success){ + var notice = result.notice; + var text = notice.replace(/\r\n/g,"

"); + $("#materialRemark").html(text); + } + }, + error:function(XMLHttpRequest, textStatus, errorThrown){ + } + }); +} //加载器械包图片 function loadTousseImage(){ $("#materialTable tr").css("background" , "#FFFFFF"); @@ -129,9 +155,16 @@

-
+
- + +
+
+

注意事项

+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r13655 -r14022 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 13655) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 14022) @@ -158,6 +158,12 @@ .image-box .box .w7{font-size:18px; width:20px} .image-box .box .w8{font-size:18px; width:20px} +.remark-box{ margin:0 auto; font-size:13px; background:#f0f0f0; padding:0px 0px} +.remark-box .table{ border:1px solid #ddd; padding:1px} +.remark-box .box{ overflow-y:scroll; background:#fff; overflow-x:hidden} +.remark-box .box .notice{color:#2e6271;} +.remark-box .box .title{text-align:center;font-size:15px;color:#2e6271;} + .afrl-box{ width:1980px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px} .afrl-box .table{ border:1px solid #ddd; padding:1px} .afrl-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;} Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java =================================================================== diff -u -r13300 -r14022 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java (.../MaterialDefinitionAction.java) (revision 13300) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java (.../MaterialDefinitionAction.java) (revision 14022) @@ -43,9 +43,12 @@ import com.forgon.tools.FileSystemHelper; import com.forgon.tools.GB2Alpha; import com.forgon.tools.GB2WB; +import com.forgon.tools.ImageUtils; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -346,10 +349,7 @@ } } OutputStream outputStream = null; - if (img == null || img.length == 0) { - img = FileSystemHelper.readBlankImageBytes(StrutsParamUtils - .getServletContext().getRealPath("/")); - } + img = ImageUtils.defaultIfEmpty(img); try { HttpServletResponse response = StrutsParamUtils.getResponse(); response.setContentType("image/jpeg"); @@ -403,7 +403,7 @@ img = imageFileManager.getImageByIdAndType(def.getId(), ImageFile.IMAGE_TYPE_MATERIAL, number); - + img = ImageUtils.defaultIfEmpty(img); try { HttpServletResponse response = StrutsParamUtils.getResponse(); response.setContentType("image/jpeg"); @@ -414,6 +414,27 @@ } } } + + public void getMaterialNotice(){ + String name = StrutsParamUtils.getPraramValue("materialName", null); + String specification = null; + if (StringUtils.isNotBlank(name) && name.lastIndexOf("[") != -1) { + specification = name.substring(name.lastIndexOf("[") + 1, + name.length() - 1); + name = name.substring(0, name.lastIndexOf("[")).trim(); + } + + if (StringUtils.isNotBlank(name)){ + MaterialDefinition def = materialDefinitionManager + .getMaterialDefinitionByName(name, specification); + if(def != null){ + JSONObject json = JSONUtil.buildJsonObject(true); + json.put("notice", def.getNotice()); + StrutsResponseUtils.output(json); + } + } + StrutsResponseUtils.output(JSONUtil.buildJsonObject(false)); + } /** * 添加修改 MaterialDefinition Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java =================================================================== diff -u -r13520 -r14022 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java (.../MaterialDefinition.java) (revision 13520) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java (.../MaterialDefinition.java) (revision 14022) @@ -18,6 +18,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.string.StringTools; /** * @author WangYi @@ -78,6 +79,10 @@ private String washClassifyType;//清洗分类类型 private String goodsType = TYPE_MATERIALGOODS; + /** + * 注意事项 + */ + private String notice; public static Map ColumnNameAndPoPropertyNameMap = new LinkedHashMap(13); @@ -331,5 +336,13 @@ public void setGoodsType(String goodsType) { this.goodsType = goodsType; } + + public String getNotice() { + return StringTools.defaultString(notice); + } + + public void setNotice(String notice) { + this.notice = StringTools.defaultString(notice); + } }