Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js
===================================================================
diff -u -r20214 -r20228
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js	(.../godownEntryView.js)	(revision 20214)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js	(.../godownEntryView.js)	(revision 20228)
@@ -1244,21 +1244,55 @@
 					showResult('请填写物品批次号!');
 					return false;
 				}*/
+			//	var items = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
+//				var store = top.Ext.getCmp('godownEntryItemGrid').getStore();
+//				var len = store.getCount();
+//				for (var i = 0; i < len; i++) {
+//					var record = store.getAt(i);
+//					var expDate = record.data.expDate;
+//					//若是修改入库单则需要.format('Y-m-d')防止失效期不正确
+//					if(!(typeof expDate=='string')&&!(expDate.constructor==String)){
+//						expDate=expDate.format('Y-m-d');
+//					}
+//					//store.getAt(i).set("expDate", expDate);
+//				};
+//				 var items = buildJSONStringFromStore(store);
 				var store = top.Ext.getCmp('godownEntryItemGrid').getStore();
 				var len = store.getCount();
+				var items = [];
 				for (var i = 0; i < len; i++) {
 					var record = store.getAt(i);
-					var expDate = record.data.expDate;
-					//若是修改入库单则需要.format('Y-m-d')防止失效期不正确
-					if(!(typeof expDate=='string')&&!(expDate.constructor==String)){
-						expDate=expDate.format('Y-m-d');
-					}
-					store.getAt(i).set("expDate", expDate);
-				};
-				 var items = buildJSONStringFromStore(store);
+//					console.log(record);
+					items.push({
+						localID:record.data.localID,
+						id : record.data.id,
+						disposableGoodsID : record.data.disposableGoodsID,
+						disposableGoodsStockID :record.data.disposableGoodsStockID,
+						disposableGoodsBatchID : record.data.disposableGoodsBatchID,
+						disposableGoodsBatchStockID : record.data.disposableGoodsBatchStockID,
+						identificationID : record.data.identificationID,
+						name : record.data.name ,
+						amount : record.data.amount ,
+						cost :  record.data.cost,
+						sterileBatchNumber : record.data.sterileBatchNumber,
+						manufacturer : record.data.manufacturer,
+						certification : record.data.certification,
+						batchNumber : record.data.batchNumber,
+					    expDate : record.data.expDate.format('Y-m-d'),
+						supplierName : record.data.supplierName,
+						identification : record.data.identification,
+						totalPrice: record.data.totalPrice,
+						producingArea: record.data.producingArea,
+						hasBiologicalTestReport : record.data.hasBiologicalTestReport,
+						hasInvoice :record.data.hasInvoice,
+						grade : record.data.grade
+					});
+//					console.log(items);
+				}
 				// 设置表单参数json
 				setFormParams(form,['id','remark','time','warehouseName','warehouseID']);
-				top.Ext.getCmp("items").setValue(items);
+				//top.Ext.getCmp("items").setValue(items);
+				top.Ext.getCmp("items").setValue(JSON.stringify(items));
 				// items为json数组字符串，不会为null
 				if(items == '[]'){
 					showResult('请正确填写表单各值');
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r20217 -r20228
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 20217)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 20228)
@@ -1435,22 +1435,50 @@
 					return false;
 				}*/
 				//var items = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
+//				var store = top.Ext.getCmp('godownEntryItemGrid').getStore();
+//				var len = store.getCount();
+//				for (var i = 0; i < len; i++) {
+//					var record = store.getAt(i);
+//					var expDate = record.data.expDate;
+//					//若是修改入库单失效日期则需要.format('Y-m-d')防止失效期不正确
+//					expDate=expDate.format('Y-m-d');
+//					store.getAt(i).set("expDate", expDate);
+//				};
+//				var items = buildJSONStringFromStore(store);
 				var store = top.Ext.getCmp('godownEntryItemGrid').getStore();
 				var len = store.getCount();
+				var items = [];
 				for (var i = 0; i < len; i++) {
 					var record = store.getAt(i);
-					var expDate = record.data.expDate;
-					//若是修改入库单失效日期则需要.format('Y-m-d')防止失效期不正确
-					if(!(typeof expDate=='string')&&!(expDate.constructor==String)){
-						expDate=expDate.format('Y-m-d');
-					}
-					store.getAt(i).set("expDate", expDate);
-				};
-				var items = buildJSONStringFromStore(store);
+//					console.log(record);
+					items.push({
+						amount : record.data.amount,
+						batchID : record.data.batchID,
+						batchNumber : record.data.batchNumber,
+						certification : record.data.certification ,
+						cost :  record.data.cost,
+						disposableGoodsID : record.data.disposableGoodsID,
+						expDate : record.data.expDate.format('Y-m-d'),
+						grade : record.data.grade,
+						hasBiologicalTestReport : record.data.hasBiologicalTestReport,
+						hasInvoice : record.data.hasInvoice,
+					    id : record.data.id,
+					    identification : record.data.identification,
+						identificationID : record.data.identificationID,
+						localID: record.data.localID,
+						manufacturer : record.data.manufacturer,
+						name :record.data.name,
+						producingArea : record.data.producingArea,
+						sterileBatchNumber : record.data.sterileBatchNumber,
+						supplierName : record.data.supplierName,
+						totalPrice: record.data.totalPrice
+					});
+//					console.log(items);
+				}
 				// 设置表单参数json
 				setFormParams(form,['id','remark','time','warehouseName','warehouseID']);
-				top.Ext.getCmp("items").setValue(items);
-				
+//				top.Ext.getCmp("items").setValue(items);
+				top.Ext.getCmp("items").setValue(JSON.stringify(items));
 				// items为json数组字符串，不会为null
 				if(items == '[]'){
 					showResult('请正确填写表单各值');