Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java
===================================================================
diff -u -r12880 -r12883
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java	(.../ReturnGoodsItem.java)	(revision 12880)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java	(.../ReturnGoodsItem.java)	(revision 12883)
@@ -266,17 +266,6 @@
 		}
 		return false;
 	}
-	/**
-	 * 是否重新发货
-	 * @return
-	 */
-	@Transient
-	public boolean isDelivery(){
-		if (StringUtils.equals(Constants.STR_YES, isDelivery)) {
-			return true;
-		}
-		return false;
-	}
 	public Long getDisposableGoodsID() {
 		return disposableGoodsID;
 	}
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r12880 -r12883
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 12880)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 12883)
@@ -646,8 +646,6 @@
 			// 更新器械包库存
 			updataTousseStockWithAmount(newItem.getTousseName(),
 					newItem.getAmount());
-			//更新仓库库存,并设置器械包的仓库信息
-			updateTousseInstanceGoodsStock(newItem);
 
 			// 修改器械包实例状态,要根据是否重装来改变状态，重装改为已废弃，否则改为已灭菌
 			List<TousseInstance> tousseInstanceList = newItem
@@ -673,6 +671,8 @@
 					}
 				}
 			}
+			//更新仓库库存,并设置器械包的仓库信息
+			updateTousseInstanceGoodsStock(newItem);
 			minusDepartmentStock(returnGoodsRecord, newItem);
 		}
 
@@ -1041,8 +1041,8 @@
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				//退货重发，还需要增加供应室的库存
-				if(returnGoodsItem.isDelivery()){
+				//不是，还需要增加供应室的库存
+				if(!returnGoodsItem.isRepacking()){
 					List<GoodsStock> cssdGoodsStockList = new ArrayList<GoodsStock>();
 					for(TousseInstance tousseInstance : tousseInstanceList){
 						if(tousseInstance != null){