Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r26275 -r26494
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 26275)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 26494)
@@ -683,14 +683,20 @@
 			}
 			String sterileBatchNumber = disposableGoodsBatch.getSterileBatchNumber();
 			String expDateStr =  dateFormat.format(disposableGoodsBatch.getExpDate());
+			String produceDateStr = "";
+			if (null != disposableGoodsBatch.getProduceDate()) {
+				produceDateStr =  dateFormat.format(disposableGoodsBatch.getProduceDate());
+			}
 			return (StringUtils.isBlank(Manufacturer) ? "" : Manufacturer)
 					+ "#;"
 					+ (StringUtils.isBlank(sterileBatchNumber) ? ""
 							: sterileBatchNumber) 
 					+ "#;"
 					+ (StringUtils.isBlank(expDateStr) ? "" :expDateStr)
 					+ "#;"
-					+ (StringUtils.isBlank(manufacturerIdStr) ? "" :manufacturerIdStr);
+					+ (StringUtils.isBlank(manufacturerIdStr) ? "" :manufacturerIdStr)
+					+ "#;"
+					+ (StringUtils.isBlank(produceDateStr) ? "" :produceDateStr);
 		}
 		return "";
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js
===================================================================
diff -u -r26490 -r26494
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js	(.../godownEntryForm.js)	(revision 26490)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js	(.../godownEntryForm.js)	(revision 26494)
@@ -704,8 +704,8 @@
 				listeners : {
 					specialkey : function(field, e) {
 						if (e.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('produceDate').focus();
-							top.Ext.getCmp('produceDate').selectText();
+							top.Ext.getCmp('produceDate1').focus();
+							top.Ext.getCmp('produceDate1').selectText();
 						}
 					}
 				}
@@ -776,6 +776,7 @@
 								top.Ext.getCmp('sterileBatchNumber').setValue(array[1]);
 								top.Ext.getCmp('expDate1').setValue(array[2]);
 								top.Ext.getCmp('manufacturerId').setValue(array[3]);
+								top.Ext.getCmp('produceDate1').setValue(array[4]);
 								//配置godownEntryNeedVerify为true：则需要刷新供应商，生产厂家,注册证stroe
 								if(sstsConfig.godownEntryNeedVerify){
 //									supplierNeedVerifyStore.load();