Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r12903 -r12925
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12903)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12925)
@@ -836,13 +836,13 @@
 				showResult("申请数量不能大于库存数量!");
 				return false;
 			}
-//			top.Ext4.Msg.confirm("请确认", "申请数量大于库存数量，发货可能会延迟，是否继续申请该物品？",function(btn) {
-//				if (btn != 'yes') {
-//					top.Ext4.getCmp('count1').setValue("");
-//					top.Ext4.getCmp('count1').focus();
-//					return false;
-//				}
-//			})
+			top.Ext4.Msg.confirm("请确认", "申请数量大于库存数量，发货可能会延迟，是否继续申请该物品？",function(btn) {
+				if (btn != 'yes') {
+					top.Ext4.getCmp('count1').setValue("");
+					top.Ext4.getCmp('count1').focus();
+					return false;
+				}
+			})
 		}else if(isDiposableGoods == '是' && !isValidDiposableAmount(minApplyAmount,count)){
 			showResult("该一次性物品最小申请数量为"+minApplyAmount+",所填数量必须是"+minApplyAmount+"的倍数。");
 			top.Ext4.getCmp('count1').setValue("");
@@ -2740,6 +2740,7 @@
 	     {header : "发货状态",width : 65,dataIndex : 'deliverStatus', renderer : renderColor},
 	     {header : "归还状态",width : 65,dataIndex : 'returnStatus', renderer : renderReturnStatusColor},
          {header : "终止状态",width : 65,dataIndex : 'endStatus'},
+         {id:'operationRemark',header: "备注", dataIndex: 'remark'},
 	     {header : "拼音码",width : 120,dataIndex : 'spelling',hidden:true}, 
 	     {header : "五笔码",width : 120,dataIndex : 'wbCode',hidden:true}, 
 	     {header: "发货单状态", dataIndex: 'invoiceStatus',hidden:true},
@@ -2774,8 +2775,8 @@
 	     },
 	     {header : "预回收人",width : 65,dataIndex : 'prepareRecycleOperator'},
          {header : "预回收确认人",width : 85,dataIndex : 'prepareRecycleComfirmor'},
-         {header : "预回收时间",width : 130,dataIndex : 'prepareRecycleDateTime'},
-	     {id:'operationRemark',header: "备注", dataIndex: 'remark'}
+         {header : "预回收时间",width : 130,dataIndex : 'prepareRecycleDateTime'}
+	     
 	];
 
 	var readerDetail = [