Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r29948 -r29951
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 29948)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 29951)
@@ -98,6 +98,7 @@
 import com.forgon.exception.SterilingModeNotTheSameException;
 import com.forgon.exception.SystemException;
 import com.forgon.exception.service.ExceptionHandler;
+import com.forgon.keyvalue.model.KeyValue;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
 import com.forgon.runwithtrans.model.RunWithTransNewTask;
@@ -1528,6 +1529,12 @@
             Long originalSterilizationRecordId,
             Map<String,String> barcodePositionMap, JSONArray delTousseJsonArr,
             Map<TousseDefinition, Integer> subTdAmountMap) {
+    	try {
+    		KeyValue keyValue = (KeyValue) objectDao.getByProperty_ForUpdate(KeyValue.class.getSimpleName(), "key", "software.dataVersion");
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new SystemException("其他灭菌记录正在保存中，请稍候再保存！");
+		}
         Map<String , Object> result = new HashMap<String, Object>();
         String status = sterilizationRecord.getStatus();
         //注意：如果灭菌状态不是“空”或者“灭菌中”或者“暂存”，不给保存，防止不规范的操作。
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r29948 -r29951
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 29948)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 29951)
@@ -593,7 +593,7 @@
                 sterilizationRecord.setReviewedBasketAmount(reviewedBasketList.size());  //计算此灭菌记录的灭菌篮筐总数
                 
                 //只要状态不等于“灭菌完成”的都去获取条码
-			    if(!StringUtils.equals(sterilizationRecord.getStatus() , SterilizationRecord.STERILIZATION_STATUS_END)){
+			    if(!StringUtils.equals(sterilizationRecord.getStatus() , SterilizationRecord.STERILIZATION_STATUS_END) || loadUnTraceableBarcode){
 		             //汇总后的数据，不显示唯一条码，所以在这里要提前拿到并给到前台
 	                /*List<TousseInstance> tousseInsList = sterilizationRecord.getTousseInstanceList();//器械包集合
 	                 for (TousseInstance ti : tousseInsList) {
@@ -608,9 +608,7 @@
 	                        } 
 	                     }
 	                }*/
-			    	if(loadUnTraceableBarcode){
-			    		sterilizationRecordManager.fillBarcodeToListFromSterilizationRecordWithoutReviewedBasket(sterilizationRecord, barcodes, fixedBarcodes);
-			    	}
+			    	sterilizationRecordManager.fillBarcodeToListFromSterilizationRecordWithoutReviewedBasket(sterilizationRecord, barcodes, fixedBarcodes);
 			    }
 			}
 			sterilizationRecord.setIncludeImplant(objectDao);