Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r22094 -r22098
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 22094)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 22098)
@@ -1,7 +1,5 @@
 package com.forgon.disinfectsystem.expensiveGoods.service;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -20,8 +18,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -31,9 +27,6 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.hibernate.LockMode;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -42,7 +35,6 @@
 import com.forgon.attachfile.service.AttachFileManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
-import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager;
@@ -64,9 +56,11 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.departmentstock.DepartmentStock;
+import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsAuthorization;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsBatch;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModel;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModelStock;
+import com.forgon.disinfectsystem.entity.expensivegoods.RelevancyGoodsAuthorization;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
@@ -93,7 +87,6 @@
 import com.forgon.tools.GB2WB;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.SqlBuilder;
-import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
@@ -103,11 +96,6 @@
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.SqlUtils;
-import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsAuthorization;
-import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsBatch;
-import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModel;
-import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModelStock;
-import com.forgon.disinfectsystem.entity.expensivegoods.RelevancyGoodsAuthorization;
 
 
 @Service("expensiveGoodsManagerTarget")
@@ -237,8 +225,8 @@
 		while(it.hasNext()){
 			ExpensiveGoodsModel expensiveGoodsModel = it.next();
 			Long id = expensiveGoodsModel.getId();
-			if(id == null || id == 0){
-				return null;
+			if(!DatabaseUtil.isPoIdValid(id)){
+				continue;
 			}
 			if(modelId.equals(id)){
 				return expensiveGoodsModel;					
@@ -315,17 +303,19 @@
 		it = expensiveGoods.getExpensiveGoodsModelList().iterator();
 		while(it.hasNext()){
 			ExpensiveGoodsModel expensiveGoodsModel = it.next();
-			if(expensiveGoodsModel.getId() == null || expensiveGoodsModel.getId() == 0L){	//新添加
+			if(!DatabaseUtil.isPoIdValid(expensiveGoodsModel.getId())){	//新添加
 				String barcode = serialNumManager
 						.getSerialNumberStr(SerialNum.TYPE_BARCODE);
 				expensiveGoodsModel.setBarcode(barcode);
 				expensiveGoodsModel.setExpensiveGoods(curExpensiveGoods);
 				curExpensiveGoods.getExpensiveGoodsModelList().add(expensiveGoodsModel);
 			}else{
 				ExpensiveGoodsModel curExpensiveGoodsModel = existModel(curExpensiveGoods.getExpensiveGoodsModelList(),expensiveGoodsModel.getId());
-				curExpensiveGoodsModel.setModel(expensiveGoodsModel.getModel());
-				curExpensiveGoodsModel.setDescription(expensiveGoodsModel.getDescription());
-				curExpensiveGoodsModel.setSurfaceStatus(expensiveGoodsModel.getSurfaceStatus());
+				if(curExpensiveGoodsModel != null){
+					curExpensiveGoodsModel.setModel(expensiveGoodsModel.getModel());
+					curExpensiveGoodsModel.setDescription(expensiveGoodsModel.getDescription());
+					curExpensiveGoodsModel.setSurfaceStatus(expensiveGoodsModel.getSurfaceStatus());
+				}
 			}			
 		}
 	}