Index: forgon-core/src/main/java/com/forgon/log/model/Log.java =================================================================== diff -u -r26796 -r27697 --- forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 26796) +++ forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 27697) @@ -40,6 +40,7 @@ public static final String MODEL_RECYCLINGRECORD = "回收模块"; public static final String MODEL_WASH = "清洗模块"; public static final String MODEL_PACKING = "装配模块"; + public static final String MODEL_CUSTOMISE_PACKING = "自定义装配模块"; public static final String MODEL_REVIEW = "审核模块"; public static final String MODEL_STERILELOADING = "灭菌装载模块"; public static final String MODEL_STERILIZATION = "灭菌模块"; @@ -49,6 +50,7 @@ public static final String MODEL_USERECORD = "使用记录模块"; public static final String MODEL_BASEDATA = "基础数据"; public static final String MODEL_INTERFERE = "干预模块"; + public static final String MODEL_STERILIZATION_INTERFERE = "灭菌干预"; public static final String MODEL_DISPOSABLEGOODS_WRITEBACK = "一次性物品回写"; public static final String MODEL_DISPOSABLEGOODS = "一次性物品"; public static final String MODEL_INVENTORYSYCN = "物资同步"; Index: ssts-web/src/main/webapp/log/loggrid.jsp =================================================================== diff -u -r23113 -r27697 --- ssts-web/src/main/webapp/log/loggrid.jsp (.../loggrid.jsp) (revision 23113) +++ ssts-web/src/main/webapp/log/loggrid.jsp (.../loggrid.jsp) (revision 27697) @@ -28,6 +28,7 @@ ,['<%=Log.MODEL_RECYCLINGRECORD %>'] ,['<%=Log.MODEL_WASH %>'] ,['<%=Log.MODEL_PACKING %>'] + ,['<%=Log.MODEL_CUSTOMISE_PACKING %>'] ,['<%=Log.MODEL_REVIEW %>'] ,['<%=Log.MODEL_STERILELOADING %>'] ,['<%=Log.MODEL_DISPOSABLEGOODS %>'] @@ -37,6 +38,7 @@ ,['<%=Log.MODEL_USERECORD %>'] ,['<%=Log.MODEL_BASEDATA %>'] ,['<%=Log.MODEL_INTERFERE %>'] +,['<%=Log.MODEL_STERILIZATION_INTERFERE %>'] ,['<%=Log.MODEL_INVENTORYSYCN %>'] ,['<%=Log.MODEL_DISPOSABLEGOODS_WRITEBACK %>'] ,['<%=Log.MODEL_TOUSSEDEFINITION %>']