Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
===================================================================
diff -u -r13454 -r13455
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 13454)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 13455)
@@ -49,11 +49,13 @@
 				if(goodsStockTemp.getTousseDefinitionId() != null && goodsStockTemp.getTousseDefinitionId() != 0){
 					TousseDefinition td = 
 							(TousseDefinition)objectDao.getBySql(TousseDefinition.class.getSimpleName(), "where id=" + goodsStockTemp.getTousseDefinitionId());
-					//如果包定义为消毒物品、外来器械、自定义器械包等,则按器械包名称查询库存并进行扣减
+					//如果包定义为消毒物品、外来器械包、自定义器械包、外部代理灭菌、外来器械拆分小包等,则按器械包名称查询库存并进行扣减
 					if(td != null){
 						if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType())
 							|| TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(td.getTousseType())
-							|| TousseDefinition.PACKAGE_TYPE_CUSTOM.equals(td.getTousseType())){
+							|| TousseDefinition.PACKAGE_TYPE_CUSTOM.equals(td.getTousseType())
+							|| TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())
+							|| TousseDefinition.PACKAGE_TYPE_SPLIT.equals(td.getTousseType())){
 							//先按器械包名称查询库存是否足够
 							int amount = 
 									objectDao.countBySql("select count(0) from " + GoodsStock.class.getSimpleName() + " and name = '" + goodsStockTemp.getName() + "' and amount > 0");