Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
===================================================================
diff -u -r13103 -r13112
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 13103)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 13112)
@@ -81,9 +81,9 @@
 							objectDao.saveOrUpdate(goodsStock);
 							break;
 						}
+						needReturnAmount -= goodsStock.getAmount();
 						goodsStock.setAmount(0);
 						objectDao.saveOrUpdate(goodsStock);
-						needReturnAmount -= goodsStock.getAmount();
 					}
 				} else {
 					throw new RuntimeException("入/退库单器械包id与材料id不能同时为空");
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
===================================================================
diff -u -r13107 -r13112
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java	(.../MaterialInvoiceManagerImpl.java)	(revision 13107)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java	(.../MaterialInvoiceManagerImpl.java)	(revision 13112)
@@ -216,9 +216,9 @@
 												.getAmount().toString()))).doubleValue();
 						break;
 					}
+					needSendOutAmount -= goodsStock.getAmount();
 					goodsStock.setAmount(0);
 					objectDao.saveOrUpdate(goodsStock);
-					needSendOutAmount -= goodsStock.getAmount();
 					
 					MaterialItem materialItem = new MaterialItem();
 					materialItem.setAmount(goodsStock.getAmount());
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManager.java
===================================================================
diff -u -r13103 -r13112
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManager.java	(.../MaterialInvoiceManager.java)	(revision 13103)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManager.java	(.../MaterialInvoiceManager.java)	(revision 13112)
@@ -1,9 +1,5 @@
 package com.forgon.disinfectsystem.invoicemanager.service;
 
-import java.util.List;
-
-import net.sf.json.JSONObject;
-
 import com.forgon.disinfectsystem.entity.invoicemanager.MaterialInvoice;
 
 /**