Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
===================================================================
diff -u -r12711 -r12732
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java	(.../WareHouseManagerImpl.java)	(revision 12711)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java	(.../WareHouseManagerImpl.java)	(revision 12732)
@@ -12,6 +12,8 @@
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
+import com.forgon.serialnumber.model.SerialNum;
+import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.tools.hibernate.ObjectDao;
 
 /**
@@ -23,6 +25,8 @@
 	
 	private ObjectDao objectDao;
 	private OrgUnitManager orgUnitManager;
+	
+	private SerialNumManager serialNumManager;
 	public void setObjectDao(ObjectDao objectDao) {
 		this.objectDao = objectDao;
 	}
@@ -31,6 +35,10 @@
 		this.orgUnitManager = orgUnitManager;
 	}
 
+	public void setSerialNumManager(SerialNumManager serialNumManager) {
+		this.serialNumManager = serialNumManager;
+	}
+
 	/**
 	 * 查询所有的仓库
 	 * @return
@@ -105,6 +113,12 @@
 			wareHouse.setCreatedUserName(userData.getUserName());
 		}
 		wareHouse.setCreateTime(new Date());
+		//设置条码
+		String barcode = wareHouse.getBarcode();
+		if(StringUtils.isBlank(wareHouse.getBarcode())){
+			barcode = serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE);
+			wareHouse.setBarcode(barcode);
+		}
 		objectDao.saveOrUpdate(wareHouse);
 		return wareHouse;
 	}