Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js
===================================================================
diff -u -r22227 -r22325
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js	(.../expensiveGoodsInvoiceForm.js)	(revision 22227)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js	(.../expensiveGoodsInvoiceForm.js)	(revision 22325)
@@ -729,7 +729,7 @@
 			top.Ext.getCmp('firstBodyCode').setValue("");
 			top.Ext.getCmp('secondBodyCode').setValue("");
 			top.Ext.getCmp('thirdBodyCode').setValue("");
-			top.Ext.getCmp('firstBodyCode').focus();
+			top.Ext.getCmp('scanFirstBodyCode').focus();
 			var result = Ext.decode(response.responseText);
 			// 首先处理错误信息
 			if(!isUndefinedOrNullOrEmpty(result.errMsg)){
@@ -746,7 +746,9 @@
 				var goods = result.data[x];
 				
 				var b = isBarcodeRepeat(goods.barcode);
+				var typeInfoOnScanned = JSON.parse(goods.typeInfoOnScanned);
 				if(b){
+					showResult('自身条码为'+typeInfoOnScanned.firstBodyCode+','+typeInfoOnScanned.secondBodyCode+','+typeInfoOnScanned.thirdBodyCode+'的实例已经存在！');
 					continue;
 				}
 				
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r22291 -r22325
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 22291)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 22325)
@@ -144,7 +144,6 @@
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
-import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.GsonUtil;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
@@ -4899,6 +4898,10 @@
 		typeInfoOnScanned.put("expensiveGoodsModelId", expensiveGoodsInstance.getExpensiveGoodsModelId());
 		typeInfoOnScanned.put("expensiveGoodsModelStockId", expensiveGoodsInstance.getExpensiveGoodsModelStockId());
 		typeInfoOnScanned.put("expensiveGoodsInstanceId", expensiveGoodsInstance.getId());
+		typeInfoOnScanned.put("firstBodyCode", expensiveGoodsInstance.getFirstBodyCode());
+		typeInfoOnScanned.put("secondBodyCode", expensiveGoodsInstance.getSecondBodyCode());
+		typeInfoOnScanned.put("thirdBodyCode", expensiveGoodsInstance.getThirdBodyCode());
+		
 		JsonObject data = new JsonObject();
 		data.addProperty("name", showName);
 		data.addProperty("ttsName", expensiveGoods.getTtsName());