Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r17236 -r17248
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 17236)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 17248)
@@ -1518,14 +1518,24 @@
 		WareHouse sourceWareHouse = submitInvoiceContext.getSourceWarehouse();
 		Map<String,WareHouse> targetWareHouseMap = submitInvoiceContext.getTargetWareHouseMap();
 		Collection<TousseInstance> tousseInstances = submitInvoiceContext.getBarcodeToTousseInstanceMap().values();
+		Set<Long> tousseDefinitionAncestorId = new HashSet<Long>();
 		if(CollectionUtils.isNotEmpty(tousseInstances)){
 			List<TousseDefinition> tds = new ArrayList<>();
 			for(TousseInstance ti : tousseInstances){
 				if(ti != null){
 					tds.add(ti.getTousseDefinition());
+					if(DatabaseUtil.isPoIdValid(ti.getTousseDefinition().getAncestorID())){
+						tousseDefinitionAncestorId.add(ti.getTousseDefinition().getAncestorID());
+					}
 				}
 			}
 			submitInvoiceContext.getAllGoodsStocksInDB().addAll(goodsStockManager.lockGoodsStocks(sourceWareHouse, targetWareHouseMap.values(),tds));
+			Collection<TousseDefinition> ancestorTds = tousseDefinitionManager.getCollection(tousseDefinitionAncestorId);
+			if(CollectionUtils.isNotEmpty(ancestorTds)){
+				for(TousseDefinition td : ancestorTds){
+					submitInvoiceContext.getAncestorTousseDefinitionIdToTousseDefinitionMap().put(td.getId(), td);
+				}
+			}
 		}
 	}
 	private void lockDiposableGoods2(
@@ -3095,7 +3105,7 @@
 			try {
 				if(CollectionUtils.isNotEmpty(allSourceStocks)){
 					goodsStockManager.saveOrUpdateGoodsStockForInvoice(submitInvoiceContext.getAllGoodsStocksInDB(),
-							submitInvoiceContext.getTousseDefinitionIdToTousseDefinitionMap(),allSourceStocks);
+							submitInvoiceContext.getAncestorTousseDefinitionIdToTousseDefinitionMap(),allSourceStocks);
 				}
 //				if(CollectionUtils.isNotEmpty(allTargetStocks)){
 //					goodsStockManager.saveOrUpdateGoodsStock(allTargetStocks, GoodsStockManager.MODE_INSTOCK);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
===================================================================
diff -u -r17216 -r17248
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 17216)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 17248)
@@ -57,6 +57,10 @@
 	
 	private Set<Long> tousseDefinitionIdSet = new HashSet<Long>();
 	private Map<Long, TousseDefinition> tousseDefinitionIdToTousseDefinitionMap = new HashMap<Long, TousseDefinition>();
+	/**
+	 * 扫描的包实例对应的包定义的祖先包定义id与祖先包定义的map。扣库存的时候,使用这个信息
+	 */
+	private Map<Long, TousseDefinition> ancestorTousseDefinitionIdToTousseDefinitionMap = new HashMap<Long, TousseDefinition>();
 	private Set<TousseInstance> scannedTousseInstances = new HashSet<TousseInstance>();
 	private Set<Long> comboTousseInstanceIdSet = new HashSet<Long>();
 	private Set<TousseInstance> comboTousseInstances = new HashSet<TousseInstance>();
@@ -263,6 +267,12 @@
 		this.tousseDefinitionIdToTousseDefinitionMap = tousseDefinitionIdToTousseDefinitionMap;
 	}
 
+	
+
+	public Map<Long, TousseDefinition> getAncestorTousseDefinitionIdToTousseDefinitionMap() {
+		return ancestorTousseDefinitionIdToTousseDefinitionMap;
+	}
+
 	public Set<TousseInstance> getScannedTousseInstances() {
 		return scannedTousseInstances;
 	}