Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
===================================================================
diff -u -r13490 -r13505
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java	(.../GoodPurchasePlanManagerImpl.java)	(revision 13490)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java	(.../GoodPurchasePlanManagerImpl.java)	(revision 13505)
@@ -24,16 +24,19 @@
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.RichTextString;
+
 import com.forgon.Constants;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GoodPurchaseItem;
 import com.forgon.disinfectsystem.entity.assestmanagement.GoodPurchasePlan;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.vo.GodownEntryItemPrintVO;
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.tools.Path;
+import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.excel.ExcelCellStyle;
 import com.forgon.tools.excel.ExcelHelper;
 import com.forgon.tools.hibernate.ObjectDao;
@@ -347,17 +350,30 @@
 									obj.optString("materialName"),
 									obj.optString("specification"));
 				GodownEntryItemPrintVO tempVo = new GodownEntryItemPrintVO();
-				tempVo.setCode(diposableGoods.getExternalCode());
+				if(diposableGoods == null && DatabaseUtil.isPoIdValid(item.getMaterialDefinitionId())){
+					MaterialDefinition md = 
+							(MaterialDefinition)objectDao.getBySql(MaterialDefinition.class.getSimpleName(), "where id=" + item.getMaterialDefinitionId());
+					if(md == null){
+						continue;
+					}
+					tempVo.setCode(md.getExternalCode());
+					tempVo.setName(md.getName());
+					tempVo.setSpecification(md.getSpecification());
+					tempVo.setInventorySerialNumber(md.getInventorySerialNumber());
+					tempVo.setUnit(md.getUnit());
+				}else{
+					tempVo.setCode(diposableGoods.getExternalCode());
+					tempVo.setName(diposableGoods.getName());
+					tempVo.setSpecification(diposableGoods.getSpecification());
+					tempVo.setInventorySerialNumber(diposableGoods.getInventorySerialNumber());
+					tempVo.setUnit(diposableGoods.getUnit());
+					tempVo.setCertification(diposableGoods.getCertification());
+				}
 				tempVo.setAmount(Long.valueOf(item.getScheduleAmout()));
-				tempVo.setName(diposableGoods.getName());
-				tempVo.setSpecification(diposableGoods.getSpecification());
-				tempVo.setInventorySerialNumber(diposableGoods.getInventorySerialNumber());
-				tempVo.setUnit(diposableGoods.getUnit());
 				tempVo.setPrice(item.getPurchase());
 				tempVo.setRowPrice(item.getTotalPrice());
 				tempVo.setTotalPrice(tempVo.getRowPrice());
 				tempVo.setBatchNumber("");
-				tempVo.setCertification(diposableGoods.getCertification());
 				tempVo.setSupplierName(item.getSupplierName());
 				voList.add(tempVo);
 			}