Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
===================================================================
diff -u -r12766 -r12787
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js	(.../appropriationView.js)	(revision 12766)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js	(.../appropriationView.js)	(revision 12787)
@@ -1,10 +1,12 @@
 var entityName = '调拨';
 var grid;
 var g_localID = 1;// 为了区分每一个item，增加的ID。
-var entryid = '';
+var commonEntry = new commonEntry();
+
 //单价数据源
 var priceStore = null;
 var PriceRecord = null;
+
 // 清除表单数据
 function clearFormData(){
 	diposableGoodsBatchNumStore.removeAll();
@@ -76,7 +78,7 @@
 	]),
 	listeners : {
 		load : function(store,records) {
-			if(records.length > 0 && (entryid == null || entryid == '')){
+			if(records.length > 0 && (!commonEntry.isOpen())){
 				var combo = top.Ext.getCmp("wareHouse");
 				// 触发选中事件
 				combo.fireEvent('select', combo,records[0],0);
@@ -273,6 +275,138 @@
 	// 清除表单数据
 	clearFormData();
 	wareHouseStore.load();
+	var toolbar = [{
+				xtype : 'hidden',
+				name : 'disposableGoodsStockID',
+				id : 'disposableGoodsStockID'
+			},{
+				xtype : 'hidden',
+				name : 'barcode',
+				id : 'barcode'
+			},{
+				text : '名称:'
+			},{
+				xtype : 'combo',
+				id : 'name1',
+				name : 'name1',
+				queryParam : 'spell',
+				minChars : 0,
+				valueField : 'id',
+				displayField : 'name',
+				store : diposableGoodsStore,
+				forceSelection : true,
+				lazyInit : false,
+				triggerAction : 'all',
+				hideTrigger : true,
+				typeAhead : false,
+				allowBlank : true,
+				width : 180,
+				listeners : {
+					select : function(combo, record, index) {
+						top.Ext.getCmp('name1').setValue(record.data.name);
+						top.Ext.getCmp('disposableGoodsStockID').setValue(record.data.id);
+						top.Ext.getCmp('cost').setValue(record.data.referencePrice);
+						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
+						
+						// 清空批次和价格
+						clearBatchNumberAndPrice();
+						
+						DiposableGoodsTableManager.getBatchsByDiposableGoodsId(record.data.id,false,function(batchesStr){
+							var batches = JSON.parse(batchesStr);
+							for(var i = 0;i<batches.length;i++){
+								batches[i].expDate = batches[i].expDateStr;
+							}
+							setBatchNumbers(batches, true);
+
+						});
+					},
+					specialkey : function(field, ee) {
+						if (ee.getKey() == Ext.EventObject.ENTER) {
+							top.Ext.getCmp('amount1').focus();
+						}
+					}
+				}
+			},{
+				text : '数量:'
+			},{
+				xtype : 'textfield',
+				maxLength : '16',
+				id : 'amount1',
+				name : 'amount1',
+				width : 80,
+				regex: /^\d+$/,
+				regexText:'只能输入数字',
+				anchor : '95%',
+				listeners : {
+					specialkey : function(field, e) {
+						if (e.getKey() == Ext.EventObject.ENTER) {
+							top.Ext.getCmp('batchNumber1').focus();
+						}
+					}
+				}
+			},{
+				text : '批次:'
+			},{
+				xtype : 'combo',
+				id : 'batchNumber1',
+				name : 'batchNumber1',
+				valueField : 'batchNumber',
+				displayField : 'batchNumber',
+				store : diposableGoodsBatchNumStore,
+				editable : false,
+				forceSelection : true,
+				mode : 'local',
+				triggerAction : 'all',
+				typeAhead : false,
+				allowBlank : false,
+				width : 120,
+				anchor : '95%',
+				listeners:{
+					select : function(combo, record, index) {
+						var disposableGoodID = top.Ext.get('disposableGoodsStockID').getValue();
+						top.Ext.getCmp('cost').setValue(record.data.cost);
+						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
+						top.Ext.getCmp('expDate').setValue(record.data.expDate);
+						// 清空价格
+						clearPrice();
+						// 填充价格
+						var batch = getSelectedBatch();
+						GodownEntryTableManager.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batch.id,function(priceAmounts){
+							setPrices(priceAmounts,true);
+						});
+					}
+				}
+			},{
+				text : '单价  :'
+			},{
+				xtype : 'combo',
+				id : 'combo_price',
+				name : 'combo_price',
+				valueField : 'price',
+				displayField : 'price',
+				store : priceStore,
+				editable : false,
+				forceSelection : true,
+				mode : 'local',
+				triggerAction : 'all',
+				typeAhead : false,
+				allowBlank : false,
+				width : 100,
+				anchor : '95%'
+			},
+			{
+				text : '添加',
+				iconCls : 'btn_ext_add',
+				handler : function() {
+					var disposableGoodsStockID = top.Ext.getCmp('disposableGoodsStockID').getValue();
+					var name = top.Ext.getCmp('name1').getValue();
+					var count = top.Ext.getCmp('amount1').getValue();
+					var batchNumber = top.Ext.getCmp('batchNumber1').getValue();
+					var batch = getSelectedBatch();
+					var priceAmount = getSelectedPriceAmount();
+					addItems(disposableGoodsStockID,name,count,batch,priceAmount);
+				}
+			}];
 	var form = new top.Ext.FormPanel({
 		id : 'appropriationForm',
 		frame : true,
@@ -341,7 +475,7 @@
 				id : 'targetWareHouseName'
 			},{
 				id : 'serialNum',
-				columnWidth : .20,
+				columnWidth : .16,
 				layout : 'form',
 				labelWidth : 40,
 				hidden:true,
@@ -357,14 +491,15 @@
 					anchor : '95%'
 				}]
 			},{
-				columnWidth : .20,
+				columnWidth : .22,
 				layout : 'form',
 				labelWidth : 50,
 				items:[{
 					xtype : 'combo',
 					fieldLabel : '出库仓库',
 					id : 'wareHouse',
 					name : 'wareHouse',
+					disabled : commonEntry.isOpen(),
 					minChars : 0,
 					valueField : 'id',
 					displayField : 'name',
@@ -390,14 +525,15 @@
 					}
 				}]
 			},{
-				columnWidth : .20,
+				columnWidth : .22,
 				layout : 'form',
 				labelWidth : 50,
 				items:[{
 					xtype : 'combo',
 					fieldLabel : '入库仓库',
 					id : 'targetWareHouse',
 					name : 'targetWareHouse',
+					disabled : commonEntry.isOpen(),
 					minChars : 0,
 					valueField : 'id',
 					displayField : 'name',
@@ -513,148 +649,18 @@
 	        	{header : "失效日期",width : 90,dataIndex : 'expDate',menuDisabled : true},//, renderer:top.Ext.util.Format.dateRenderer('Y-m-d')
 	        	{header : "单价",dataIndex : 'cost',width : 60,menuDisabled : true},
 	        	{header : "供应商",width : 150,dataIndex : 'supplierName',menuDisabled : true},
-	        	{id : 'expandColumn',header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton}
+	        	{id : 'expandColumn',header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton,hidden : commonEntry.isOpen()}
 	        ]),
 			width :835,
 			autoExpandColumn : 'expandColumn',
 			selModel : new top.Ext.grid.RowSelectionModel({
 				singleSelect : false
 			}),
-			tbar : [{
-				xtype : 'hidden',
-				name : 'disposableGoodsStockID',
-				id : 'disposableGoodsStockID'
-			},{
-				xtype : 'hidden',
-				name : 'barcode',
-				id : 'barcode'
-			},{
-				text : '名称:'
-			},{
-				xtype : 'combo',
-				id : 'name1',
-				name : 'name1',
-				queryParam : 'spell',
-				minChars : 0,
-				valueField : 'id',
-				displayField : 'name',
-				store : diposableGoodsStore,
-				forceSelection : true,
-				lazyInit : false,
-				triggerAction : 'all',
-				hideTrigger : true,
-				typeAhead : false,
-				allowBlank : true,
-				width : 180,
-				listeners : {
-					select : function(combo, record, index) {
-						top.Ext.getCmp('name1').setValue(record.data.name);
-						top.Ext.getCmp('disposableGoodsStockID').setValue(record.data.id);
-						top.Ext.getCmp('cost').setValue(record.data.referencePrice);
-						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						
-						// 清空批次和价格
-						clearBatchNumberAndPrice();
-						
-						DiposableGoodsTableManager.getBatchsByDiposableGoodsId(record.data.id,false,function(batchesStr){
-							var batches = JSON.parse(batchesStr);
-							for(var i = 0;i<batches.length;i++){
-								batches[i].expDate = batches[i].expDateStr;
-							}
-							setBatchNumbers(batches, true);
-
-						});
-					},
-					specialkey : function(field, ee) {
-						if (ee.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('amount1').focus();
-						}
-					}
-				}
-			},{
-				text : '数量:'
-			},{
-				xtype : 'textfield',
-				maxLength : '16',
-				id : 'amount1',
-				name : 'amount1',
-				width : 80,
-				regex: /^\d+$/,
-				regexText:'只能输入数字',
-				anchor : '95%',
-				listeners : {
-					specialkey : function(field, e) {
-						if (e.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('batchNumber1').focus();
-						}
-					}
-				}
-			},{
-				text : '批次:'
-			},{
-				xtype : 'combo',
-				id : 'batchNumber1',
-				name : 'batchNumber1',
-				valueField : 'batchNumber',
-				displayField : 'batchNumber',
-				store : diposableGoodsBatchNumStore,
-				editable : false,
-				forceSelection : true,
-				mode : 'local',
-				triggerAction : 'all',
-				typeAhead : false,
-				allowBlank : false,
-				width : 120,
-				anchor : '95%',
-				listeners:{
-					select : function(combo, record, index) {
-						var disposableGoodID = top.Ext.get('disposableGoodsStockID').getValue();
-						top.Ext.getCmp('cost').setValue(record.data.cost);
-						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						top.Ext.getCmp('expDate').setValue(record.data.expDate);
-						// 清空价格
-						clearPrice();
-						// 填充价格
-						var batch = getSelectedBatch();
-						GodownEntryTableManager.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batch.id,function(priceAmounts){
-							setPrices(priceAmounts,true);
-						});
-					}
-				}
-			},{
-				text : '单价  :'
-			},{
-				xtype : 'combo',
-				id : 'combo_price',
-				name : 'combo_price',
-				valueField : 'price',
-				displayField : 'price',
-				store : priceStore,
-				editable : false,
-				forceSelection : true,
-				mode : 'local',
-				triggerAction : 'all',
-				typeAhead : false,
-				allowBlank : false,
-				width : 100,
-				anchor : '95%'
-			},
-			{
-				text : '添加',
-				iconCls : 'btn_ext_add',
-				handler : function() {
-					var disposableGoodsStockID = top.Ext.getCmp('disposableGoodsStockID').getValue();
-					var name = top.Ext.getCmp('name1').getValue();
-					var count = top.Ext.getCmp('amount1').getValue();
-					var batchNumber = top.Ext.getCmp('batchNumber1').getValue();
-					var batch = getSelectedBatch();
-					var priceAmount = getSelectedPriceAmount();
-					addItems(disposableGoodsStockID,name,count,batch,priceAmount);
-				}
-			}]
+			tbar : commonEntry.isOpen() ? '' : toolbar
 		})],
 		buttons : [{
 			text : '保存',
+			hidden: commonEntry.isOpen(),
 			handler : function() {
 				if(!form.getForm().isValid()){
 					showResult('请正确填写表单各值');
@@ -769,18 +775,19 @@
 var loadFormData = function(grid) {
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
-		showResult("请选择要修改的"+entityName+"单！");
+		showResult("请选择要查看的"+entityName+"单！");
 		return false;
 	}
 	if (records.length > 1) {
-		showResult("一次只能修改一个"+entityName+"单！");
+		showResult("一次只能查看一个"+entityName+"单！");
 		return false;
 	}
 	id = records[0].data['id'];
 	editRecord(id);
 };
 
 function editRecord(id){
+	commonEntry.setId(id);
 	addGodownEntry();
 	top.Ext.getCmp("serialNum").show();
 	top.Ext.getCmp('appropriationForm').form.load({
@@ -793,6 +800,7 @@
 			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(time), 'Y-m-d'));
 			setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName);
 			top.Ext.getCmp("wareHouse").setValue(action.result.data.warehouseID);
+			top.Ext.getCmp("targetWareHouse").setValue(action.result.data.targetWareHouseId);
 			for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
 				var specification = action.result.data.itemsList[i].diposableGoods.specification;
 				var b = true;
@@ -892,17 +900,18 @@
 		hidden : SSTS_WarehouseEntry_Create,
 		iconCls : 'btn_ext_add',
 		handler : function() {
+			commonEntry.setId(null);
 			addGodownEntry('insert');
 		}
-	},'-',{
+	},/*'-',{
 		text : '删除',
 		hidden : SSTS_WarehouseEntry_Delete,
 		iconCls : 'btn_ext_application_del',
 		handler : function() {
 			deleteGodownEntry(grid);
 		}
-	},'-',{
-		text : '修改',
+	},*/'-',{
+		text : '查看',
 		hidden : SSTS_WarehouseEntry_Update,
 		iconCls : 'btn_ext_refresh',
 		id : 'editTbar',
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r12769 -r12787
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12769)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12787)
@@ -1270,10 +1270,14 @@
 			saveGodownOutEntry_internal(outEntry, null);
 			saveGodownEntry_internal(inEntry, result);
 			save(entry);
-			
+			//设置库存关系，但是调拨单本身不影响库存
+			for(GodownEntryItem item : entry.getItemsList()){
+				item.setDiposableGoods(diposableGoodsManager.getDiposableGoodsStockById(item.getDisposableGoodsStockID() + ""));
+			}
 			//设置单的关系
 			inEntry.setSourceId(entry.getId());
 			outEntry.setSourceId(entry.getId());
+			objectDao.update(entry);
 		}
 	}
 	/**
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp
===================================================================
diff -u -r12766 -r12787
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp	(.../appropriationView.jsp)	(revision 12766)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp	(.../appropriationView.jsp)	(revision 12787)
@@ -21,6 +21,7 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/DiposableGoodsTableManager.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/assestManagement/godownEntry/commonEntry.js"></script>
 <script type="text/javascript" src="appropriationView.js"></script>
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js	(revision 12787)
@@ -0,0 +1,22 @@
+/**
+ * 一次性物品入库单、出库单、调拨单的公共处理方法
+ */
+function commonEntry(){
+	/**
+	 * 一次性物品入库单、出库单、调拨单的id
+	 */
+	var entryid = '';
+	/**
+	 * 是否是新添加一张单
+	 * @returns {Boolean} true表示是打开一张单，false表示是新添加一张单
+	 */
+	this.isOpen = function (){
+		if(entryid == null || entryid == ''){
+			return false;
+		}
+		return true;
+	}
+	this.setId = function(id){
+		entryid = id;
+	}
+}
\ No newline at end of file