Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js =================================================================== diff -u -r12331 -r13819 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js (.../washBasketMonitorView.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js (.../washBasketMonitorView.js) (revision 13819) @@ -12,7 +12,8 @@ var columns = [ {text : "篮筐名",width : 180,dataIndex : 'containerName'}, {text : "篮筐状态",width : 100,dataIndex : 'status'}, - {text : "篮筐条码",width : 150,dataIndex : 'barcode'} + {text : "篮筐条码",width : 150,dataIndex : 'barcode'}, + {text : "清洗分类类型",width : 150,dataIndex : 'washClassifyType'} ]; var basketStore = new Ext4.data.JsonStore({ proxy : { @@ -29,7 +30,8 @@ fields : [ {name : 'containerName'}, {name : 'status'}, - {name : 'barcode'} + {name : 'barcode'}, + {name : 'washClassifyType'} ] }); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java =================================================================== diff -u -r13300 -r13819 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java (.../ContainerAction.java) (revision 13300) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java (.../ContainerAction.java) (revision 13819) @@ -4,15 +4,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.servlet.http.HttpServletResponse; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; import net.sf.json.util.PropertyFilter; + import org.apache.commons.lang.StringUtils; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; + import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; @@ -23,6 +27,7 @@ import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JsonPropertyFilter; +import com.forgon.tools.string.StringTools; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -105,6 +110,7 @@ obj.put("status", container.getStatus()); obj.put("isCurrent", container.getIsCurrent()); obj.put("barcode", container.getBarcode()); + obj.put("washClassifyType", StringTools.getDefaultString(container.getWashClassifyType())); array.add(obj); }