Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp =================================================================== diff -u -r13013 -r13435 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp (.../disposableGoodsStockView.jsp) (revision 13013) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp (.../disposableGoodsStockView.jsp) (revision 13435) @@ -1,6 +1,6 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> -<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods"%> +<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods,com.forgon.Constants"%> @@ -27,8 +27,8 @@ var CONSTANT_YES = '<%=DisposableGoods.CONSTANT_YES %>';//能 var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否 - var SUPPLYROOMGOODS_YES = '<%=DisposableGoods.SUPPLYROOMGOODS_YES %>';//能 - var SUPPLYROOMGOODS_NO = '<%=DisposableGoods.SUPPLYROOMGOODS_NO %>';//否 + var SUPPLYROOMGOODS_YES = '<%=Constants.STR_YES %>';//能 + var SUPPLYROOMGOODS_NO = '<%=Constants.STR_NO %>';//否 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java =================================================================== diff -u -r12722 -r13435 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java (.../DisposableGoodsStock.java) (revision 12722) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java (.../DisposableGoodsStock.java) (revision 13435) @@ -20,6 +20,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.forgon.Constants; /** * 一次性物品库存 @@ -34,8 +35,8 @@ public final static String CONSTANT_YES = "能"; public final static String CONSTANT_NO = "否"; - public final static String SUPPLYROOMGOODS_YES = "是"; - public final static String SUPPLYROOMGOODS_NO = "否"; + //public final static String SUPPLYROOMGOODS_YES = "是"; + //public final static String SUPPLYROOMGOODS_NO = "否"; public final static String TYPE_NAME = "一次性物品"; @@ -55,7 +56,7 @@ private String isApplicationMaterial = CONSTANT_YES; //能否被科室申请 - private String isSupplyRoomGoods = SUPPLYROOMGOODS_NO; //供应室物品 + private String isSupplyRoomGoods = Constants.STR_NO;; //供应室物品 private String spelling; //拼音简称 @@ -288,14 +289,14 @@ public String getIsSupplyRoomGoods() { if(isSupplyRoomGoods == null || "".equals(isSupplyRoomGoods)){ - isSupplyRoomGoods = SUPPLYROOMGOODS_NO; + isSupplyRoomGoods = Constants.STR_NO;; } return isSupplyRoomGoods; } public void setIsSupplyRoomGoods(String isSupplyRoomGoods) { if(isSupplyRoomGoods == null || "".equals(isSupplyRoomGoods)){ - isSupplyRoomGoods = SUPPLYROOMGOODS_NO; + isSupplyRoomGoods = Constants.STR_NO;; } this.isSupplyRoomGoods = isSupplyRoomGoods; } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp =================================================================== diff -u -r13013 -r13435 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp (.../diposableGoodsView.jsp) (revision 13013) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp (.../diposableGoodsView.jsp) (revision 13435) @@ -1,6 +1,6 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> -<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods"%> +<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods,com.forgon.Constants"%> @@ -27,8 +27,8 @@ var CONSTANT_YES = '<%=DisposableGoods.CONSTANT_YES %>';//能 var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否 - var SUPPLYROOMGOODS_YES = '<%=DisposableGoods.SUPPLYROOMGOODS_YES %>';//能 - var SUPPLYROOMGOODS_NO = '<%=DisposableGoods.SUPPLYROOMGOODS_NO %>';//否 + var SUPPLYROOMGOODS_YES = '<%=Constants.STR_YES %>';//能 + var SUPPLYROOMGOODS_NO = '<%=Constants.STR_NO %>';//否 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r13206 -r13435 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 13206) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 13435) @@ -17,6 +17,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.forgon.Constants; /** * 一次性物品定义 @@ -31,8 +32,8 @@ public final static String CONSTANT_YES = "能"; public final static String CONSTANT_NO = "否"; - public final static String SUPPLYROOMGOODS_YES = "是"; - public final static String SUPPLYROOMGOODS_NO = "否"; + //public final static String SUPPLYROOMGOODS_YES = "是"; + //public final static String SUPPLYROOMGOODS_NO = "否"; public final static String TYPE_NAME = "一次性物品"; @@ -52,7 +53,7 @@ private String isApplicationMaterial = CONSTANT_YES; //能否被科室申请 - private String isSupplyRoomGoods = SUPPLYROOMGOODS_NO; //供应室物品 + private String isSupplyRoomGoods = Constants.STR_YES; //供应室物品 private String spelling; //拼音简称 @@ -293,14 +294,14 @@ public String getIsSupplyRoomGoods() { if(isSupplyRoomGoods == null || "".equals(isSupplyRoomGoods)){ - isSupplyRoomGoods = SUPPLYROOMGOODS_NO; + isSupplyRoomGoods = Constants.STR_NO; } return isSupplyRoomGoods; } public void setIsSupplyRoomGoods(String isSupplyRoomGoods) { if(isSupplyRoomGoods == null || "".equals(isSupplyRoomGoods)){ - isSupplyRoomGoods = SUPPLYROOMGOODS_NO; + isSupplyRoomGoods = Constants.STR_NO; } this.isSupplyRoomGoods = isSupplyRoomGoods; }