Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r13540 -r13780
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 13540)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 13780)
@@ -1177,7 +1177,7 @@
 						}
 					}
 				}
-				if(thisGoodsStockList != null){
+				if(CollectionUtils.isNotEmpty(thisGoodsStockList)){
 					goodsStockManager.saveOrUpdateGoodsStock(thisGoodsStockList, GoodsStockManager.MODE_OUTSTOCK);
 				}
 				//不是重装，还需要增加供应室的库存
@@ -1201,7 +1201,7 @@
 							}
 						}
 					}
-					if(CollectionUtils.isNotEmpty(thisGoodsStockList)){
+					if(CollectionUtils.isNotEmpty(cssdGoodsStockList)){
 						goodsStockManager.saveOrUpdateGoodsStock(cssdGoodsStockList, GoodsStockManager.MODE_INSTOCK);
 					}
 				}