Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
===================================================================
diff -u -r13479 -r13520
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 13479)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 13520)
@@ -27,6 +27,11 @@
 		data : [ ['是' ], ['否' ]]
 	});
 	
+	var goodsTypeStore = new Ext.data.SimpleStore({
+		fields : [ 'value' ],
+		data : [ [goodsType_materialGoods], [goodsType_expensiveGoods]]
+	});
+	
 /////////////////////////////////////////图片预览
 	var page = 1;
 	var totalPage = 0;
@@ -379,7 +384,27 @@
 									triggerAction : 'all',
 									anchor : '95%'
 					         }]
-					}
+					}, {
+				         columnWidth : .5,
+				         layout : 'form',
+				         labelWidth : 110,
+				         items:[{
+				 				xtype : 'combo',
+								fieldLabel : '是否高值耗材',
+								id : 'goodsType',
+								name : 'goodsType',
+								width : 130,
+								valueField : 'value',
+								displayField : 'value',
+								store : goodsTypeStore,
+								allowBlank: false,
+								editable:false,
+								mode : 'local',
+								forceSelection : true,
+								triggerAction : 'all',
+								anchor : '95%'
+				         }]
+				}
 			  ]},{
 		        	 columnWidth: 1,
 		        	 layout: 'form', 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
===================================================================
diff -u -r13113 -r13520
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 13113)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 13520)
@@ -161,6 +161,10 @@
 			width : 100,
 			dataIndex : 'isTraceble'
 		},{
+			header : "是否高值耗材",
+			width : 100,
+			dataIndex : 'goodsType'
+		},{
 			header : "最大货存",
 			width : 100,
 			hidden : true,
@@ -212,8 +216,7 @@
 				},{
 					type : 'numeric',
 					dataIndex : 'minStorage'
-				}
-				,{
+				},{
 					type : 'numeric',
 					dataIndex : 'storage'
 				},{
@@ -222,6 +225,9 @@
 				},{
 					type : 'numeric',
 					dataIndex : 'depreciation'
+				},{
+					type : 'numeric',
+					dataIndex : 'goodsType'
 				}]
 			});
 
@@ -253,7 +259,9 @@
 			name : 'depreciation'
 		},{
 		    name : 'isUploadImage'
-		} ];
+		},{
+		    name : 'goodsType'
+		}];
 
 		var sign = true;
 		var tbar = [ {
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
===================================================================
diff -u -r13277 -r13520
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 13277)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 13520)
@@ -28,6 +28,9 @@
 	}, {
 		name : 'referencePrice',
 		mapping : 'referencePrice'
+	}, {
+		name : 'goodsType',
+		mapping : 'goodsType'
 	}])
 });
 
@@ -51,6 +54,12 @@
 	fields : ['hasType'],
 	data : [[HAS_TYPE_NO],[HAS_TYPE_YES]]
 });
+
+var goodsTypeStore = new Ext.data.SimpleStore({
+	fields : [ 'value' ],
+	data : [ [goodsType_materialGoods], [goodsType_expensiveGoods]]
+});
+
 var GodownEntryItemRecord = Ext.data.Record.create([
 	{name : 'id'},
 	{name : 'materialId'},
@@ -59,7 +68,8 @@
 	{name : 'cost'},
 	{name : 'supplierName'},
 	{name : 'certification'},
-	{name : 'hasInvoice'}
+	{name : 'hasInvoice'},
+	{name : 'goodsType'}
 ]);
 
 function addItems(materialId,name,count,cost,supplierName){
@@ -100,6 +110,7 @@
 		}
 	}
 	var certification = top.Ext.getCmp('certification').getValue();
+	var goodsType = top.Ext.getCmp("goodsType").getValue();
 	
 	for(var i = 0;i < top.Ext.getCmp('materialEntryItemGrid').getStore().getCount();i++){
 		if(top.Ext.getCmp('materialEntryItemGrid').getStore().getAt(i).data.materialId == materialId){
@@ -116,7 +127,8 @@
 		cost : cost,
 		supplierName : supplierName,
 		certification : certification,
-		hasInvoice : hasInvoice
+		hasInvoice : hasInvoice,
+		goodsType : goodsType
 	});
 	top.Ext.getCmp('materialEntryItemGrid').getStore().add(godownEntryItem);
 	
@@ -125,6 +137,7 @@
 	top.Ext.getCmp('cost1').setValue('');
 	top.Ext.getCmp('materialId').setValue('');
 	top.Ext.getCmp('supplier1').setValue('');
+	top.Ext.getCmp('goodsType').setValue('');
 	top.Ext.getCmp('hasInvoice').setValue('');
 	top.Ext.getCmp('certification').setValue('');
 	top.Ext.getCmp('name1').focus();
@@ -390,6 +403,23 @@
 	    					}
 	    				}
 	        		}),hidden:!sstsConfig.godownEntryShowInvoice
+	        	},{
+	        		header : "是否高值耗材",width : 100,menuDisabled : true,dataIndex : 'goodsType',
+	        		editor : new top.Ext.form.ComboBox({ 						
+	    				minChars : 0,
+	    				store : goodsTypeStore,
+	    				forceSelection : true,
+	    				lazyInit : false,
+	    				valueField : 'value',
+						displayField : 'value',
+						mode : 'local',
+	    				triggerAction : 'all',
+	    				hideTrigger : false,
+	    				editable: false,
+	    				typeAhead : false,
+	    				allowBlank : false,
+	    				width : 100
+	        		}),hidden:!sstsConfig.godownEntryShowInvoice
 	        	},{header : "删除",width : 100,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton}
 	        ]),
 			width :735,
@@ -426,6 +456,7 @@
 						top.Ext.getCmp('name1').setValue(record.data.name);
 						top.Ext.getCmp('materialId').setValue(record.data.id);
 						top.Ext.getCmp('cost1').setValue(record.data.cost);
+						top.Ext.getCmp('goodsType').setValue(record.data.goodsType);
 					},
 					specialkey : function(field, ee) {
 						if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -507,6 +538,27 @@
 				render : function() {
 					var tbar = new top.Ext.Toolbar ({
 						items:[{
+							text:'是否高值耗材:'
+						},{
+							xtype : 'combo',
+							id : 'goodsType',
+							name : 'goodsType',
+							minChars : 0,
+							valueField : 'value',
+							displayField : 'value',
+							mode : 'local',
+							store : goodsTypeStore,
+							forceSelection : true,
+							lazyInit : false,
+							editable:false,
+							triggerAction : 'all',
+							hideTrigger : false,
+							typeAhead : false,
+							selectOnFocus :true,
+							allowBlank : true,
+							width : 100,
+							tabIndex : 9
+						},{
 								text:'有无发票:',
 								hidden:!sstsConfig.godownEntryShowInvoice
 							},{
@@ -520,8 +572,9 @@
 								store : hasTypeStore,
 								forceSelection : true,
 								lazyInit : false,
+								editable:false,
 								triggerAction : 'all',
-								hideTrigger : true,
+								hideTrigger : false,
 								typeAhead : false,
 								selectOnFocus :true,
 								allowBlank : true,
@@ -568,7 +621,7 @@
 									var count = top.Ext.getCmp('amount1').getValue();
 									var cost = top.Ext.getCmp('cost1').getValue();
 									var supplierName = top.Ext.getCmp('supplier1').getValue();
-										addItems(materialId,name,count,cost,supplierName);
+									addItems(materialId,name,count,cost,supplierName);
 								}
 							}]
 					});
@@ -600,6 +653,7 @@
 					jsonArray[len].supplierName = record.data.supplierName;
 					jsonArray[len].certification = record.data.certification;
 					jsonArray[len].hasInvoice = record.data.hasInvoice;
+					jsonArray[len].goodsType = record.data.goodsType;
 				}
 				top.Ext.getCmp("items").setValue(Ext.encode(jsonArray));
 				
@@ -725,7 +779,8 @@
 					cost : action.result.data.itemsList[i].cost,
 					supplierName : action.result.data.itemsList[i].supplierName,
 					certification : action.result.data.itemsList[i].certification,
-					hasInvoice : action.result.data.itemsList[i].hasInvoice
+					hasInvoice : action.result.data.itemsList[i].hasInvoice,
+					goodsType : action.result.data.itemsList[i].goodsType
 				});
 				
 				top.Ext.getCmp('materialEntryItemGrid').getStore().add(godownEntryItem);
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp
===================================================================
diff -u -r13257 -r13520
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp	(.../materialEntryView.jsp)	(revision 13257)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp	(.../materialEntryView.jsp)	(revision 13520)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%>
 <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
@@ -15,6 +16,8 @@
 <script type="text/javascript">
 var HAS_TYPE_YES = '<%=GodownEntryItem.HAS_TYPE_YES%>';
 var HAS_TYPE_NO = '<%=GodownEntryItem.HAS_TYPE_NO%>';
+var goodsType_materialGoods = '<%=MaterialDefinition.TYPE_MATERIALGOODS%>';
+var goodsType_expensiveGoods = '<%=MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS%>';
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r13132 -r13520
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 13132)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 13520)
@@ -245,10 +245,7 @@
 				}
 				ResultSet rs = objectDao.executeSql(materialSql);
 				
-				List<MaterialDefinition> materialList = new ArrayList<MaterialDefinition>();
 				try {
-					//ResultSetUtil.setFieldValueByResultSet(rs, MaterialDefinition.class, materialList);
-					
 					while(rs.next()){
 						Map<String, Object> temp = new HashMap<String, Object>();
 						temp.put("id", rs.getObject("id"));
@@ -290,6 +287,7 @@
 					temp.put("spelling", md.getSpelling());
 					temp.put("cost", md.getCost());
 					temp.put("storage", md.getStorage());
+					temp.put("goodsType", md.getGoodsType());
 					mapList.add(temp);
 				}
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp
===================================================================
diff -u -r12331 -r13520
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp	(.../materialCheckView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp	(.../materialCheckView.jsp)	(revision 13520)
@@ -6,7 +6,7 @@
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
-<script type="text/javascript" src="${ctx }/dwr/interface/MaterialCheckTableManage.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/MaterialCheckTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDatePicker.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
===================================================================
diff -u -r13300 -r13520
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp	(.../materialDefinitionView.jsp)	(revision 13300)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp	(.../materialDefinitionView.jsp)	(revision 13520)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition"%>
 <%@page import="com.forgon.systemsetting.model.HttpOption"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
@@ -28,6 +29,9 @@
 var warning = '<%=request.getParameter("warning")%>';
 var optionType_materialType = '<%=HttpOption.SYSTEMSETTING_MATERIALTYPE%>';
 var optionType_washClassify = '<%=HttpOption.SYSTEMSETTING_MATERIAL_WASH_CLASSIFY%>';
+
+var goodsType_materialGoods = '<%=MaterialDefinition.TYPE_MATERIALGOODS%>';
+var goodsType_expensiveGoods = '<%=MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS%>';
 </script>
 
 <script type="text/javascript">
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
===================================================================
diff -u -r13399 -r13520
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 13399)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 13520)
@@ -30,6 +30,8 @@
 public class MaterialDefinition{
 	
 	public final static String TYPE_NAME = "材料";
+	public static final String TYPE_MATERIALGOODS = "普通物品";
+	public static final String TYPE_EXPENSIVEMATERIALGOODS = "高值耗材";
 	
 	private Long id;
 	
@@ -74,9 +76,10 @@
 	private Integer intoBasketMaxAmount;//入筐最大数量
 	
 	private String washClassifyType;//清洗分类类型
+	
+	private String goodsType = TYPE_MATERIALGOODS;
 
-	public static Map<String, String> ColumnNameAndPoPropertyNameMap = new LinkedHashMap<String, String>(
-			9);
+	public static Map<String, String> ColumnNameAndPoPropertyNameMap = new LinkedHashMap<String, String>(13);
 
 	static {
 		ColumnNameAndPoPropertyNameMap.put("物品名称", "name");
@@ -320,5 +323,13 @@
 			return false;
 		}
 	}
+
+	public String getGoodsType() {
+		return goodsType;
+	}
+
+	public void setGoodsType(String goodsType) {
+		this.goodsType = goodsType;
+	}
 	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java
===================================================================
diff -u -r13257 -r13520
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java	(.../MaterialEntryItem.java)	(revision 13257)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java	(.../MaterialEntryItem.java)	(revision 13520)
@@ -53,6 +53,11 @@
 	 * 仓库名称
 	 */
 	private String wareHouseName;
+	
+	/**
+	 * 是否高值耗材
+	 */
+	private String goodsType;
 
 
 	@Id
@@ -140,4 +145,13 @@
 	public void setHasInvoice(String hasInvoice) {
 		this.hasInvoice = hasInvoice;
 	}
+
+	public String getGoodsType() {
+		return goodsType;
+	}
+
+	public void setGoodsType(String goodsType) {
+		this.goodsType = goodsType;
+	}
+	
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
===================================================================
diff -u -r13278 -r13520
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java	(.../MaterialEntryManagerImpl.java)	(revision 13278)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java	(.../MaterialEntryManagerImpl.java)	(revision 13520)
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,7 +10,6 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -20,13 +18,11 @@
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
-import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntryItem;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
-import com.forgon.disinfectsystem.vo.GodownEntryItemPrintVO;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.string.StringTools;
@@ -180,6 +176,7 @@
 				String supplierName = obj.optString("supplierName");
 				String certification = obj.optString("certification");
 				String hasInvoice = obj.optString("hasInvoice");
+				String goodsType = obj.optString("goodsType");
 				if (oldMaterialEntryItemsMap.containsKey(materialDefinitionId)) {
 					materialEntryItem = oldMaterialEntryItemsMap.get(materialDefinitionId);
 					materialDefinition = materialEntryItem.getMaterialDefinition();
@@ -198,6 +195,7 @@
 				materialEntryItem.setSupplierName(supplierName);
 				materialEntryItem.setCertification(certification);
 				materialEntryItem.setHasInvoice(hasInvoice);
+				materialEntryItem.setGoodsType(goodsType);
 				
 				//设置材料入库明细的仓库
 				materialEntryItem.setWareHouseId(materialEntry.getWareHouseId());
@@ -215,6 +213,7 @@
 					updateAmount = amount - tempAmount;
 				}
 				materialDefinition.setCost(materialEntryItem.getCost());
+				materialDefinition.setGoodsType(goodsType);
 				updateMaterialDefinition.put(materialDefinition, updateAmount);
 			}
 		}