Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r29749 -r29750
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 29749)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 29750)
@@ -10,6 +10,8 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
<%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%>
<%@page import="com.forgon.disinfectsystem.common.Constants"%>
+<%@page import="com.forgon.disinfectsystem.labeltemplate.service.*"%>
+<%@page import="com.forgon.disinfectsystem.entity.labeltemplate.*"%>
<%@page import="java.util.Date"%>
<%@page import="java.text.SimpleDateFormat"%>
<%@page import="java.util.List"%>
@@ -48,6 +50,7 @@
request.setAttribute("projectName", projectName);
request.setAttribute("fontSize",(loginUser == null || loginUser.getFontSize() == null) ? "12" : loginUser.getFontSize());
request.setAttribute("getPrintUserFullName",supplyRoomConfigManager.getSystemParamsObj().isPrintUserFullName());
+ request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
%>
@@ -414,7 +417,7 @@
var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>';
var IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>';
var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT%>';
-
+var PRINT_TEMPLATE_NAME_PREFIX = '${TEMPLATE_NAME_PREFIX}';
var inspector = "";
var operator = "";
var reviewer = "";
@@ -489,7 +492,6 @@
<%@ include file="/disinfectsystem/print/print.jsp"%>