Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
===================================================================
diff -u -r34511 -r34703
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 34511)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 34703)
@@ -83,6 +83,7 @@
 import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialEntryManager;
 import com.forgon.disinfectsystem.vo.DisposableGoodsStorageAdjustVo;
 import com.forgon.excel.service.ExcelUtils;
+import com.forgon.exception.SystemException;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
 import com.forgon.serialnumber.model.SerialNum;
@@ -686,20 +687,24 @@
 			}
 		}
 		try {
-			// 入库单
-			if (in_array.size() > 0) {
-				MaterialEntry entry = newMaterialEntry(inventoryReocrd,
-						MaterialEntry.TYPE_IN,MaterialEntry.SUBTYPE_STOCKTAKE_IN);
-
-				materialEntryManager.saveMaterialEntry(entry,in_array.toString(),false);
-			}
 			// 退库单
 			if (out_array.size() > 0) {
+				//如果启用器械生命周期追溯管理,则不允许创建盘亏出库单
+				if(CssdUtils.getSystemSetConfigByNameBool("enableInstrumentLifeCycleTraceabilityManagement")){
+					throw new SystemException("项目已启用器械生命周期追溯管理功能,不允许生成盘亏出库单");
+				}
 				MaterialEntry entry = newMaterialEntry(inventoryReocrd,
 						MaterialEntry.TYPE_OUT,MaterialEntry.SUBTYPE_STOCKTAKE_OUT);
 				materialEntryManager.saveMaterialEntry(entry,
 						out_array.toString(),false);
 			}
+			// 入库单
+			if (in_array.size() > 0) {
+				MaterialEntry entry = newMaterialEntry(inventoryReocrd,
+						MaterialEntry.TYPE_IN,MaterialEntry.SUBTYPE_STOCKTAKE_IN);
+
+				materialEntryManager.saveMaterialEntry(entry,in_array.toString(),false);
+			}
 		} catch (Exception e) {
 			throw new RuntimeException(e.getMessage());
 		}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
===================================================================
diff -u -r34699 -r34703
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java	(.../MaterialEntryManagerImpl.java)	(revision 34699)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java	(.../MaterialEntryManagerImpl.java)	(revision 34703)
@@ -220,7 +220,7 @@
 		//如果启用器械生命周期追溯管理,则不允许创建退库单
 		if(CssdUtils.getSystemSetConfigByNameBool("enableInstrumentLifeCycleTraceabilityManagement")){
 			if(materialEntry.typeOut()){
-				throw new SystemException("项目启用启用器械生命周期追溯管理功能,不允许创建退库单");
+				throw new SystemException("项目已启用器械生命周期追溯管理功能,不允许创建退库单");
 			}
 		}
 		//旧的入库材料信息字典
@@ -356,16 +356,16 @@
 		//如果启用器械生命周期追溯管理,则不允许创建退库单
 		if(CssdUtils.getSystemSetConfigByNameBool("enableInstrumentLifeCycleTraceabilityManagement")){
 			if(materialEntry.typeOut()){
-				throw new SystemException("项目启用启用器械生命周期追溯管理功能,不允许创建退库单");
+				throw new SystemException("项目已启用器械生命周期追溯管理功能,不允许创建退库单");
 			}
 		}
 		LoginUserData loginUser = AcegiHelper.getLoginUser();
 		String orgUnitCode = loginUser.getOrgUnitCodingFromSupplyRoomConfig();
 		String orgUnitName = loginUser.getOrgUnitNameCodingFromSupplyRoomConfig();
 		saveMaterialEntry(materialEntry, items,accordingToSupplier,orgUnitCode,orgUnitName);
-		/*if(1==1){
-			throw new SystemException("test saveMaterialEntry ............");
-		}*/
+		if(1==1){
+//			throw new SystemException("test saveMaterialEntry ............");
+		}
 	}
 	
 	/**
@@ -381,7 +381,7 @@
 		//如果启用器械生命周期追溯管理,则不允许生成退库单
 		if(CssdUtils.getSystemSetConfigByNameBool("enableInstrumentLifeCycleTraceabilityManagement")){
 			if(materialEntry.typeOut()){
-				throw new SystemException("项目启用启用器械生命周期追溯管理功能,不允许生成退库单");
+				throw new SystemException("项目已启用器械生命周期追溯管理功能,不允许生成退库单");
 			}
 		}
 		if(materialEntry.getWareHouseId() == null){
@@ -834,7 +834,7 @@
 	public void saveAppropriateEntry_TRANS_REQUIRED(MaterialEntry entry){
 		//如果启用器械生命周期追溯管理,则不允许创建调拨单
 		if(CssdUtils.getSystemSetConfigByNameBool("enableInstrumentLifeCycleTraceabilityManagement")){
-			throw new SystemException("项目启用启用器械生命周期追溯管理功能,不允许创建调拨单");
+			throw new SystemException("项目已启用器械生命周期追溯管理功能,不允许创建调拨单");
 		}
 		if(entry != null){
 			entry.setId(null);