Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r12799 -r13427
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12799)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 13427)
@@ -124,7 +124,7 @@
 		if(errors == null){
 			return;
 		}
-	    var supplePanel = new top.Ext4.FormPanel({
+	    var supplePanel = new top.Ext.FormPanel({
 	        id : 'supplePanel',
 	        name : 'supplePanel',
 	        frame : true,
@@ -146,7 +146,7 @@
 	        buttons : [{
 	            text : '保存',
 	            handler : function(){
-	                if(!top.Ext4.getCmp('supplePanel').getForm().isValid()) {
+	                if(!top.Ext.getCmp('supplePanel').getForm().isValid()) {
 	                    showResult('超过最大补充数量！');
 	                    return false;
 	                }
@@ -166,7 +166,7 @@
 //	                }
 	                var materialArray = new Array();
 	                for(var i=0;i<errors.length;i++) {
-	                	var inputElement = top.Ext4.getCmp('supplementItem_' + i);
+	                	var inputElement = top.Ext.getCmp('supplementItem_' + i);
 	                    if(inputElement != null){
 	                    	var m_name = errors[i].materialName;
 	                    	var m_amount = inputElement.getValue();
@@ -176,7 +176,7 @@
 	                    	materialArray[len].amount = m_amount; 
 	                    }
 	                }
-	                Ext4.Ajax.request({
+	                Ext.Ajax.request({
 	                    url :  WWWROOT + '/disinfectSystem/packingAction!materialSupplement.do',
 	                    params : {
 	                    	packingTaskId : taskid,
@@ -217,7 +217,7 @@
 	    for(var i=0;i<errors.length;i++) {
 	        if(errors[i].materialName != MATERIAL_NAME_IDCARD){
 	            if(errorTypeAdd != errors[i].errorType && (errors[i].amount - errors[i].additionalAmount) != 0) {
-	                var textfield = new top.Ext4.form.NumberField({
+	                var textfield = new top.Ext.form.NumberField({
 	                    id : 'supplementItem_' + i,
 	                    name : 'supplementItem_' + i,
 	                    fieldLabel  : errors[i].materialName,
@@ -227,7 +227,7 @@
 	                    readOnly : true,
 	                    maxValue : errors[i].amount - errors[i].additionalAmount
 	                });
-	                top.Ext4.getCmp('suppleFieldset').add(textfield);
+	                top.Ext.getCmp('suppleFieldset').add(textfield);
 	            }
 	        }else{
 //	            windowWidth = 1000;
@@ -266,15 +266,15 @@
 //	            });
 //	            top.Ext.getCmp('suppleFieldset').add(identificationCardTree);
 	        	//var lostAmount = 
-	        	var textfield = new top.Ext4.form.TextField({
+	        	var textfield = new top.Ext.form.TextField({
 	        		id : 'idCardErrorsInfo',
 		            name : 'idCardErrorsInfo',
                     fieldLabel  : errors[i].materialName,
                     readOnly:true,
                     value : '丢失'+errors[i].amount+',已补充'+errors[i].additionalAmount
                 });
 	        	var errorID = errors[i].id;
-	        	var buttonfield = new top.Ext4.Button({
+	        	var buttonfield = new top.Ext.Button({
 	        		text: '补充打印',
 	        		handler: function() {
 	        			forSupplement = true;
@@ -283,7 +283,7 @@
 	        			packingTaskID = taskid;
 	        			showIDCardListView();
 	        			
-	        			suppleIDCardWin = new top.Ext4.Window({
+	        			suppleIDCardWin = new top.Ext.Window({
 	        		        id : 'suppleIDCardWin',
 	        		        layout : 'fit',
 	        		        title : '标识牌补充',
@@ -298,7 +298,7 @@
 	        			suppleIDCardWin.show();
 	        	    }
                 });
-	        	var layout = new top.Ext4.Panel({
+	        	var layout = new top.Ext.Panel({
 	        		layout:'column',
 	        		height:30,
 	        		items : [{
@@ -316,12 +316,12 @@
 	        			items : [buttonfield]
 	        		}]
 	        	});
-                top.Ext4.getCmp('suppleFieldset').add(layout);
+                top.Ext.getCmp('suppleFieldset').add(layout);
 //                top.Ext.getCmp('suppleFieldset').add(textfield);
 //                top.Ext.getCmp('suppleFieldset').add(buttonfield);
 	        }
 	    }
-	    suppleWin = new top.Ext4.Window({
+	    suppleWin = new top.Ext.Window({
 	        id : 'suppleWin',
 	        layout : 'fit',
 	        title : '缺失器械补充',
@@ -344,7 +344,7 @@
 			return;
 		}
 		var materialMap = {};
-	    var supplePanel = new top.Ext4.FormPanel({
+	    var supplePanel = new top.Ext.FormPanel({
 	        id : 'damageMaterialPanel',
 	        name : 'damageMaterialPanel',
 	        frame : true,
@@ -366,7 +366,7 @@
 	        buttons : [{
 	            text : '保存',
 	            handler : function(){
-	                if(!top.Ext4.getCmp('damageMaterialPanel').getForm().isValid()) {
+	                if(!top.Ext.getCmp('damageMaterialPanel').getForm().isValid()) {
 	                    showResult('超过最大补充数量！');
 	                    return false;
 	                }
@@ -384,7 +384,7 @@
 	                    showResult('当前没有可补充的器械或补充的数量为0！');
 	                    return false;
 	                }
-	                Ext4.Ajax.request({
+	                Ext.Ajax.request({
 	                	url :  WWWROOT + '/disinfectSystem/packingAction!materialSupplement.do',
 	                    params : {
 	                    	packingTaskId : taskid,
@@ -431,7 +431,7 @@
 	    var windowHeight = 600;
 	    var windowWidth = 400;
 	    for(var i=0;i<damages.length;i++) {
-	        var textfield = new top.Ext4.form.NumberField({
+	        var textfield = new top.Ext.form.NumberField({
 	            id : 'supplementItem_' + i,
 	            name : 'supplementItem_' + i,
 	            fieldLabel  : damages[i].materialName,
@@ -441,10 +441,10 @@
 	            readOnly : true,
 	            maxValue : damages[i].amount
 	        });
-	        top.Ext4.getCmp('suppleFieldset').add(textfield);
+	        top.Ext.getCmp('suppleFieldset').add(textfield);
 	    }
 	    
-	    suppleWin = new top.Ext4.Window({
+	    suppleWin = new top.Ext.Window({
 	        id : 'suppleWin',
 	        layout : 'fit',
 	        title : '器械报损补充',
Index: ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/服务器启动之后执行的脚本.txt
===================================================================
diff -u -r13239 -r13427
--- ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/服务器启动之后执行的脚本.txt	(.../服务器启动之后执行的脚本.txt)	(revision 13239)
+++ ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/服务器启动之后执行的脚本.txt	(.../服务器启动之后执行的脚本.txt)	(revision 13427)
@@ -3,7 +3,7 @@
 
 /* һ������Ʒ��� */
 /* ��Ҫ���ö�Ӧ�IJֿ⣬Ȼ��'��Ժ��Ӧ�Ҳֿ�'�滻Ϊ���õIJֿ��� */
-delete from IdentificationOfDisposableGoods;
+delete from DisposableGoodsIdentification;
 delete from DisposableGoodsBatchStock;
 delete from DisposableGoodsStock;
 delete from DisposableGoodsBatch;
@@ -34,16 +34,16 @@
 update DisposableGoodsBatchStock set warehouseID=(select id from WareHouse where name='��Ժ��Ӧ�Ҳֿ�');
 update DisposableGoodsBatchStock set warehouseName='��Ժ��Ӧ�Ҳֿ�';
 
-/* IdentificationOfDiposableGoods ����Ϊ IdentificationOfDisposableGoods */
-delete from IdentificationOfDisposableGoods;
-set identity_insert IdentificationOfDisposableGoods on
-insert into IdentificationOfDisposableGoods (id,amount,conclusion,entryDate,identification,price,batch_id) (select id,amount,conclusion,entryDate,identification,price,batch_id from IdentificationOfDiposableGoods)
-set identity_insert IdentificationOfDisposableGoods off
-update IdentificationOfDisposableGoods set disposableGoodsID=(select TOP 1 diposablegoods_id from DiposableGoodBatchStock where id=batch_id);
-update IdentificationOfDisposableGoods set disposableGoodsStockID=batch_id;
-update IdentificationOfDisposableGoods set disposableGoodsBatchID=batch_id;
-update IdentificationOfDisposableGoods set warehouseID=(select id from WareHouse where name='��Ժ��Ӧ�Ҳֿ�');
-update IdentificationOfDisposableGoods set warehouseName='��Ժ��Ӧ�Ҳֿ�';
+/* IdentificationOfDiposableGoods ����Ϊ DisposableGoodsIdentification */
+delete from DisposableGoodsIdentification;
+set identity_insert DisposableGoodsIdentification on
+insert into DisposableGoodsIdentification (id,amount,conclusion,entryDate,identification,price,batch_id) (select id,amount,conclusion,entryDate,identification,price,batch_id from IdentificationOfDiposableGoods)
+set identity_insert DisposableGoodsIdentification off
+update DisposableGoodsIdentification set disposableGoodsID=(select TOP 1 diposablegoods_id from DiposableGoodBatchStock where id=batch_id);
+update DisposableGoodsIdentification set disposableGoodsStockID=batch_id;
+update DisposableGoodsIdentification set disposableGoodsBatchID=batch_id;
+update DisposableGoodsIdentification set warehouseID=(select id from WareHouse where name='��Ժ��Ӧ�Ҳֿ�');
+update DisposableGoodsIdentification set warehouseName='��Ժ��Ӧ�Ҳֿ�';
 
 /* ������ⵥ�IJֿ���Ϣ */
 update GodownEntry set wareHouseId=(select id from WareHouse where name='��Ժ��Ӧ�Ҳֿ�');