Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp =================================================================== diff -u -r29513 -r30411 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 30411) @@ -8,6 +8,7 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance,com.forgon.disinfectsystem.entity.useRecord.UseRecord" %> <%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface"%> <% String userName = AcegiHelper.getLoginUser().getUserFullName(); String currentOrgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName(); @@ -89,6 +90,11 @@ Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp =================================================================== diff -u -r29513 -r30411 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp (.../tousseGoodsWarningView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp (.../tousseGoodsWarningView.jsp) (revision 30411) @@ -7,6 +7,7 @@ <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%> <%@ include file="/common/taglibs.jsp"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface"%> @@ -79,6 +80,11 @@ var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>'; var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>'; +var changLong = '<%= DeviceInterface.CHANGLONG %>'; +var marge = '<%= DeviceInterface.MARGE %>'; +var xinHua = '<%= DeviceInterface.XINHUA %>'; +var GETINGE = '<%= DeviceInterface.GETINGE %>'; +var GETING_86_SERIES = '<%= DeviceInterface.GETING_86_SERIES %>';