Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r40650 -r40654
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 40650)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 40654)
@@ -213,26 +213,6 @@
 	setTotalMoney();
 }
 
-//添加待审核的一次性物品
-function addNewDiposableGoodsItems(diposableGood){
-	if(returnGoodsItemStore.getCount() > 0){
-		for(var i=0;i<returnGoodsItemStore.getCount();i++){
-			var returnGoodsItemItems = returnGoodsItemStore.getAt(i)
-			if(returnGoodsItemItems.data.tousseName == diposableGood.showName){
-				returnGoodsItemItems.set('disposableGoodsID',diposableGood.disposableGoodsID);
-				returnGoodsItemItems.set('disposableGoodsStockID',diposableGood.disposableGoodsStockID);
-				returnGoodsItemItems.set('disposableGoodsBatchID',diposableGood.disposableGoodsBatchID);
-				returnGoodsItemItems.set('disposableGoodsBatchStockID',diposableGood.disposableGoodsBatchStockID);
-				returnGoodsItemItems.set('barcode',diposableGood.barcode);
-				returnGoodsItemItems.set('batchNumber',diposableGood.batchNumber);
-				returnGoodsItemItems.set('expDate',diposableGood.expDate);
-				returnGoodsItemItems.set('id',diposableGood.id);
-				break;
-			}
-		}
-	}
-}
-
 // 添加高值一次性物品到grid
 function addExpensiveDisposablegoodsItems(diposableGood) {
 	if (isExpensiveDisposablegoodsRepeat(diposableGood)) {
@@ -515,10 +495,19 @@
 					showResult(resultObj.errMsg);
 					return;
 				}
+				if(signStatus == '待审核'){
+					if(returnGoodsItemStore.getCount() > 0){
+						for(var i=0;i<returnGoodsItemStore.getCount();i++){
+							var returnGoodsItemItems = returnGoodsItemStore.getAt(i)
+							if(returnGoodsItemItems.data.tousseName == resultObj.diposableGood.showName && returnGoodsItemItems.data.barcode == ''){
+								returnGoodsItemStore.remove(returnGoodsItemItems)
+								break;
+							}
+						}
+					}
+				}
 				if (resultObj.diposableGood.goodsType == '高值耗材') {
 					addExpensiveDisposablegoodsItems(resultObj.diposableGood);
-				}else if(signStatus == '待审核'){
-					addNewDiposableGoodsItems(resultObj.diposableGood);
 				} else {
 					onLoadDiposableGoodsInfo(resultObj.diposableGood);
 				}