Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp
===================================================================
diff -u -r20633 -r27762
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp	(.../diposableGoodsWarningView.jsp)	(revision 20633)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp	(.../diposableGoodsWarningView.jsp)	(revision 27762)
@@ -2,7 +2,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods"%>
-
+<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry "%>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -15,6 +15,8 @@
   request.setAttribute("queryType", queryType);
  %>
 <script type="text/javascript">
+	var curUserName = '${userName}';
+	var TYPE_OUT = '<%=GodownEntry.TYPE_OUT%>'; 
     var CONSTANT_YES = '<%=DisposableGoods.CONSTANT_YES %>';//能
     var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否
     var disabledGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_DIPOSABLEGOODS%>';
@@ -47,6 +49,7 @@
         </td>
     </tr>
 </table>
+<input type="hidden" id="userName" value="${userName}">
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_type" name="parm_s_type" value="">
 </form>
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js
===================================================================
diff -u -r21847 -r27762
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 21847)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 27762)
@@ -2,7 +2,405 @@
 var grid;
 var formObj;
 var formWindow;
+var g_localID = 1;// 为了区分每一个item，增加的ID。
 
+var selectModel = new top.Ext.grid.CheckboxSelectionModel();
+function renderDeleteButton(v,p,record){
+	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('"+record.data.localID+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
+}
+
+function setTotalMoney(grid) {
+	var totalMoney = 0.0;
+	grid.getStore().each(function(record){
+		var amount = Ext.num(parseFloat(record.data.amount),0.0);
+		var cost = Ext.num(parseFloat(record.data.cost),0.0);
+		var mul = amount*cost*1.00;
+		totalMoney += mul;
+	});	
+	top.Ext.getCmp("totalPrice").setValue(Ext.util.Format.usMoney(totalMoney));
+}
+
+function deleteItem(localID){
+	var godownEntryItemGridStore = top.Ext.getCmp('diposableGoodsWarningGrid').getStore();
+	for(var i = 0;i<godownEntryItemGridStore.getCount();i++){
+		if(godownEntryItemGridStore.getAt(i).data.localID == localID){
+			godownEntryItemGridStore.remove(godownEntryItemGridStore.getAt(i));
+			break;
+		}
+	}
+	setTotalMoney(top.Ext.getCmp('diposableGoodsWarningGrid'));
+}
+
+
+var wareHouseStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		totalProperty : 'totalCount',
+		root : 'data'
+	}, [
+	    {name : 'id',mapping : 'id'},
+	    {name : 'name',mapping : 'name'},
+	    {name : 'orgUnitCode',mapping : 'orgUnitCode'}
+	]),
+	listeners : {
+		load : function(store,records) {
+			if(records.length > 0){
+				var combo = top.Ext.getCmp("wareHouse1");
+				// 触发选中事件
+				combo.fireEvent('select', combo,records[0],0);
+			}
+		}
+	}
+});
+
+// 根据grid id构造json对象数组
+function buildJSONArrayFromStore(store,attName){
+	var items = new Array();
+	if(typeof(attName) == 'undefined'){
+		attName = 'data';
+	}
+	if(typeof(store) != 'undefined' && store != null){
+		var count = store.getCount();
+		for(var i = 0;i < count;++i){
+			var record = store.getAt(i);
+			var data = record.data;
+			data.recordProperties = {
+				dirty: record.dirty,
+				modified: record.modified
+			}
+			items.push(data);
+		}
+	}
+	return items;
+}
+
+function buildJSONStringFromStore(store){
+	var itemsJSONArray = buildJSONArrayFromStore(store);
+	var jsonStr = JSON.stringify(itemsJSONArray);
+	
+	return jsonStr;
+}
+/**
+ * 设置仓库的id和name的隐藏域的内容
+ * @param id
+ * @param name
+ */
+function setWareHouseInfo(id,name){
+	top.Ext.getCmp('warehouseID').setValue(id);
+	top.Ext.getCmp('warehouseName').setValue(name);
+}
+
+var GodownEntryItemRecord = Ext.data.Record.create([
+	{name : 'disposableGoodsID'},
+	//{name : 'disposableGoodsStockID'},
+	{name : 'disposableGoodsBatchID'},
+	{name : 'disposableGoodsBatchStockID'},
+	//{name : 'expensiveDisposableGoodsId'},
+	{name : 'localID'},
+	{name : 'id'},
+	{name : 'name'}, 
+	{name : 'amount'},
+	{name : 'canOutAmount'},
+	{name : 'cost'},
+	{name : 'batchNumber'},
+	{name : 'identification'},
+	{name : 'identificationID'}, 
+	{name : 'batchID'}, 
+	{name : 'disposableGoodsStockID'}, 
+	{name : 'expDate' ,type : 'date'},
+	{name : 'supplierName'}
+]);
+
+function diposableGoodsOut(ids) {
+//wareHouseStore.load();
+	var form = new top.Ext.FormPanel({
+		id : 'diposableGoodsWarningForm',
+		frame : true,
+		labelSeparator : '：',
+		bodyStyle : 'padding:5px 5px 0px 25px',
+		width : 800,
+		autoScroll : true,
+		labelAlign : 'left',
+        items:[{
+			layout : 'column',
+			items : [/* {
+				xtype : 'hidden',
+				name : 'id',
+				id : 'id'
+			}, */{
+				xtype : 'hidden',
+				name : 'warehouseID',
+				id : 'warehouseID'
+			},{
+				xtype : 'hidden',
+				name : 'warehouseName',
+				id : 'warehouseName'
+			},{
+				xtype : 'hidden',
+				name : 'items',
+				id : 'items'
+			},{
+				xtype : 'hidden',
+				name : 'type',
+				value : TYPE_OUT
+			} ,{
+				columnWidth : .3,
+				layout : 'form',
+				labelWidth : 40,
+				items:[{
+					xtype : 'combo',
+					fieldLabel : '仓库',
+					id : 'wareHouse1',
+					name : 'wareHouse1',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : wareHouseStore,
+					forceSelection : true,
+					lazyInit : false,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					width : 150,
+					listeners : {
+						select : function(combo, record, index) {
+							setWareHouseInfo(record.data.id,record.data.name);
+							top.Ext.getCmp('wareHouse1').setValue(record.data.id);
+						},
+						specialkey : function(field, ee) {
+							/* if (ee.getKey() == Ext.EventObject.ENTER) {
+								top.Ext.getCmp('name1').focus();
+							} */
+						}
+					}
+				}]
+			},{
+				columnWidth : .2,
+				layout : 'form',
+				labelWidth : 50,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : '操作员',
+					maxLength : '50',
+					id : 'operator',
+					name : 'operator',
+					allowBlank : false,
+					readOnly : true,
+					cls : 'fieldReadOnlyNoRemove',
+					value : $Id('userName').value,
+					anchor : '95%'
+				}]
+			}, {
+				columnWidth : .25,
+				layout : 'form',
+				labelWidth : 60,
+				items : [{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '退库时间',
+					id : 'time',
+					name : 'time',
+					format : 'Y-m-d H:i',
+					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+//					value : new Date(),
+					allowBlank : false,
+					anchor : '95%',
+					listeners : {
+						render : function() {
+							setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'time');  //（退库时间，取服务器时间 cjr）
+						}
+					}
+				}]
+			},{
+				columnWidth : .25,
+				layout : 'form',
+				labelWidth : 40,
+				items : [{
+					xtype : 'numberfield',
+					fieldLabel : '金额',
+					maxLength : '41',
+					id : 'totalPrice',
+					name : 'totalPrice',
+					cls : 'fieldReadOnlyNoRemove',
+					allowBlank : true,
+					readOnly : true,
+					anchor : '95%'
+				}]
+			}, {
+				columnWidth : 1,
+				layout : 'form',
+				labelWidth : 40,
+				items : [{
+					xtype : 'textarea',
+					fieldLabel : '备注',
+					height : 50,
+					id : 'remark',
+					name : 'remark',
+					maxLength : 665,
+					allowBlank : true,
+					anchor : '97.5%'
+				}]
+			}]
+		},new top.Ext.grid.GridPanel({
+			id : 'diposableGoodsWarningGrid',
+			bodyStyle : 'border:1px solid #afd7af',
+			frame :false,
+			sm : selectModel,
+			height : 340,
+			viewConfig: {
+	            forceFit:true
+			},
+			store : new top.Ext.data.Store({
+				proxy : new top.Ext.data.HttpProxy({
+					//url : WWWROOT + '/disinfectSystem/godownEntryAction!loadGodownEntryItemByid.do',
+					method : 'POST'
+				}),
+				reader : new top.Ext.data.JsonReader({
+					fields : [
+						{name : 'id'},
+				  	    {name : 'disposableGoodsID'},
+				  	    {name : 'disposableGoodsStockID'},
+				  	    {name : 'batchID'},
+				  	    {name : 'identificationID'},
+				  	    {name : 'name'},
+				  	    {name : 'amount'},
+				  	    {name : 'storage'},
+				  	    {name : 'batchNumber'},
+				  	    {name : 'identification'},
+				  	    {name : 'cost'},
+				  	    {name : 'expDate'},
+				  	    {name : 'supplierName'},
+				  	    {name : 'deleteButton'}
+				  	]
+				})
+			}),
+			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer(), selectModel,
+				{header : "名称",dataIndex : 'name',width : 180,menuDisabled : true}, 
+				{header : "数量",dataIndex : 'amount',width : 60,menuDisabled : true}, 
+				{header : "可退库",dataIndex : 'storage',width : 60,menuDisabled : true},
+				{header : "批次",width : 100,dataIndex : 'batchNumber',menuDisabled : true}, 
+				{header : "标识号",width : 80,dataIndex : 'identification',menuDisabled : true},
+				{header : "失效日期",width : 90,dataIndex : 'expDate',menuDisabled : true, renderer:top.Ext.util.Format.dateRenderer('Y-m-d')},
+				{header : "单价",dataIndex : 'cost',width : 60,menuDisabled : true,renderer: function(v,p,record){
+					return formartToFixedFloat(v,4);
+				}},
+				{header : "金额",dataIndex : '',width : 110,menuDisabled : true,renderer: function(v,p,record){
+					var amount = record.data.amount;
+					var cost = record.data.cost;
+					var totalPrice = amount*cost;
+					return formartToFixedFloat(totalPrice,4);
+				}},
+				{header : "供应商",width : 150,dataIndex : 'supplierName',menuDisabled : true},
+				{id : 'expandColumn',header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton}
+	        ]),
+			width :835,
+			autoExpandColumn : 'expandColumn',
+			selModel : new top.Ext.grid.RowSelectionModel({
+				singleSelect : false
+			})
+		})],
+		buttons : [{
+			id:'saveButton',
+			text : '保存',
+			handler : function() {	
+				// 设置表单参数json
+				//setFormParams(form,['id','remark','time','warehouseName','warehouseID']);
+				var items = buildJSONStringFromStore(top.Ext.getCmp('diposableGoodsWarningGrid').getStore());
+				top.Ext.getCmp("items").setValue(items);
+				
+				
+				form.form.submit({
+					url : WWWROOT + '/disinfectSystem/godownEntryAction!saveGodownOutEntry.do',
+					method : 'POST',
+					waitMsg : '正在保存数据，请稍候',
+					waitTitle : '提交表单',
+					success : function(form, action) {
+						showResult(action.result.message);
+						diposableGoodsWarning.close();
+						grid.dwrReload();
+					},
+					failure : function(form, action) {
+						showResult(action.result.message);
+					}
+				});
+			}
+		},{
+			text : '取消',
+			handler : function() {
+				diposableGoodsWarning.close();
+			}
+		}]
+	});
+	
+	var diposableGoodsWarning = new top.Ext.Window( {
+		id : 'diposableGoodsWarning',
+		layout : 'fit',
+		title :'退库单信息',
+		width : 910,
+		height :500,
+		modal : true,
+//		autoHeight : true,
+		border :false,
+		plain : true,
+		items : [ form ]
+	});
+	diposableGoodsWarning.show();
+	top.Ext.getCmp('diposableGoodsWarningForm').form.load({
+			url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadExpiredGodownEntryItemJSONByid.do',
+			method : 'GET',
+			waitMsg : '正在加载数据，请稍候',
+			params : {ids : ids},
+			success : function(form, action) {
+				//var time = action.result.data.time.time;
+				//top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(time), 'Y-m-d H:i'));
+				//setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName); 
+				setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName);
+				top.Ext.getCmp("wareHouse1").setValue(action.result.data.warehouseName);
+				top.Ext.getCmp("wareHouse1").setRawValue(action.result.data.warehouseID);
+				wareHouseStore.load();
+				for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
+					var specification = action.result.data.itemsList[i].diposableGoods.specification;
+					var b = true;
+					if(specification == null || specification.length <= 0){
+						b = false; 
+					}
+					var expDateStr = '';
+					if(!isUndefinedOrNull(action.result.data.itemsList[i].expDate)){
+						expDateStr = Ext.util.Format.date(new Date(action.result.data.itemsList[i].expDate.time), 'Y-m-d')
+					}
+					
+					
+					var godownEntryItem = new GodownEntryItemRecord({
+						localID:g_localID++,
+						//id : action.result.data.itemsList[i].id,
+						disposableGoodsID: action.result.data.itemsList[i].disposableGoodsId,
+						disposableGoodsStockID: action.result.data.itemsList[i].disposableGoodsStockId,
+						disposableGoodsBatchID: action.result.data.itemsList[i].disposableGoodsBatchId,
+						disposableGoodsBatchStockID: action.result.data.itemsList[i].disposableGoodsBatchStockId,
+						//identificationID : action.result.data.itemsList[i].identificationID,
+						name : action.result.data.itemsList[i].diposableGoods.name + (b == false?"":" ["+specification+"]"),
+						amount : action.result.data.itemsList[i].storage,
+						storage : action.result.data.itemsList[i].storage,
+						//identification : action.result.data.itemsList[i].identification,
+						//detailCode : action.result.data.itemsList[i].detailCode,
+						cost : action.result.data.itemsList[i].cost,
+						batchNumber : action.result.data.itemsList[i].batchNumber,
+						expDate : action.result.data.itemsList[i].expDate,
+						supplierName : action.result.data.itemsList[i].supplierName
+						//identification : action.result.data.itemsList[i].identification
+					});	
+					top.Ext.getCmp('diposableGoodsWarningGrid').getStore().add(godownEntryItem);
+				}
+				setTotalMoney(top.Ext.getCmp('diposableGoodsWarningGrid'));
+			},
+			failure : function(form, action) {
+			}
+		});
+}
+
 function addDiposableGoods(id) {
 	var diposableGooodsStore = new Ext.data.SimpleStore({
 		fields : [ 'typeName' ],
@@ -399,6 +797,7 @@
 	];
 
 	var readerDetail = [
+		{name : 'id'}, 
 	    {name : 'diposableGoods.disposableGoodsID'}, 
 	    {name : 'diposableGoods.name'},
 	    {name : 'diposableGoods.externalCode'},
@@ -458,6 +857,27 @@
 				grid.dwrReload();
 			}
 		}
+	},'-', {
+		text : '退库',
+		iconCls : 'btn_ext_application_edit',
+		id : 'editTbar',
+		handler : function() {
+			var records = grid.getSelectionModel().getSelections();
+			if (records.length == 0) {
+				showResult("请选择要退库的记录！");
+				return false;
+			}
+			
+			var ids = null;
+			for ( var i = 0, len = records.length; i < len; i++) {
+				if (ids == null) {
+					ids = records[i].json['disposableGoodsId'];
+				} else {
+					ids = ids + ';' + records[i].json['disposableGoodsId'];
+				}
+			}			
+			diposableGoodsOut(ids);
+		}
 	}];
 
 	grid = new Ext.ux.ForgonPageGrid( {
