Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r25590 -r25592
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 25590)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 25592)
@@ -27,9 +27,7 @@
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.hibernate.Transaction;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.context.ContextLoader;
 
 import com.forgon.Constants;
 import com.forgon.attachfile.service.AttachFileManager;
@@ -85,7 +83,6 @@
 import com.forgon.disinfectsystem.exception.ImportDataException;
 import com.forgon.disinfectsystem.expirationdateinfo.service.ExpirationDateInfoManager;
 import com.forgon.disinfectsystem.labeltemplate.service.LabelTemplateManager;
-import com.forgon.disinfectsystem.maintain.device.service.DeviceDataManager;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
@@ -2634,6 +2631,9 @@
 				if (StringUtils.isNotBlank(specification)) {
 					diposableGoods.setSpecification(specification);
 				}
+				//一次性物品固定条码
+				String barcode = barcodeManager.getNewBarcodeByClass(DisposableGoods.class);
+				diposableGoods.setBarcode(barcode);
 			}
 
 			diposableGoods.setIsApplicationMaterial(isApplicationMaterial);
@@ -2657,8 +2657,6 @@
 			diposableGoods.setCategoryCode(categoryCode);
 			diposableGoods.setMaxApplyAmount(maxApplyAmount);
 			diposableGoods.setMinApplyAmount(minApplyAmount);
-			String barcode = barcodeManager.getNewBarcodeByClass(DisposableGoods.class);
-			diposableGoods.setBarcode(barcode);//一次性物品固定条码
 			totalCount = saveOrUpdateAndClearCache(totalCount, diposableGoods);
 			successCount++;