Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r19767 -r19774
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19767)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19774)
@@ -2750,7 +2750,6 @@
     reviewerCode = Ext4.getCmp('reviewerCode').getValue();
     wrapperCode = Ext4.getCmp('wrapperCode').getValue();
     sterileUserCode = Ext4.getCmp('sterileCode').getValue();
-    var stock = '';//托盘条码
     var sterilizer = Ext4.getCmp("sterilizer").getValue();
     var frequency = Ext4.getCmp("frequency").getValue();;
     
@@ -2791,7 +2790,6 @@
     		packageType: packageType,
     		sterilingType: sterilingType,
     		sterileDate: sterileDate.getTime(),
-    		stock: stock,
     		packAmount: packAmount,
     		taskGroup: taskGroup,
     		splitPackage: null,
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
===================================================================
diff -u -r19302 -r19774
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java	(.../Container.java)	(revision 19302)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java	(.../Container.java)	(revision 19774)
@@ -4,15 +4,12 @@
 import java.util.Map;
 
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.tools.string.StringTools;
 
 /**
@@ -25,7 +22,6 @@
 
 	public static final String CONTAINERTYPE_SHELF = "灭菌架";
 	public static final String CONTAINERTYPE_BASKET = "篮筐";
-	public static final String CONTAINERTYPE_TRAY = "托盘";  //此类型已经没有用了
 	public static final String CONTAINERTYPE_CLEANINGSHELF = "清洗架";
 
 	public static final String CONTAINER_STATUS_FREE = "空闲";
@@ -62,8 +58,6 @@
 
 	private String status = CONTAINER_STATUS_FREE;
 	
-	private TousseDefinition tousseDefinition; //只有托盘才需要绑定一个包类型
-	
 	private String purpose ;
 	
 	private String isCurrent;//新增字段,是否为当前虚拟篮筐,记录已使用到的当前篮筐
@@ -125,14 +119,6 @@
 		return CONTAINERTYPE_BASKET.equals(containerType);
 	}
 	/**
-	 * 判断容器的类型是否是托盘
-	 * @return
-	 */
-	@Transient
-	public boolean isTray(){
-		return CONTAINERTYPE_TRAY.equals(containerType);
-	}
-	/**
 	 * 判断容器的类型是否是清洗架
 	 * @return
 	 */
@@ -165,25 +151,6 @@
 		setType(BarcodeDevice.BARCODE_TYPE_CONTAINER);
 	}
 
-	@ManyToOne
-	@JoinColumn(name = "tousseDefinition_id")
-	public TousseDefinition getTousseDefinition() {
-		return tousseDefinition;
-	}
-
-	public void setTousseDefinition(TousseDefinition tousseDefinition) {
-		this.tousseDefinition = tousseDefinition;
-	}
-	
-	@Transient
-	public String getTousseType(){
-		if(tousseDefinition != null){
-			return tousseDefinition.getName();
-		}else{
-			return "";
-		}
-	}
-
 	public String getPurpose() {
 		return purpose;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
===================================================================
diff -u -r17094 -r19774
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java	(.../ContainerAction.java)	(revision 17094)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java	(.../ContainerAction.java)	(revision 19774)
@@ -22,7 +22,6 @@
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.serialnumber.service.SerialNumManager;
@@ -223,16 +222,6 @@
 				container.setId(null);
 			}
 			container.setType(BarcodeDevice.BARCODE_TYPE_CONTAINER);
-			
-			if(Container.CONTAINERTYPE_TRAY.equals(container.getContainerType())){
-				 //只有托盘才需要绑定一个包类型
-				String tousseDefinitionName = StrutsParamUtils.getPraramValue("tousseType", "");
-				TousseDefinition tousseDefinition = (TousseDefinition) objectDao.getByProperty(
-						TousseDefinition.class.getSimpleName(), "name", tousseDefinitionName);
-				if(tousseDefinition != null){
-					container.setTousseDefinition(tousseDefinition);
-				}
-			}
 			//设置条码
 			String barcode = container.getBarcode();
 			if(StringUtils.isBlank(container.getBarcode())){
@@ -295,38 +284,6 @@
 			e.printStackTrace();
 		}
 	}
-	
-	/**
-	 * 加载状态为空闲的托盘绑定的器械包定义名称
-	 */
-	public void loadBindingTousseNameOfFreeTrayByBarcode() {
-		String barcode = StrutsParamUtils.getPraramValue("barcode", "");
-		Container container = containerManager.getContainerByBarcode(barcode);
-		String message = "";
-		if(container == null || !Container.CONTAINERTYPE_TRAY.equals(container.getContainerType())){
-			message = "{success:false}";
-		}else{
-			//状态是否为空闲
-			message = "{success:true";
-			if(Container.CONTAINER_STATUS_FREE.equals(container.getStatus())){
-				TousseDefinition tousseDefinition = container.getTousseDefinition();
-				message += ",hasUse:false"; 
-				if(tousseDefinition != null){
-					message += ",trayName:'"+container.getContainerName()+"',tousseDefinitionName:'"+tousseDefinition.getName()+"'"; 
-				}
-				message += "}";
-			}else{
-				message += ",hasUse:true}"; 
-			}
-		}
-		HttpServletResponse res = StrutsParamUtils.getResponse();
-		res.setCharacterEncoding("UTF-8");
-		try {
-			res.getWriter().println(message);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
 
 	public void iniInfo() {
 
@@ -338,10 +295,12 @@
 		}
 	}
 
+	@Override
 	public Container getModel() {
 		return container;
 	}
 
+	@Override
 	public void prepare() throws Exception {
 		iniInfo();
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r19667 -r19774
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 19667)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 19774)
@@ -1042,7 +1042,6 @@
 	     {name : 'operationTime'},
 	     {name : 'sterileStartDate'},
 	     {name : 'status'},
-	     {name : 'stockBarcode'},
 	     {name : 'sterilingType'},
 	     {name : 'validUntil'},
 	     {name : 'packageType'},
@@ -1060,7 +1059,6 @@
 	        {type: 'string',  dataIndex: 'operator'},
 	        {type: 'date',  dataIndex: 'operationTime'},
 	        {type: 'string',  dataIndex: 'status'},
-	        {type: 'string',  dataIndex: 'stockBarcode'},
 	        {type: 'string',  dataIndex: 'sterilingType'},
 	        {type: 'date',  dataIndex: 'validUntil'},
 	        {type: 'string',  dataIndex: 'packageType'}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
===================================================================
diff -u -r16845 -r19774
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java	(.../TousseInstanceReviewManagerTests.java)	(revision 16845)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java	(.../TousseInstanceReviewManagerTests.java)	(revision 19774)
@@ -55,7 +55,6 @@
 
 		tousseInstance.setReviewer("");// 审核员
 		tousseInstance.setPackageType("");// 包装类型
-		tousseInstance.setStockBarcode("");// 托盘条码
 		tousseInstance.setSterilingType("");// 灭菌程序
 
 		tousseInstance.setUnTraceableTousse(true);
@@ -114,7 +113,6 @@
 
 		tousseInstance.setReviewer("");// 审核员
 		tousseInstance.setPackageType("");// 包装类型
-		tousseInstance.setStockBarcode("");// 托盘条码
 		tousseInstance.setSterilingType("");// 灭菌程序
 
 		tousseInstance.setUnTraceableTousse(true);
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r19740 -r19774
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19740)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19774)
@@ -2807,7 +2807,6 @@
 		if (sheetNameIndex == 0) {
 			List<String> containerTypeList = new ArrayList<String>(3);
 			containerTypeList.add(Container.CONTAINERTYPE_BASKET);// 篮筐
-			containerTypeList.add(Container.CONTAINERTYPE_TRAY);// 托盘
 			containerTypeList.add(Container.CONTAINERTYPE_SHELF);// 灭菌架
 			containerTypeList.add(Container.CONTAINERTYPE_CLEANINGSHELF);// 清洗架
 			propertyNameAndOptionListValueMap.put("containerType",
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r19457 -r19774
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 19457)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 19774)
@@ -222,7 +222,6 @@
 	    {name : 'useRecord_id'},
 	    {name : 'invoice_id'},
 	    {name : 'tousseTransitionItemId'},
-	    {name : 'stockBarcode'},
 	    {name : 'sterilingType'},
 	    {name : 'validUntil'},
 	    {name : 'recyclingUser'},
@@ -262,7 +261,6 @@
 		    {type : 'string',dataIndex : 'operator'},
 		    {type : 'date',dataIndex : 'operationTime'},
 		    {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed,statusPrerecycled, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true},  //增加一个已消毒的过滤条件（陈家儒改）
-		    {type : 'string',dataIndex : 'stockBarcode'},
 		    {type : 'string',dataIndex : 'sterilingType'},
 		    {type : 'numeric',dataIndex : 'useAmount'},
 //		    {type : 'string',dataIndex : 'idNumber'},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
===================================================================
diff -u -r13479 -r19774
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 13479)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 19774)
@@ -6,7 +6,7 @@
 	
 	var isDeposableStore = new Ext.data.SimpleStore( {
 		fields : [ 'value' ],
-		data : [['篮筐'], ['托盘'],['灭菌架']]
+		data : [['篮筐'], ['灭菌架']]
 	});
 	var containerUseageStore = new Ext.data.SimpleStore( {
 		fields : [ 'value' ],
@@ -108,15 +108,6 @@
 					mode : 'local',
 					triggerAction : 'all',
 					allowBlank : false,
-					listeners : {
-						select : function(combo, record, index){
-							if(index==1){//如果选择的是托盘 //则显示绑定包类型combox
-								hideTousseComboxItem(false);
-							}else{
-								hideTousseComboxItem(true);
-							}
-						}
-					},
 					anchor : '95%'
 				},{
 					xtype : 'combo',
@@ -195,10 +186,6 @@
 		success : function(form, action) {
 			if(id==0) {
 				top.Ext.getCmp('containerType').setValue('篮筐');
-			}else{
-				if(action.result.data.containerType == '托盘'){
-					hideTousseComboxItem(false);
-				}
 			}
 		},
 		failure : function(form, action) {
@@ -209,16 +196,6 @@
 	});
 }
 
-function hideTousseComboxItem(hide){
-	if(hide){
-		top.Ext.getCmp('tousseTypeItem').hide();
-		top.Ext.getCmp('tousseType').allowBlank = true;
-	}else{
-		top.Ext.getCmp('tousseTypeItem').show();
-		top.Ext.getCmp('tousseType').allowBlank = false;
-	}
-}
-
 function printBarcode(){
 	var barcode = top.Ext.getCmp('barcode').getValue();
 	var name = top.Ext.getCmp('containerName').getValue();
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19766 -r19774
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19766)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19774)
@@ -2563,7 +2563,6 @@
 	 * @param sterilingType
 	 * @param sterilizer
 	 * @param frequency
-	 * @param stock
 	 * @param splitPackages
 	 * @param td
 	 * @param packingRecord
@@ -2579,7 +2578,7 @@
 	 */
 	private void packingSplitPackages(String operator, String operatorCode,
 			String reviewer, String reviewerCode,String sterileUserName,String sterileUserCode, String sterilingType,String sterilizer, String frequency,
-			String stock, JSONArray splitPackages,TousseDefinition td, PackingRecord packingRecord,String taskGroup,
+			JSONArray splitPackages,TousseDefinition td, PackingRecord packingRecord,String taskGroup,
 			String washBasket,ForeignTousseApplication foreignTousseApplication,String orgUnitCoding, 
 			String orgUnitName, Date packingDate,String tousseWeight,String remark, PackingTask currentPackingTask,Map<Long,WashAndDisinfectRecord> idToWashRecordMap,
 			Map<Long,RecyclingRecord> idToRecyclingRecordMap,Date sterileStartTime) {
@@ -2645,7 +2644,7 @@
 			// 包实例
 			TousseInstance tousseInstance = createTousseInstance(operator,
 					operatorCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, packageType,
-					sterilingType, stock,washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup,
+					sterilingType, washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup,
 					tousseDefinition, tousseType, tousseName,
 					foreignTousseApplication, packingDate, foreignTprice,
 					fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName,
@@ -3220,7 +3219,6 @@
 		String packageType = JSONUtil.optString(paramsObj, "packageType", null);
 		String sterilingType = JSONUtil.optString(paramsObj, "sterilingType", null);
 		Long sterileDate = JSONUtil.optLong(paramsObj, "sterileDate", null);
-		String stock = JSONUtil.optString(paramsObj, "stock", null);
 		String packAmountStr = JSONUtil.optString(paramsObj, "packAmount", null);
 		String taskGroup = JSONUtil.optString(paramsObj, "taskGroup", null);
 		String splitPackages = JSONUtil.optString(paramsObj, "splitPackage", null);
@@ -3555,7 +3553,7 @@
 	
 					packingSplitPackages(operator, operatorCode,
 							reviewer, reviewerCode,sterileUserName, sterileUserCode, sterilingType, sterilizerName, sterileFrequency,
-							stock,splits, td,packingRecord,taskGroup, washBasket,foreignTousseApplication, orgUnitCoding,orgUnitName, 
+							splits, td,packingRecord,taskGroup, washBasket,foreignTousseApplication, orgUnitCoding,orgUnitName, 
 							packingDate,tousseWeight,remark, currentPackingTask,idToWashRecordMap,idToRecyclingRecordMap,sterileStartTime);
 					currentPackingTaskAsList = packingTasks;
 				} else {
@@ -3620,7 +3618,7 @@
 					
 					JSONObject result = batchCreateTousseInstance(
 							operator, operatorCode, reviewer,reviewerCode,sterileUserName,sterileUserCode, packageType,
-							sterilingType, stock,idCardDefinitionId,idCardInstanceID, washBasket,sterilizerName, sterileFrequency,sterileStartTime,
+							sterilingType, idCardDefinitionId,idCardInstanceID, washBasket,sterilizerName, sterileFrequency,sterileStartTime,
 							validUntil, warningUntil,currentPackingTaskAsList,packingRecord, 
 							td, tousseType,tousseName,foreignTousseApplication,packingDate, packingAmountForThisTask,
 							toussePrice, fluctuationPrice,tousseAmount, orgUnitCoding,orgUnitName,basketBarcode,
@@ -4050,7 +4048,6 @@
 	 * @param reviewerCode
 	 * @param packageType
 	 * @param sterilingType
-	 * @param stock
 	 * @param idCardBarcode
 	 * @param classifyBasket
 	 * @param lastWashRecord
@@ -4080,7 +4077,7 @@
 	 * @return Map<String,String>
 	 */
 	private JSONObject batchCreateTousseInstance(String operator,
-			String operatorCode, String reviewer, String reviewerCode,String sterileUserName, String sterileUserCode,String packageType, String sterilingType, String stock,
+			String operatorCode, String reviewer, String reviewerCode,String sterileUserName, String sterileUserCode,String packageType, String sterilingType,
 			String idCardDefinitionId,String idCardInstanceID, String washBasket,String sterilizerName, String sterileFrequency,
 			Date sterileStartTime, Date validUntil, Date warningUntil,List<PackingTask> packingTaskList, PackingRecord packingRecord,
 			TousseDefinition tousseDefinition,String tousseType, String tousseName,ForeignTousseApplication foreignTousseApplication,Date packingDate, 
@@ -4177,7 +4174,7 @@
 				}
 	
 				TousseInstance tousseInstance = createTousseInstance(operator,
-					operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode, packageType,sterilingType, stock,
+					operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode, packageType,sterilingType,
 					washBasket, sterilizerName, sterileFrequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup,
 					tousseDefinition, tousseType, tousseName,foreignTousseApplication, packingDate, toussePrice,
 					fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName,unTraceableTousse, barcodeStr, tousseWeight,remark,
@@ -4470,7 +4467,6 @@
 	 * @param sterileUserCode
 	 * @param packageType
 	 * @param sterilingType
-	 * @param stock
 	 * @param washBasket
 	 * @param sterilizerName
 	 * @param sterileFrequency
@@ -4499,7 +4495,7 @@
 	private TousseInstance createTousseInstance(String operator,
 			String operatorCode, String reviewer, String reviewerCode,
 			String sterileUserName, String sterileUserCode, String packageType,
-			String sterilingType, String stock, String washBasket,
+			String sterilingType, String washBasket,
 			String sterilizerName, String sterileFrequency,
 			Date sterileStartTime, Date validUntil, Date warningUntil,
 			PackingRecord packingRecord,String taskGroup, TousseDefinition td, String tousseType,
@@ -4576,7 +4572,6 @@
 		tousseInstance.setDiscountPriceBySelf();
 
 		tousseInstance.setPackageType(packageType);// 包装类型
-		tousseInstance.setStockBarcode(stock);// 托盘条码
 		tousseInstance.setSterilingType(sterilingType);// 灭菌程序
 
 		tousseInstance.setUnTraceableTousse(unTraceableTousse);
Index: ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java
===================================================================
diff -u -r13052 -r19774
--- ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java	(.../JSONTest.java)	(revision 13052)
+++ ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java	(.../JSONTest.java)	(revision 19774)
@@ -1,5 +1,6 @@
 package test.forgon.tools.json;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -58,7 +59,6 @@
 
 		tousseInstance.setReviewer("李晓");
 		tousseInstance.setPackageType("无纺布");
-		tousseInstance.setStockBarcode("010000987");
 		tousseInstance.setSterilingType("P1");
 
 		tousseInstance.setStatus("");
@@ -148,7 +148,6 @@
 
 			tousseInstance.setReviewer("李晓");
 			tousseInstance.setPackageType("无纺布");
-			tousseInstance.setStockBarcode("010000987");
 			tousseInstance.setSterilingType("P1");
 
 			tousseInstance.setStatus("");
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r19577 -r19774
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19577)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19774)
@@ -180,8 +180,6 @@
 	 */
 	private String sterilizationBasket;
 
-	private String stockBarcode; // 托盘条码
-
 	private String location; // 位置（组织机构code）
 
 	private String locationForDisplay; // 位置（组织机构名称）
@@ -472,7 +470,7 @@
 	public static final String[] includeProperties = {
 		"id", "barcode","type","tousseName","operator","operatorCode","operationTime", 
 		"reviewTime","reviewer","reviewerCode","status","price","fluctuationPrice", 
-        "washBasket","sterilizationBasket","stockBarcode","location","locationForDisplay",
+        "washBasket","sterilizationBasket","location","locationForDisplay",
         "sterilingType","validUntil","warningUntil","packageType","orgUnitCoding","orgUnitName",
         "wasteDate","wasteReason","operateUser","successSterilizationRecord","invoice","useRecord", 
         "statisticsAmount","recallTimeStr","recaller","unTraceableTousse","taskGroup","showTousseName",
@@ -697,14 +695,6 @@
 		this.operationRoomId = operationRoomId;
 	}
 
-	public String getStockBarcode() {
-		return stockBarcode;
-	}
-
-	public void setStockBarcode(String stockBarcode) {
-		this.stockBarcode = stockBarcode;
-	}
-
 	public String getLocation() {
 		return location;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js
===================================================================
diff -u -r13499 -r19774
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js	(.../interfereSterilizationView.js)	(revision 13499)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js	(.../interfereSterilizationView.js)	(revision 19774)
@@ -98,7 +98,6 @@
 	    {name : 'operator'},
 	    {name : 'operationTime'},
 	    {name : 'status'},
-	    {name : 'stockBarcode'},
 	    {name : 'sterilingType'},
 	    {name : 'validUntil'},
 	    {name : 'washOperator'},
@@ -130,7 +129,6 @@
 		    {type : 'string',dataIndex : 'operator'},
 		    {type : 'date',dataIndex : 'operationTime'},
 		    {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed, statusDiscard],phpMode : true},
-		    {type : 'string',dataIndex : 'stockBarcode'},
 		    {type : 'string',dataIndex : 'sterilingType'},
 		    {type : 'date',dataIndex : 'validUntil'},
 		    {type : 'date',dataIndex : 'reviewTime'},