Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r20380 -r20619
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 20380)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 20619)
@@ -552,6 +552,21 @@
 	//top.Ext.getCmp("count1").getValue());
 	
 }
+
+//仓库名称combo的store
+var storeCodeStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadStoreCodeStore.do',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		totalProperty : 'totalCount',
+		root : 'data'
+	}, [{name : 'storeCode',mapping : 'storeCode'},
+	    {name : 'storeName',mapping : 'storeName'}]
+	)
+});
+
 function addAndEditReturnGoodsRecord(id, enableBtn) {
 	editableConfig.editable = enableBtn;
 	var diposableGoodsStore = new Ext.data.Store({
@@ -862,6 +877,15 @@
 							select:function(combo,  record, index ){
 								var tem = record.data.id;
 								top.Ext.getCmp('departCoding').setValue(tem);
+								
+								if(sstsConfig.enableStoreCode && isShowStoreCodeCombo(tem)){
+									top.Ext.getCmp('storeCodeLabel').setVisible(true);
+									storeCodeStore.baseParams.departmentCode = tem;
+									storeCodeStore.reload();  //加载仓库数据
+								} else {
+									top.Ext.getCmp('storeCodeLabel').setVisible(false);
+									//top.Ext.getCmp('storeCode').setValue('');
+								}
 							}
 						}
 					}]
@@ -914,6 +938,25 @@
 						cls:'x-item-disabled'
 					}]
 				},{
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 70,
+					hidden: true,
+					id: 'storeCodeLabel',
+					items : [{
+						xtype : 'combo',
+						listWidth: 150,
+						fieldLabel : '仓位',
+						id : 'storeCode',
+						hideTrigger : true,
+						name : 'storeCode',
+						triggerAction : 'all',
+						editable: false,
+						displayField : 'storeName',
+						valueField : 'storeCode',
+						store : storeCodeStore
+					}]
+				},{
 					columnWidth : 1,
 					layout : 'form',
 					labelWidth : 80,
@@ -1194,6 +1237,14 @@
 						/*top.Ext.getCmp('returnOfPeople').setDisabled(false);
 						top.Ext.getCmp('depart').setDisabled(false);*/
 //						return false;
+						var departCoding = top.Ext.getCmp("departCoding").getValue();
+						
+						if (isShowStoreCodeCombo(departCoding)) {
+							top.Ext.getCmp("storeCode").setRawValue(top.Ext.getCmp("storeCode").getValue());  //后台存倉庫編碼
+						} else {
+							top.Ext.getCmp("storeCode").setRawValue('');
+						}
+						
 						form.form.submit({
 							url : WWWROOT + '/disinfectSystem/returnGoodsRecordAction!saveReturnGoodsRecord.do',
 							method : 'POST',
@@ -1350,18 +1401,26 @@
 }
 
 function setReturnGoodsRecordForm(returnGoodsRecord){
+	var departCoding = returnGoodsRecord.departCoding;
 	top.Ext.getCmp("id").setValue(returnGoodsRecord.id);
 	top.Ext.getCmp("operator").setValue(returnGoodsRecord.operator);
 	top.Ext.getCmp("depart").setValue(returnGoodsRecord.depart);
 	top.Ext.getCmp("returnTime").setValue(returnGoodsRecord.returnTime);
 //	Ext.getCmp("signStatus").setValue(returnGoodsRecord.signStatus);
 	top.Ext.getCmp("remark").setValue(returnGoodsRecord.remark);
 	top.Ext.getCmp("returnOfPeople").setValue(returnGoodsRecord.returnOfPeople);
-	top.Ext.getCmp("departCoding").setValue(returnGoodsRecord.departCoding);
+	top.Ext.getCmp("departCoding").setValue(departCoding);
 	var warehouse = top.Ext.getCmp("warehouse");
 	if(warehouse != null){
 		warehouse.setValue(returnGoodsRecord.warehouseName);
 	}
+	
+	if(sstsConfig.enableStoreCode && isShowStoreCodeCombo(departCoding)){
+		top.Ext.getCmp('storeCodeLabel').setVisible(true);
+		storeCodeStore.baseParams.departmentCode = departCoding;
+		storeCodeStore.reload();  //加载仓库数据
+		top.Ext.getCmp('storeCode').setValue(returnGoodsRecord.storeCode);
+	}
 }
 
 //TODO 器械包退货
@@ -2423,4 +2482,22 @@
 	// ********************** 节点保存的属性值 ****************************//
 	return node;
 }
+
+/**
+ * 判断是否需要显示仓库名称的combo
+ * @param deptCoding
+ * @returns {Boolean}
+ */
+function isShowStoreCodeCombo(deptCoding) {
+	var storeCodeValues = sstsConfig.storeCodeValues;
+	if (storeCodeValues) {
+		for (var int = 0; int < storeCodeValues.length; int ++) {
+			var obj = storeCodeValues[int];
+			if (deptCoding == obj.departmentCode && obj.showStoreCodeCombo) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
 /*********************************** 器械包退货 form end****************************************/