Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
===================================================================
diff -u -r12911 -r12939
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 12911)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 12939)
@@ -42,4 +42,11 @@
 	 * @return
 	 */
 	public GodownEntryItem clone(GodownEntryItem other);
+	
+	/**
+	 * 根据一次性物品id查询出该一次性物品最近一条入库单明细数据
+	 * @param disposableGoodsId
+	 * @return
+	 */
+	public GodownEntryItem getLastGodownEntryByDisposableGoodsId(String disposableGoodsId);
 }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
===================================================================
diff -u -r12911 -r12939
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 12911)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 12939)
@@ -6,6 +6,7 @@
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.databaseadapter.service.DateQueryAdapter;
@@ -174,4 +175,18 @@
 		newItem.setWarehouseName(source.getWarehouseName());
 		return newItem;
 	}
+	
+	/**
+	 * 根据一次性物品id查询出该一次性物品最近一条入库单明细数据
+	 * @param disposableGoodsId
+	 * @return
+	 */
+	public GodownEntryItem getLastGodownEntryByDisposableGoodsId(String disposableGoodsId){
+		GodownEntryItem godownEntryItem = null;
+		String sql = "from GodownEntryItem po where 1=1 and disposableGoodsID= " + disposableGoodsId
+				+ " and godownEntry_id in (select id from GodownEntry where type='"+GodownEntry.TYPE_IN+"')";
+		List<GodownEntryItem> list = objectDao.findByHql(sql,1,1);
+		godownEntryItem = CollectionUtils.isNotEmpty(list) ? list.get(0) : null;
+		return godownEntryItem;
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r12936 -r12939
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12936)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12939)
@@ -639,14 +639,15 @@
 						top.Ext.getCmp('name1').selectText();
 						top.Ext.getCmp('disposableGoodsID').setValue(record.data.id);
 						top.Ext.getCmp('cost1').setValue(record.data.referencePrice);
-						//加载注册证号
-						DiposableGoodsTableManager.getDiposableGoodsCertification(record.data.id,function(result){
-							if(result != ""){
-								var array = result.split("#;");
-								top.Ext.getCmp('supplier1').setValue(array[3]);
-								top.Ext.getCmp('certification').setValue(array[0]);
-								top.Ext.getCmp('manufacturer').setValue(array[1]);
-								top.Ext.getCmp('sterileBatchNumber').setValue(array[2]);
+						//根据一次性物品id加载最近一次入库的一次性物品的供应商、注册证号、生产厂家、灭菌批次、产地等
+						GodownEntryTableManager.getLastDiposableGoodsFromGodownEntry(record.data.id,function(result){
+							if(result && result != ""){
+								var lastGodownEntryItem = Ext.decode(result);
+								top.Ext.getCmp('supplier1').setValue(lastGodownEntryItem.supplierName);
+								top.Ext.getCmp('certification').setValue(lastGodownEntryItem.certification);
+								top.Ext.getCmp('manufacturer').setValue(lastGodownEntryItem.manufacturer);
+								top.Ext.getCmp('sterileBatchNumber').setValue(lastGodownEntryItem.sterileBatchNumber);
+								top.Ext.getCmp('producingArea').setValue(lastGodownEntryItem.producingArea);
 							}
 						});
 						batchNumStore.baseParams.disposableGoodsID = record.data.id;
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r12914 -r12939
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12914)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12939)
@@ -5,13 +5,17 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import net.sf.json.JSONObject;
+
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.component.grid.GridManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
+import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryItemManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
+import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.vo.PriceAmount;
 import com.forgon.tools.util.SqlUtils;
@@ -25,6 +29,8 @@
 	private DiposableGoodsManager diposableGoodsManager;
 	
 	private WareHouseManager wareHouseManager;
+	
+	private GodownEntryItemManager godownEntryItemManager;
 
 	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
 		this.dateQueryAdapter = dateQueryAdapter;
@@ -41,6 +47,11 @@
 	public void setWareHouseManager(WareHouseManager wareHouseManager) {
 		this.wareHouseManager = wareHouseManager;
 	}
+	public void setGodownEntryItemManager(
+			GodownEntryItemManager godownEntryItemManager) {
+		this.godownEntryItemManager = godownEntryItemManager;
+	}
+
 	/**
 	 * 入库单
 	 * 
@@ -130,4 +141,45 @@
 		return diposableGoodsManager
 				.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batchID);
 	}
+	
+	/**
+	 * 根据一次性物品id查找最近一张该一次性物品入库单信息
+	 * 用于添加一次性物品入库单页面选择物品时,根据查询到的信息给页面的产地、供应商、生产厂家、灭菌批号、注册证号等进行自动赋值
+	 * @param diposableGoodsId
+	 * @return
+	 */
+	public String getLastDiposableGoodsFromGodownEntry(String disposableGoodsId) {
+		GodownEntryItem godownEntryItem = 
+				godownEntryItemManager.getLastGodownEntryByDisposableGoodsId(disposableGoodsId);
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("certification", "");
+		jsonObject.put("producingArea", "");
+		jsonObject.put("supplierName", "");
+		jsonObject.put("manufacturer", "");
+		jsonObject.put("sterileBatchNumber", "");
+		if (godownEntryItem != null) {
+			//注册证号
+			if(StringUtils.isNotBlank(godownEntryItem.getCertification())){
+				jsonObject.put("certification", godownEntryItem.getCertification());
+			}
+			//产地
+			if(StringUtils.isNotBlank(godownEntryItem.getProducingArea())){
+				jsonObject.put("producingArea", godownEntryItem.getProducingArea());
+			}
+			//供应商
+			if(StringUtils.isNotBlank(godownEntryItem.getSupplierName())){
+				jsonObject.put("supplierName", godownEntryItem.getSupplierName());
+			}
+			//生产厂家
+			if(StringUtils.isNotBlank(godownEntryItem.getManufacturer())){
+				jsonObject.put("manufacturer", godownEntryItem.getManufacturer());
+			}
+			//灭菌批号
+			if(StringUtils.isNotBlank(godownEntryItem.getSterileBatchNumber())){
+				jsonObject.put("sterileBatchNumber", godownEntryItem.getSterileBatchNumber());
+			}
+			
+		}
+		return jsonObject.toString();
+	}
 }