Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r26183 -r26201
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 26183)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 26201)
@@ -90,6 +90,8 @@
 
 	private Integer disposableGoodsExpTime;// 一次性物品有效期(天数)
 	
+	private Integer disposableGoodsWarningDate;// 一次性物品的预警期（天数）
+	
 	/**
 	 * 供应商注册证预警期天数
 	 */
@@ -495,6 +497,7 @@
 		supplyRoomConfig.setBarcodePaperType(barcodePaperType);
 		supplyRoomConfig.setDayStartTime(dayStartTime);
 		supplyRoomConfig.setDisposableGoodsExpTime(disposableGoodsExpTime);
+		supplyRoomConfig.setDisposableGoodsWarningDate(disposableGoodsWarningDate);
 		supplyRoomConfig.setCustomToussePrice(customToussePrice);
 		supplyRoomConfig.setForeignToussePrice(foreignToussePrice);
 		supplyRoomConfig.setIdCardPrice(idCardPrice);
@@ -781,6 +784,7 @@
 		supplyRoomConfig.setExpensiveGoodsPaperType(expensiveGoodsPaperType);
 		supplyRoomConfig.setDayStartTime(dayStartTime);
 		supplyRoomConfig.setDisposableGoodsExpTime(disposableGoodsExpTime);
+		supplyRoomConfig.setDisposableGoodsWarningDate(disposableGoodsWarningDate);
 		supplyRoomConfig.setfTHandleDepartAndTaskGroup(fTHandleDepartAndTaskGroup);
 //		supplyRoomConfig.setDefalutTaskGroup(defalutTaskGroup);
 		supplyRoomConfig.setCustomToussePrice(customToussePrice);
@@ -1734,6 +1738,10 @@
 		this.disposableGoodsExpTime = disposableGoodsExpTime;
 	}
 
+	public void setDisposableGoodsWarningDate(Integer disposableGoodsWarningDate) {
+		this.disposableGoodsWarningDate = disposableGoodsWarningDate;
+	}
+
 	public String getCustomTousseDefaultTaskGroup() {
 		return customTousseDefaultTaskGroup;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r26183 -r26201
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 26183)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 26201)
@@ -77,6 +77,8 @@
 	private String dayStartTime; // 一天的开始时间
 
 	private Integer disposableGoodsExpTime;// 一次性物品有效期(天数)
+	
+	private Integer disposableGoodsWarningDate;// 一次性物品的预警期（天数）
 
 	private Integer supplyRoomType; // 供应室类型
 
@@ -388,6 +390,14 @@
 		this.disposableGoodsExpTime = disposableGoodsExpTime;
 	}
 
+	public Integer getDisposableGoodsWarningDate() {
+		return disposableGoodsWarningDate;
+	}
+
+	public void setDisposableGoodsWarningDate(Integer disposableGoodsWarningDate) {
+		this.disposableGoodsWarningDate = disposableGoodsWarningDate;
+	}
+
 	public String getCustomTousseDefaultTaskGroup() {
 		return customTousseDefaultTaskGroup;
 	}