上下架读取商品名称

src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java

@@ -42,6 +42,15 @@ public class AuthInterceptor implements HandlerInterceptor {
 	private static final Logger logger = Logger.getLogger(AuthInterceptor.class);
 	private SystemService systemService;
 	private List<String> excludeUrls;
+	private List<String> excludeContainUrls;
+
+	public List<String> getExcludeContainUrls() {
+		return excludeContainUrls;
+	}
+
+	public void setExcludeContainUrls(List<String> excludeContainUrls) {
+		this.excludeContainUrls = excludeContainUrls;
+	}
 
 	public List<String> getExcludeUrls() {
 		return excludeUrls;
@@ -84,7 +93,9 @@ public class AuthInterceptor implements HandlerInterceptor {
 
 		if (excludeUrls.contains(requestPath)) {
 			return true;
-		} else {
+		}else if(moHuContain(excludeContainUrls, requestPath)) {
+			return true;
+		}else {
 			//步骤二： 权限控制，优先重组请求URL(考虑online请求前缀一致问题)
 			String clickFunctionId = request.getParameter("clickFunctionId");
 			Client client = ClientManager.getInstance().getClient(ContextHolderUtils.getSession().getId());
@@ -206,6 +217,16 @@ public class AuthInterceptor implements HandlerInterceptor {
 		}
 	}
 
+
+	private boolean moHuContain(List<String> list,String key){
+		for(String str : list){
+			if(key.contains(str)){
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * 判断用户是否有菜单访问权限
 	 * @param requestPath

src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java

@@ -77,6 +77,9 @@ public class BaseTag extends TagSupport {
 			
 			//插入多语言脚本
 			String lang = (String)((HttpServletRequest) this.pageContext.getRequest()).getSession().getAttribute("lang");
+			if(StringUtil.isEmpty(lang)){
+				lang="zh-cn";
+			}
 			String langjs = StringUtil.replace("<script type=\"text/javascript\" src=\"plug-in/mutiLang/{0}.js\"></script>", "{0}", lang);
 			sb.append(langjs);
 

src/main/java/org/jeecgframework/tag/core/easyui/FormValidationTag.java

@@ -134,6 +134,9 @@ public class FormValidationTag extends TagSupport {
 		JspWriter out = null;
 		try {
 			String lang = (String)((HttpServletRequest) this.pageContext.getRequest()).getSession().getAttribute("lang");
+			if(StringUtil.isEmpty(lang)){
+				lang="zh-cn";
+			}
 			SysThemesEnum sysThemesEnum = null;
 			if(StringUtil.isEmpty(cssTheme)||"null".equals(cssTheme)){
 				sysThemesEnum = SysThemesUtil.getSysTheme((HttpServletRequest) super.pageContext.getRequest());

src/main/resources/spring-mvc.xml

@@ -128,12 +128,19 @@
 						<value>rest/wmBaseController/showOrDownqrcodeByurl</value>
 						<!-- 菜单样式图标预览 -->
 						<value>webpage/common/functionIconStyleList.jsp</value>
-
-						<value>wmOmNoticeHController.do?showlist</value>
-						<value>wmOmNoticeHController.do?showgoods</value>
+						<value>wmOmNoticeHController.do</value>
+						<value>wmOmNoticeHController.do</value>
 
 					</list>
 				</property>
+				<property name="excludeContainUrls">
+					<list>
+
+						<value>wmOmNoticeHController.do</value>
+					</list>
+				</property>
+
+
 			</bean>
 		</mvc:interceptor>
 	</mvc:interceptors>

src/main/resources/sysConfig.properties

@@ -204,8 +204,8 @@ wm.ckd=hr
 wm.rkd=hr
 
 
-show.noticeurl=http://localhost:8081/zzjee/wmOmNoticeHController.do?showlist?noticeid=
-show.goodsurl=http://localhost:8081/zzjee/wmOmNoticeHController.do?showgoods?
+show.noticeurl=http://localhost:8081/zzjee/wmOmNoticeHController.do?showlist&id=
+show.goodsurl=http://localhost:8081/zzjee/wmOmNoticeHController.do?showgoods&
 
 
 

src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp

@@ -6,6 +6,8 @@
 <title>拣货任务打印</title>
 <t:base type="jquery,easyui,tools"></t:base>
 <script type="text/javascript" charset="utf-8" src="webpage/com/zzjee/wmjs/jquery.jqprint.js"></script>
+<script type="text/javascript"  charset="utf-8" src="webpage/com/zzjee/wmjs/qrcode.min.js"></script>
+
 <script language="javascript">
 function printall(){
 
@@ -15,7 +17,44 @@ function printall(){
 function printview(){
 	document.all.WebBrowser1.ExecWB(7,1);
 }
+function make2DCode() {
+    $("#qrcode").html("");//清空二维码
+    var qrcode;
+    var codesize = 80;
+    console.log(codesize);
+    qrcode = new QRCode(document.getElementById("qrcode"), {
+        width : codesize,
+        height : codesize
+    });
+    qrcode.makeCode(document.getElementById("showlisturl").value);
+};
+// window.onload=function(){
+//     make2DCode();
+//     smalltoBIG('jinexx','jinedx');
+// };
 
+document.onreadystatechange = function () {
+    if (document.readyState == "complete") {
+        console.log("content");
+        make2DCode();
+    }
+}
+function downloadqrcode() {
+    // 获取base64的图片节点
+    var img = document.getElementById('qrcode').getElementsByTagName('img')[0];
+    // 构建画布
+    var canvas = document.createElement('canvas');
+    canvas.width = img.width;
+    canvas.height = img.height;
+    canvas.getContext('2d').drawImage(img, 0, 0);
+    // 构造url
+    url = canvas.toDataURL('image/png');
+    // 构造a标签并模拟点击
+    var downloadLink = document.getElementById('downloadLink');
+    downloadLink.setAttribute('href', url);
+    downloadLink.setAttribute('download', '二维码.png');
+    downloadLink.click();
+};
 
 </script>
 	<style>
@@ -102,6 +141,7 @@ function printview(){
 
 <div class="printdiv"><t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table"  >
 	<input id="content" type="hidden" value="${wmOmNoticeHPage.omNoticeId}">
+	<input id="showlisturl" type="hidden" value="${showlisturl}">
 	<table border=0 cellpadding=0 cellspacing=0 width=780 style='border-collapse:
  collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
 		<col width=102 style='mso-width-source:userset;mso-width-alt:3612;width:76pt'>
@@ -131,7 +171,9 @@ function printview(){
 				<%--<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmOmNoticeHPage.omNoticeId}" style="width:80px;height:80px;vertical-align:right">--%>
 			<%--</td>--%>
 				<td  rowspan="2" class=xl69>
-				<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${showlisturl}" style="width:80px;height:80px;vertical-align:right">
+
+					<div id="qrcode" style="width:80px; height:80px;margin-top: 10px;margin-left: -10px"></div>
+				<%--<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${showlisturl}" style="width:80px;height:80px;vertical-align:right">--%>
 				</td>
 		</tr>
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>

src/main/webapp/webpage/com/zzjee/wm/print/zhuisu-print.jsp

@@ -3,7 +3,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>拣货任务打印</title>
+<title>追溯页面</title>
 <t:base type="jquery,easyui,tools"></t:base>
 <script type="text/javascript" charset="utf-8" src="webpage/com/zzjee/wmjs/jquery.jqprint.js"></script>
 <script language="javascript">