From 80f64d025e25cdba8a33a1badf2109c80d0bafe7 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 27 五月 2025 08:10:17 +0800
Subject: [PATCH] 测试更新
---
河北望美项目/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java | 14
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/reportform/cutmanagerepoortform1.jsp | 3
河北望美项目/MES_11/src/main/webapp/WEB-INF/web.xml | 2
河北望美项目/MES_11/target/maven-archiver/pom.properties | 2
河北望美项目/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java | 349 ++++++--
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp | 161 ++--
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp | 16
河北望美项目/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java | 121 ++
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/Edg_Statistics.jsp | 66 +
河北望美项目/MES_11/target/classes/application.properties | 2
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskBufferDao.java | 6
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp | 47 +
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties | 2
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DT_dapingxianshi.jsp | 5
河北望美项目/MES_11/src/main/resources/application.properties | 2
河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java | 15
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp | 2
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp | 8
河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 368 ++++----
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/countmachine/countmachinerack.jsp | 4
河北望美项目/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF | 2
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/reportform/shelfreportform.jsp | 3
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml | 2
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/public_manage.jsp | 42 +
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/countmachine/countmachinerack.jsp | 4
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/shelfmanager/shelftask.jsp | 161 ++--
河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst | 12
河北望美项目/MES_11/src/main/webapp/WEB-INF/layouts/left.jsp | 37
河北望美项目/MES_11/.project | 2
河北望美项目/MES_11/src/main/java/com/northglass/service/device/DeviceService.java | 2
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/cutmanagerepoortform1.jsp | 3
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_yuanpiankucun.jsp | 5
河北望美项目/MES_11/.settings/org.eclipse.wst.common.component | 6
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java | 4
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp | 16
河北望美项目/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties | 6
河北望美项目/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java | 826 +++++++++++---------
河北望美项目/MES_11/src/main/java/com/northglass/repository/RawFileDao.java | 3
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/shelfreportform.jsp | 3
39 files changed, 1,456 insertions(+), 878 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project"
index 2b89172..03496a6 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>MES_11</name>
+ <name>WmMES</name>
<comment></comment>
<projects>
</projects>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component"
index 95b47f1..ab85045 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component"
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="gmms2">
+ <wb-module deploy-name="WmMES">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <property name="context-root" value="gmms2"/>
- <property name="java-output-path" value="/gmms2/target/classes"/>
+ <property name="java-output-path" value="/WmMES/target/classes"/>
+ <property name="context-root" value="WmMES"/>
</wb-module>
</project-modules>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskBufferDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskBufferDao.java"
index de84b32..8593d47 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskBufferDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskBufferDao.java"
@@ -1,10 +1,12 @@
package com.northglass.repository;
import java.util.List;
+import java.util.Map;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
+import com.northglass.entity.GalssTaskDetails;
import com.northglass.entity.PatternTask;
import com.northglass.entity.PatternTaskBuffer;
@@ -18,4 +20,8 @@
@Query("select count(t) from PatternTaskBuffer t where t.engineeringId = ?1 ")
public int findbypattertaskcount(String fileName);
+
+
+ @Query(nativeQuery=true,value="select raw_width,raw_height,raw_thickness,color,count(*) as shuliang,rank from gmms_pattern_task_buffer t where t.engineering_id =?1 group by raw_width,raw_height,raw_thickness,color")
+ public List<Object[]> findIdGroupBy(String fileName);
}
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
index 1f7d4f1..9384d64 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
@@ -31,6 +31,10 @@
public List<PatternTask> findbygroups(Long groups);
+ @Query("select t from PatternTask t where t.workState='宸插畬鎴�' and t.groups=?1 and t.rawFile.id=?2")
+ public List<PatternTask> findbygroups2(Long groups,Long id);
+
+
@Query("select t from PatternTask t where t.groups=?1")
public List<PatternTask> findIdGroup(Long groups);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/RawFileDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/RawFileDao.java"
index 8b4ef2c..dcdf3fc 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/RawFileDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/RawFileDao.java"
@@ -27,6 +27,9 @@
@Query("select t from RawFile t where t.state = '宸查鍙�' and t.operator=?1")
public RawFile findIdGroup(Long operator);
+ @Query("select t from RawFile t where t.state = '姝ｅ湪鍒囧壊' and t.operator=?1")
+ public RawFile findIdGroup1(Long operator);
+
//鎵惧埌瀵瑰簲浜х嚎鐨勭姸鎬佷负宸查鍙栫殑瀵硅薄
@Query("select t from RawFile t where (t.state = '宸蹭笅鍙�' or t.state = '涓柇') and (t.operator=?1 or t.operator=0)")
public List<RawFile> findTasks(Long operator);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java"
index 07f9d78..fb16fc5 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java"
@@ -20,7 +20,9 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.sql.*;
@@ -38,6 +40,7 @@
import org.springframework.ui.Model;
import org.springframework.web.servlet.ModelAndView;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.northglass.Globel.mes;
import com.northglass.SqlHelper.DBSession;
import com.northglass.applicationListener.InitializeSystemApplicationListener;
@@ -90,6 +93,7 @@
import com.northglass.service.message.MessageProcessor;
import antlr.collections.impl.LList;
+import java.lang.reflect.Field;
@@ -207,29 +211,54 @@
return "cutmanage/gettask";
} else {
- model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(prodLine)));
- model.addAttribute("pattertaskHtml2", getpattertaskHtml2(Long.valueOf(prodLine)));
- model.addAttribute("rawPackageslistname",getrawPackageslistname(prodLine));
- model.addAttribute("groups", prodLine);
- int st=-1;
- try(DBSession sn=mes.getMesDBHelper().createSession(false)){
- sn.createSql("SELECT able FROM gmms_device_state where line=? and device_name='涓婄墖鏈�'");
- //System.out.println(prodLine);
- ResultSet r= sn.query(prodLine).getCurrentResult();
- if(r.next()){
- boolean b=r.getBoolean(1);
- //System.out.println(b);
- st=b?1:0;
+ if(prodLine.equals("4")){
+ model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(prodLine)));
+ model.addAttribute("pattertaskHtml2", getpattertaskHtml4(Long.valueOf(prodLine)));
+ model.addAttribute("rawPackageslistname",getrawPackageslistname(prodLine));
+ model.addAttribute("groups", prodLine);
+ int st=-1;
+ try(DBSession sn=mes.getMesDBHelper().createSession(false)){
+ sn.createSql("SELECT able FROM gmms_device_state where line=? and device_name='涓婄墖鏈�'");
+ //System.out.println(prodLine);
+ ResultSet r= sn.query(prodLine).getCurrentResult();
+ if(r.next()){
+ boolean b=r.getBoolean(1);
+ //System.out.println(b);
+ st=b?1:0;
+ }
}
- }
- catch(SQLException e){
-
- }
- model.addAttribute("able",st);
- return "cutmanage/gotasks";
+ catch(SQLException e){
+
+ }
+ model.addAttribute("able",st);
+ return "cutmanage/gotasks2";
+ }else{
+ model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(prodLine)));
+ model.addAttribute("pattertaskHtml2", getpattertaskHtml2(Long.valueOf(prodLine)));
+ model.addAttribute("rawPackageslistname",getrawPackageslistname(prodLine));
+ model.addAttribute("groups", prodLine);
+ int st=-1;
+ try(DBSession sn=mes.getMesDBHelper().createSession(false)){
+ sn.createSql("SELECT able FROM gmms_device_state where line=? and device_name='涓婄墖鏈�'");
+ //System.out.println(prodLine);
+ ResultSet r= sn.query(prodLine).getCurrentResult();
+ if(r.next()){
+ boolean b=r.getBoolean(1);
+ //System.out.println(b);
+ st=b?1:0;
+ }
+ }
+ catch(SQLException e){
+
+ }
+ model.addAttribute("able",st);
+ return "cutmanage/gotasks";
+ }
+
}
}
+
public String getTasks(String prodLine, Model model) {
@@ -291,7 +320,7 @@
}
static int glasstask_lock=0;
- public String getTaskInterface(HttpServletRequest request, HttpServletResponse response, Long id,Long line, Model model) {
+ public String getTaskInterface(HttpServletRequest request, HttpServletResponse response, Long id,Long line, Model model) {
if(glasstask_lock!=0){
return "cutmanage/gettask";
@@ -299,44 +328,83 @@
try(Connection conn=DeviceService.getConnection()){
glasstask_lock=1;
- CallableStatement c=conn.prepareCall("{call GalssTask(?,?,?)}");
- c.setLong(1,id);
- c.setLong(2, line);
- c.registerOutParameter(3, java.sql.Types.INTEGER);
- c.execute();
- int ret= c.getInt(3);
- c.close();
-
- //conn.close();
+ if(line==4){
+ LOGGER.debug(""+line);
+ conn.prepareCall("{call GalssTask4(?,?,?)}");
+ CallableStatement c=conn.prepareCall("{call GalssTask4(?,?,?)}");
+ c.setLong(1,id);
+ c.setLong(2, line);
+ c.registerOutParameter(3, java.sql.Types.INTEGER);
+ c.execute();
+ int ret= c.getInt(3);
+ c.close();
+
+// CallableStatement c=conn.prepareCall("{call GalssTask(?,?,?)}");
+// c.setLong(1,id);
+// c.setLong(2, line);
+// c.registerOutParameter(3, java.sql.Types.INTEGER);
+// c.execute();
+// int ret= c.getInt(3);
+// c.close();
+// System.out.println(ret);
+ if(ret==100){
+ model.addAttribute("message",100);
+ model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(line)));
+ model.addAttribute("pattertaskHtml2", getpattertaskHtml4(Long.valueOf(line)));
+ model.addAttribute("groups", line);
+
+ }
+ return "cutmanage/gotasks2";
+
+
+ }else{
+ CallableStatement c=conn.prepareCall("{call GalssTask(?,?,?)}");
+ c.setLong(1,id);
+ c.setLong(2, line);
+ c.registerOutParameter(3, java.sql.Types.INTEGER);
+ c.execute();
+ int ret= c.getInt(3);
+ c.close();
+
+ //conn.close();
- LOGGER.debug(""+ret);
- if(ret==100){
- RawFile rawFile=rawFileDao.findOne(id);
- rawFile.setState("宸查鍙�");
- rawFile.setOperator(line);
- rawFile.setCreateTime(new Date());
- rawFileDao.save(rawFile);
-
-
- List<PatternTask> patternTasklist=patternTaskDao.findbygroup(id);
- for (PatternTask patternTask : patternTasklist) {
- patternTask.setGroups(line);
- patternTaskDao.save(patternTask);
+ LOGGER.debug(""+ret);
+ if(ret==100){
+ RawFile rawFile=rawFileDao.findOne(id);
+ /*rawFile.setState("宸查鍙�");
+ rawFile.setOperator(line);
+ rawFile.setCreateTime(new Date());
+ rawFileDao.save(rawFile);
+
+
+ List<PatternTask> patternTasklist=patternTaskDao.findbygroup(id);
+ for (PatternTask patternTask : patternTasklist) {
+ patternTask.setGroups(line);
+ patternTaskDao.save(patternTask);
+ }*/
+
+ List<GalssTask> galssTasklist=galssTaskDao.findbyengineering(rawFile.getFileName());
+ for (GalssTask galssTask : galssTasklist) {
+ galssTask.setStartTime(new Date());
+ galssTaskDao.save(galssTask);
+ }
+ }
+
+ model.addAttribute("message",ret);
+ model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(line)));
+ model.addAttribute("pattertaskHtml2", getpattertaskHtml2(Long.valueOf(line)));
+ model.addAttribute("groups", line);
+ if(rawFileDao.findIdGroup1(line)==null){
+ model.addAttribute("state", 0);
+ }else{
+ model.addAttribute("state", 1);
+ }
+ return "cutmanage/gotasks";
}
- List<GalssTask> galssTasklist=galssTaskDao.findbyengineering(rawFile.getFileName());
- for (GalssTask galssTask : galssTasklist) {
- galssTask.setStartTime(new Date());
- galssTaskDao.save(galssTask);
- }
- }
- model.addAttribute("message",ret);
- model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(line)));
- model.addAttribute("pattertaskHtml2", getpattertaskHtml2(Long.valueOf(line)));
- model.addAttribute("groups", line);
//System.out.println(ret);
- return "cutmanage/gotasks";
+
} catch (SQLException e) {
e.printStackTrace();
return "cutmanage/gettask";
@@ -481,9 +549,12 @@
int lipiancount =galssTaskDao.finlipian(operator);
int slicecount;
+
if (operator==1) {
slicecount=horizontalDao.findfall2(operator);
//System.out.println(slicecount);
+ }else if(operator==4){
+ slicecount=0;
}else{
slicecount=slicecageDao.findfall2(operator);
}
@@ -493,16 +564,25 @@
Connection conn=DeviceService.getConnection();
try{
- CallableStatement c=conn.prepareCall("{call workmanship(?)}");
- c.setLong(1,operator);
- c.execute();
- c.close();
+ if(operator==4){
+ CallableStatement c=conn.prepareCall("{call GalssTaskStop4(?,?)}");
+ c.setLong(1,operator);
+ c.setLong(2,1);
+ c.execute();
+ c.close();
+ }else{
+ CallableStatement c=conn.prepareCall("{call workmanship(?)}");
+ c.setLong(1,operator);
+ c.execute();
+ c.close();
-
- rawFile.setState("宸插畬鎴�");
- rawFile.setReceiveTime(new Date());
- galssTaskDao.deleteGlassTask(rawFile.getFileName());
- patternTaskDao.deletepatternTask(rawFile.getId());
+ rawFile.setState("宸插畬鎴�");
+ rawFile.setReceiveTime(new Date());
+ rawFileDao.save(rawFile);
+ galssTaskDao.deleteGlassTask(rawFile.getFileName());
+ patternTaskDao.deletepatternTask(rawFile.getId());
+ }
+
return "redirect:cutmanage/gettasks";
} catch (SQLException e) {
e.printStackTrace();
@@ -524,6 +604,8 @@
if (operator==1) {
slicecount=horizontalDao.findfall2(operator);
//System.out.println(slicecount);
+ }else if(operator==4){
+ slicecount=0;
}else{
slicecount=slicecageDao.findfall2(operator);
}
@@ -533,17 +615,26 @@
Connection conn=DeviceService.getConnection();
try {
- CallableStatement c=conn.prepareCall("{call interrupttask(?,?)}");
- c.setString(1,rawFile.getFileName());
- c.setLong(2,operator);
- c.execute();
- c.close();
-
- rawFile.setState("涓柇");
- rawFile.setReceiveTime(new Date());
- galssTaskDao.deleteGlassTask(rawFile.getFileName());
- patternTaskDao.deletepatternTask(rawFile.getId());
- return "redirect:cutmanage/gettasks";
+ if(operator==4){
+ CallableStatement c=conn.prepareCall("{call GalssTaskStop4(?,?)}");
+ c.setLong(1,operator);
+ c.setLong(2,2);
+ c.execute();
+ c.close();
+ }else{
+ CallableStatement c=conn.prepareCall("{call interrupttask(?,?)}");
+ c.setString(1,rawFile.getFileName());
+ c.setLong(2,operator);
+ c.execute();
+ c.close();
+
+ rawFile.setState("涓柇");
+ rawFile.setReceiveTime(new Date());
+ galssTaskDao.deleteGlassTask(rawFile.getFileName());
+ patternTaskDao.deletepatternTask(rawFile.getId());
+
+ }
+ return "redirect:cutmanage/gettasks";
} catch (SQLException e) {
e.printStackTrace();
return "redirect:cutmanage/gettasks";
@@ -634,18 +725,18 @@
public String getpattertaskHtml(Long line) {
StringBuffer html = new StringBuffer();
RawFile rawFile =rawFileDao.findIdGroup(line);
- List<PatternTask> patternTasklist=patternTaskDao.findbygroups(line);
- double mianji=0;
- for(PatternTask patternTask :patternTasklist){
- List<GalssTask> galssTasklist =galssTaskDao.findpattern(patternTask.getId());
- for(GalssTask galssTask:galssTasklist){
- mianji=mianji+(Double.parseDouble(galssTask.getEdgWidth())*Double.parseDouble(galssTask.getEdgHeight()));
- }
- }
- //System.out.println(mianji);
- //int sum=shelfRackDao.findShelfRansum(width, heigth, thickness, color)
- BigDecimal bg=new BigDecimal(mianji);
+ RawFile rawFile1 =rawFileDao.findIdGroup1(line);
+
if (rawFile!=null){
+ List<PatternTask> patternTasklist=patternTaskDao.findbygroups2(line,rawFile.getId());
+ double mianji=0;
+ for(PatternTask patternTask :patternTasklist){
+ List<GalssTask> galssTasklist =galssTaskDao.findpattern(patternTask.getId());
+ for(GalssTask galssTask:galssTasklist){
+ mianji=mianji+(Double.parseDouble(galssTask.getEdgWidth())*Double.parseDouble(galssTask.getEdgHeight()));
+ }
+ }
+ BigDecimal bg=new BigDecimal(mianji);
//PatternTask patternTask =patternTaskDao.findbyword(rawFile.getId());
int count=patternTaskDao.findcount(rawFile.getId());
int sum=patternTaskDao.findsum(rawFile.getId());
@@ -658,14 +749,44 @@
html.append("<td>").append(count).append("</td>");
html.append("<td>").append(sum).append("</td>");
html.append("<td>").append(bg.toPlainString()).append("</td>");
- html.append("<td><button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='delecttask1(").append(rawFile.getOperator()).append(")'>涓柇浠诲姟</button>");
- html.append(" <button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='delecttask(").append(rawFile.getOperator()).append(")'>缁撴潫浠诲姟</button></td>");
+ html.append("<td>宸查鍙�</td>");
+ html.append("<td><button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='delecttask1(").append(rawFile.getOperator()).append(",").append(rawFile.getId()).append(")'>涓柇浠诲姟</button>");
+ html.append(" <button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='delecttask(").append(rawFile.getOperator()).append(",").append(rawFile.getId()).append(")'>缁撴潫浠诲姟</button></td>");
+ html.append("</tr>");
+ }
+ if(rawFile1!=null){
+ List<PatternTask> patternTasklist=patternTaskDao.findbygroups2(line,rawFile1.getId());
+ double mianji=0;
+ for(PatternTask patternTask :patternTasklist){
+ List<GalssTask> galssTasklist =galssTaskDao.findpattern(patternTask.getId());
+ for(GalssTask galssTask:galssTasklist){
+ mianji=mianji+(Double.parseDouble(galssTask.getEdgWidth())*Double.parseDouble(galssTask.getEdgHeight()));
+ }
+ }
+ //System.out.println(mianji);
+ //int sum=shelfRackDao.findShelfRansum(width, heigth, thickness, color)
+ BigDecimal bg=new BigDecimal(mianji);
+ int count=patternTaskDao.findcount(rawFile1.getId());
+ int sum=patternTaskDao.findsum(rawFile1.getId());
+ html.append("<tr>");
+ html.append("<td>").append(rawFile1.getFileName()).append("</td>");
+ /*html.append("<td>").append(patternTask.getRawWidth()).append("</td>");
+ html.append("<td>").append(patternTask.getRawHeight()).append("</td>");
+ html.append("<td>").append(patternTask.getRawThickness()).append("</td>");
+ html.append("<td>").append(patternTask.getColor()).append("</td>");*/
+ html.append("<td>").append(count).append("</td>");
+ html.append("<td>").append(sum).append("</td>");
+ html.append("<td>").append(bg.toPlainString()).append("</td>");
+ html.append("<td>姝ｅ湪鍒囧壊</td>");
+ html.append("<td>");
+ html.append(" <button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='delecttask(").append(rawFile1.getOperator()).append(",").append(rawFile1.getId()).append(")'>缁撴潫浠诲姟</button></td>");
html.append("</tr>");
}
return html.toString();
}
+
/*
* 3600*3200 5 A
@@ -690,8 +811,38 @@
html.append("<td>").append(patternTask.getRawThickness()).append("</td>");
html.append("<td>").append(patternTask.getColor()).append("</td>");
html.append("<td>").append(patternTask.getWorkState()).append("</td>");
+ html.append("<td>").append(patternTask.getRawFile().getFileName()).append("</td>");
html.append("<td><button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatetask(").append(patternTask.getId()).append(")'>閲嶆柊寮�濮�</button>");
html.append(" <button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatetask1(").append(patternTask.getId()).append(")'>璁剧疆瀹屾垚</button></td>");
+ html.append("</tr>");
+ }
+
+
+
+ return html.toString();
+ }
+
+ public String getpattertaskHtml4(Long line) {
+ StringBuffer html = new StringBuffer();
+ List<PatternTask> patternTasklist =patternTaskDao.findIdGroup(line);
+ String state="绛夊緟涓�";
+ String state1="宸插畬鎴�";
+ for (PatternTask patternTask : patternTasklist) {
+ html.append("<tr>");
+ html.append("<td>").append(patternTask.getRank()).append("</td>");
+ html.append("<td>").append(patternTask.getRawWidth()).append("</td>");
+ html.append("<td>").append(patternTask.getRawHeight()).append("</td>");
+ html.append("<td>").append(patternTask.getRawThickness()).append("</td>");
+ html.append("<td>").append(patternTask.getColor()).append("</td>");
+ html.append("<td>").append(patternTask.getContent()).append("</td>");
+ html.append("<td><button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatetask(")
+ .append(patternTask.getId()).append(",")
+ .append(patternTask.getRawWidth()).append(",")
+ .append(patternTask.getRawHeight()).append(",")
+ .append(patternTask.getRawThickness()).append(",")
+ .append("\""+patternTask.getColor()+"\"").append(",")
+ .append(patternTask.getContent())
+ .append(")'>鎻愪氦浜ч噺</button>");
html.append("</tr>");
}
@@ -712,6 +863,32 @@
return html.toString();
}
+ public void updatepieces(Long id,String width,String height,String thinkness,String color,String count) {
+// PatternTask patternTask=patternTaskDao.findOne(id);
+// if(patternTask!=null){
+// patternTask.setContent(count);
+// patternTaskDao.save(patternTask);
+// }
+ //娣诲姞鎵嬪姩鎶ュ伐浠诲姟
+
+ Connection conn=DeviceService.getConnection();
+ try {
+ CallableStatement c=conn.prepareCall("{call GalssCutmanage4(?,?,?,?,?,?)}");
+ c.setString(1,width);
+ c.setString(2, height);
+ c.setString(3, thinkness);
+ c.setString(4, color);
+ c.setString(5, count);
+ c.registerOutParameter(5, java.sql.Types.INTEGER);
+ c.execute();
+ c.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }finally{
+ messageProcessor.close(conn);
+ }
+ }
+
public void updatetask(Long id) {
PatternTask patternTask=patternTaskDao.findOne(id);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java"
index 0c29c94..dbff044 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java"
@@ -243,7 +243,7 @@
public static Connection getConnection() {
//localhost 192.168.200.201 192.168.2.6 10.12.0.100
try {
- return DriverManager.getConnection("jdbc:mariadb://localhost/gmms","root","");
+ return DriverManager.getConnection("jdbc:mariadb://localhost:3306/gmms","root","");
} catch (SQLException e) {
e.printStackTrace();
}
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java"
index 1e0c597..8f25f22 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java"
@@ -8,6 +8,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -103,14 +104,37 @@
@Autowired
private LiuChengKaReportDao liuchengkaDao;
-
+
+ public static String subZeroAndDot(double doublestr){
+ String doubleStr=doublestr+"";
+ if(null != doubleStr && doubleStr.indexOf(".") > 0){
+ doubleStr = doubleStr.replaceAll("0+?$", "");//鍘绘帀澶氫綑鐨�0
+ doubleStr = doubleStr.replaceAll("[.]$", "");//濡傛渶鍚庝竴浣嶆槸.鍒欏幓鎺�
+ }
+ return doubleStr;
+ }
public String shelfreportformhmtl() {
-
+ List<String> RawTypes=new ArrayList<>();
+ RawTypes.add("SL");
+ RawTypes.add("DL");
StringBuffer html = new StringBuffer();// 瀹炰緥鍖栫紦瀛�
List<ShelfRack> ranks = shelfRackDao.findBystate();
for (ShelfRack rank : ranks) {
- if (rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING)) {
+ if (rank.getRawPackage()!=null&&(rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING))) {
+
+ String unit="";
+ String size="";
+ String Color=rank.getRawPackage().getColor();
+ if(Color.length()>=2&&RawTypes.contains(Color.substring(0, 2))){
+ //鑶滅幓 mm
+ unit="mm";
+ size=subZeroAndDot(rank.getRawPackage().getRawHeight())+"X"+subZeroAndDot(rank.getRawPackage().getRawWidth());
+ }else{
+ //鐧界幓 鍗曚綅 m
+ unit="m";
+ size=subZeroAndDot(rank.getRawPackage().getRawHeight()/1000)+"X"+subZeroAndDot(rank.getRawPackage().getRawWidth()/1000);
+ }
html.append("<tr>");
html.append("<td>" + rank.getNumber() + "</td>");
html.append("<td>" + (rank.getRawPackage().getBatchId()==null?"":rank.getRawPackage().getBatchId()) + "</td>");
@@ -120,10 +144,14 @@
html.append("<td>" + rank.getRawPackage().getRawThickness() + "</td>");
html.append("<td>" + rank.getRawPackage().getLeftPieces() + "</td>");
html.append("<td>" + rank.getCreateTime() + "</td>");
+ html.append("<td>" + size + "</td>");
+ html.append("<td>" + unit + "</td>");
html.append("</tr>");
} else {
html.append("<tr>");
html.append("<td>" + rank.getNumber() + "</td>");
+ html.append("<td></td>");
+ html.append("<td></td>");
html.append("<td></td>");
html.append("<td></td>");
html.append("<td></td>");
@@ -136,7 +164,13 @@
}
return html.toString();// 杩斿洖鏂欐灦淇℃伅
}
-
+ public String getData(int count){
+ SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar c = Calendar.getInstance();
+ c.setTime(new Date());
+ c.add(Calendar.DATE, count); // number of days to add
+ return sdFormat.format(c.getTime());
+ }
public String shelfrankreportformhtml(HttpServletRequest request) {
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Long groups=Long.valueOf(request.getParameter("groups"));
@@ -147,13 +181,16 @@
try {
if ((request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&& request.getParameter("batchid") == "") {
- starttime = "1900-01-01 00:00:00";
+
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
} else if (request.getParameter("starttime") == null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -178,7 +215,8 @@
ranks = rankDao.findalltimebatchid(aDate, aDate1, batchid);
} else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
batchid = request.getParameter("batchid");
Date aDate = sdFormat.parse(starttime);
@@ -228,7 +266,8 @@
// 鏌ヨ鍏ㄩ儴
if ((request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -236,7 +275,8 @@
}
// 鏌ヨ鍏ㄩ儴
else if (request.getParameter("starttime") == null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -285,7 +325,8 @@
// 宸ョ▼鏌ヨ
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
engineeringid = request.getParameter("engineeringid");
Date aDate = sdFormat.parse(starttime);
@@ -295,7 +336,8 @@
// 娴佺▼鍗℃煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
Date aDate = sdFormat.parse(starttime);
@@ -305,7 +347,8 @@
// 娴佺▼鍗″伐绋嬫煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
engineeringid = request.getParameter("engineeringid");
@@ -362,7 +405,8 @@
// 鏌ヨ鍏ㄩ儴
if ((request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -370,7 +414,8 @@
}
// 鏌ヨ鍏ㄩ儴
else if (request.getParameter("starttime") == null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -419,7 +464,8 @@
// 宸ョ▼鏌ヨ
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
engineeringid = request.getParameter("engineeringid");
Date aDate = sdFormat.parse(starttime);
@@ -429,7 +475,8 @@
// 娴佺▼鍗℃煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
Date aDate = sdFormat.parse(starttime);
@@ -439,7 +486,8 @@
// 娴佺▼鍗″伐绋嬫煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
engineeringid = request.getParameter("engineeringid");
@@ -493,7 +541,8 @@
if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&(request.getParameter("dengluname") == ""||request.getParameter("dengluname") == null)) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
aDate = sdFormat.parse(starttime);
aDate1 = sdFormat.parse(findtime);
@@ -512,7 +561,8 @@
}else if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&request.getParameter("dengluname") != ""&&request.getParameter("dengluname") != null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
dengluname=request.getParameter("dengluname");
aDate = sdFormat.parse(starttime);
@@ -569,8 +619,11 @@
String findtime;
if (request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "") {
- starttime = "1900-01-01 00:00:00";
+ /*starttime=(request.getParameter("starttime") == null||request.getParameter("starttime") =="")==true?"":"";*/
+ starttime = getData(-10);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
+ System.out.println(starttime);
} else {
starttime = request.getParameter("starttime").replace("T", " ") + ":00";
findtime = request.getParameter("findtime").replace("T", " ") + ":00";
@@ -584,12 +637,29 @@
List<Cutmanagedetailis> cutmanagedetailis = cutmanagedetailisDao.findallgroups1(aDate, aDate1);
double mianji;
+ List<String> RawTypes=new ArrayList<>();
+ RawTypes.add("SL");
+ RawTypes.add("DL");
+
for (Cutmanagedetailis cutmanagedetaili : cutmanagedetailis) {
int pieces = cutmanagedetailisDao.findallpieces1(cutmanagedetaili.getWidth(),
cutmanagedetaili.getHeight(), cutmanagedetaili.getThickness(), cutmanagedetaili.getColor(),
aDate, aDate1);
mianji = (int) cutmanagedetaili.getWidth() * cutmanagedetaili.getHeight() * pieces/1000000;
BigDecimal bg = new BigDecimal(mianji);
+ String unit="";
+ String size="";
+ String Color=cutmanagedetaili.getColor();
+ if(Color.length()>=2&&RawTypes.contains(Color.substring(0, 2))){
+ //鑶滅幓 mm
+ unit="mm";
+ size=subZeroAndDot(cutmanagedetaili.getHeight())+"X"+subZeroAndDot(cutmanagedetaili.getWidth());
+ }else{
+ //鐧界幓 鍗曚綅 m
+ unit="m";
+ size=subZeroAndDot(cutmanagedetaili.getHeight()/1000)+"X"+subZeroAndDot(cutmanagedetaili.getWidth()/1000);
+ }
+
html.append("<tr>");
html.append("<td>" + cutmanagedetaili.getWidth() + "</td>");
html.append("<td>" + cutmanagedetaili.getHeight() + "</td>");
@@ -597,6 +667,8 @@
html.append("<td>" + cutmanagedetaili.getColor() + "</td>");
html.append("<td>" + pieces + "</td>");
html.append("<td>" + mianji + "</td>");
+ html.append("<td>" + size + "</td>");
+ html.append("<td>" + unit + "</td>");
html.append("</tr>");
}
@@ -619,7 +691,8 @@
if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&(request.getParameter("dengluname") == ""||request.getParameter("dengluname") == null)) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -638,7 +711,8 @@
}else if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&request.getParameter("dengluname") != ""&&request.getParameter("dengluname") != null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
dengluname=request.getParameter("dengluname");
Date aDate = sdFormat.parse(starttime);
@@ -694,7 +768,8 @@
String findtime;
if (request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
} else {
starttime = request.getParameter("starttime").replace("T", " ") + ":00";
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java"
index 347b5c6..2db5c55 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java"
@@ -1077,12 +1077,16 @@
loadRack.setState("绌洪棽");
loadRackDao.save(loadRack);
ShelfRack shelfRack=shelfRackDao.findOne(shelfTask.getShelfRack().getId());
- if (shelfRack.getRawPackage().getLeftPieces()==1){
- shelfRack.setState("浣跨敤涓�");
- shelfRack.setColorFalg(1);
- shelfRack.setFalg("鍚敤");
+ if(shelfRack.getRawPackage()!=null){
+ if (shelfRack.getRawPackage().getLeftPieces()==1){
+ shelfRack.setState("浣跨敤涓�");
+ shelfRack.setColorFalg(1);
+ shelfRack.setFalg("鍚敤");
+ }else{
+ shelfRack.setState("浣跨敤涓�");
+ }
}else{
- shelfRack.setState("浣跨敤涓�");
+ shelfRack.setState("绌洪棽");
}
shelfRackDao.save(shelfRack);
}
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java"
index 294d330..2af5798 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java"
@@ -65,6 +65,7 @@
return cutManageService.getTask(line, model);
}
+
@RequestMapping(method=RequestMethod.GET, value="/gettasks/{line}")
public String getTasks(Model model,@PathVariable("line") String line){
@@ -72,7 +73,7 @@
}
@RequestMapping(method=RequestMethod.GET, value="/gottask/{id}/{line}")
- public String gotTask(@PathVariable("id") String id,@PathVariable("line") String line,HttpServletRequest request,HttpServletResponse response,Model model){
+ public String gotTask(@PathVariable("id") String id,@PathVariable("line") String line,HttpServletRequest request,HttpServletResponse response,Model model) {
return cutManageService.getTaskInterface(request, response, Long.valueOf(id),Long.valueOf(line), model);
}
@@ -159,6 +160,18 @@
return "reporttask/reportTask";
}
+ @RequestMapping(method=RequestMethod.POST, value="/updatepieces")
+ @ResponseBody
+ public boolean updatepieces(HttpServletRequest request, Model model) {
+ cutManageService.updatepieces(Long.valueOf(request.getParameter("rankid"))
+ ,request.getParameter("width")
+ ,request.getParameter("height")
+ ,request.getParameter("thinkness")
+ ,request.getParameter("color")
+ ,request.getParameter("count"));
+ return true;
+ }
+
@RequestMapping(method=RequestMethod.POST, value="/updatetask")
@ResponseBody
public boolean updatetask(HttpServletRequest request, Model model) {
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties"
index 20d77d0..938ebf2 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties"
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://localhost/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://localhost:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/layouts/left.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/layouts/left.jsp"
index 78e22ce..32aa98f 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/layouts/left.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/layouts/left.jsp"
@@ -54,6 +54,8 @@
</ul>
<div class='menu_title'>鍒囧壊绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
<ul class='test'>
+ <li><a href="${ctx }/cutmanage/gettask/4"> 棰嗗彇鍥�#绾夸换鍔�</a></li>
+ <li class='item_divider'></li>
<li><a href="${ctx }/cutmanage/gettask/3"> 棰嗗彇涓�#绾夸换鍔�</a></li>
<li class='item_divider'></li>
<li><a href="${ctx }/cutmanage/gettask/1"> 棰嗗彇涓�#绾夸换鍔�</a></li>
@@ -636,6 +638,41 @@
</div>
</shiro:hasRole>
+ <shiro:hasRole name="shangpian4-1">
+ <div class="menu" >
+ <div class='menu_title'>鍘熺墖浠撳偍<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/shelfmanager/rankmanager"> 鏂欐灦绠＄悊</a></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/shelfmanager/shelftask" > 浠撳偍浠诲姟淇℃伅</a></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/mesview/_yuliao?l=3"> 浣欐枡搴�</a></li>
+ <li class='item_divider'></li>
+ <%-- <li><a href="${ctx }/shelfmanager/fragmentsrank"> 娈嬬墖搴撹鎯�</a></li>
+ <li class='item_divider'></li> --%>
+ <li><a href="${ctx }/shelfmanager/enterandexitrack" > 杩涘嚭搴撶鐞�</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ <div class='menu_title'>鍒囧壊绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/cutmanage/gettask/4"> 棰嗗彇鍥�#绾夸换鍔�</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ <div class='menu_title'>璁惧绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/device/getstatu"> 璁惧淇℃伅</a></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/device/createcolor"> 鑶滅郴绠＄悊</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ <div class='menu_title'>琛ョ墖<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/mes/ajtab?select=all"> 琛ョ墖</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ </div>
+ </shiro:hasRole>
+
<shiro:hasRole name="cangchu">
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/countmachine/countmachinerack.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/countmachine/countmachinerack.jsp"
index b9b866e..2ee4ada 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/countmachine/countmachinerack.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/countmachine/countmachinerack.jsp"
@@ -484,9 +484,9 @@
} else {
$('#CZ_Sure').modal("toggle");
}
-
+ var str=data.split('_')[0]=='1'?"鎴愬姛":"澶辫触";
$("#cz_Ming").text("鎶ュ伐纭");
- $("#cz_Zhuangtai").text("鎴愬姛");
+ $("#cz_Zhuangtai").text(str);
$("#cz_mingxi").text(data);
$("#CZ_Msg").modal('toggle');
},
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp"
index ac26cd7..e2e650f 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp"
@@ -7,15 +7,11 @@
<div class="modal-content" style="background-color: #d9d9d9;">
<div class="modal-header">
<div class="form-group" style="margin: auto; text-align: center">
-
-
<button type="button" class="btn btn-primary close"
data-dismiss="modal" aria-hidden="true">銆愬叧闂��</button>
</div>
</div>
<div class="modal-body" style=" width:1200px;height: 600px; display: flex;">
-
-
<div id="cl_container2" style=" width: 400px;height: 600px; float:left;"></div>
<div id="cl_container3" style=" width: 1200px;height: 600px; float:left;"></div>
@@ -25,7 +21,6 @@
</div>
</form>
</div>
-
<script>
function modalDPShow_chanliang() {
$("#div_daping_chanliang").modal('toggle');
@@ -89,10 +84,10 @@
zongzhi2=y2;
}
var chartDom11 = document.getElementById('cl_container2');
+
var myChart11 = echarts.init(chartDom11);
var option11;
option11 = {
-
title: {
text:'浜ч噺',//涓绘爣棰樻枃鏈�
left:'center',
@@ -167,7 +162,6 @@
}
]
};
-
option11 && myChart11.setOption(option11);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/Edg_Statistics.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/Edg_Statistics.jsp"
index 3e53ceb..afd0f05 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/Edg_Statistics.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/Edg_Statistics.jsp"
@@ -95,8 +95,10 @@
<select id="rf_banzu" class="span_tasktext">
<option value="0">鍏ㄩ儴鐝粍</option>
</select>
- <button id='' type='button' data-toggle='popover' data-content='' data-trigger='hover' class="btn btn-sm btn-success s-title" onclick="chaxun('1')">鏌ヨ</button>
+ <button id='BBcha' type='button' data-toggle='popover' data-content='' data-trigger='hover' class="btn btn-sm btn-success s-title" onclick="ischaxun()">鏌ヨ</button>
+ <button id="ms_baipian" class="btn btn-sm btn-success"
+ type='button' onclick="ExportTable();">瀵煎嚭琛ㄦ牸</button>
<br>
<p style="font-size: 20px" id="p_total">
鏌ヨ鏁版嵁鎬昏锛� 銆愬叡 <span id="rNum" class="span-data"></span> 鏉℃暟鎹��
@@ -302,11 +304,25 @@
loadTable();
} */
var db;
+ var total_num=0;
+ var IsAllow=false;
+ var cunt=0;
+ function AllowQuery(){
+
+ }
+ // 璁剧疆涓�涓瘡2000姣鎵ц涓�娆＄殑瀹氭椂鍣�
+ setInterval(function() {
+ if(IsAllow){
+ chaxun('1');
+ }
+ }, 1000);
+ function ischaxun(){
+ if(!IsAllow){
+ IsAllow=true;
+ }
+
+ }
function chaxun(trigger){
- //var isdb=$("#fz_isShow").is(':checked');
-
-
- //var db = createTable(document.getElementById("Edg_info"), opt);
var stime = $("#starttime").val();//寮�濮嬫椂闂�
var etime = $("#endtime").val();//缁撴潫鏃堕棿
var line = $("#rf_chanxian").val();//绾胯矾
@@ -332,6 +348,7 @@
}
$.ajax({
type : "post",
+ async: false,
data : {
caozuo:"鏌ヨ",
leixing:"纾ㄨ竟寮�鍚堟煡璇�",
@@ -348,6 +365,7 @@
error : loadError
});
}
+
function loadTable() {
chaxun('0');
}
@@ -359,12 +377,15 @@
var Allcount=0;
var Rowcount=d.length;
var a;
+ total_num=d.length;
for (var i = 0; i < d.length; i++) {
Allcount+=Number(d[i][4]);
}
db.update(d);
$("#rNum").text(Allcount);
$("#kaiCount").text(Rowcount);
+
+ IsAllow=false;
}
function loadError(data) {
@@ -373,6 +394,7 @@
setTimeout(loadTable, 5000);
a = false;
} */
+ IsAllow=false;
}
function initBanZu() {
var gy ="纾ㄨ竟";
@@ -406,7 +428,41 @@
//InitLoad();
</script>
+ <!-- 瀵煎嚭琛ㄦ牸 -->
+ <script>
+ function ExportTable() {
+ if (total_num < 1) {
+ $("#CZ_Msg").modal('toggle');
+ $("#cz_Ming").html("瀵煎嚭琛ㄦ牸:");
+ $("#cz_Zhuangtai").html("鏃犻渶瀵煎嚭");
+ $("#cz_Zhuangtai").attr("style", "color:red;");
+ $("#cz_mingxi").html("娌℃湁鏁版嵁锛屼笉闇�瑕佸鍑猴紒");
+ return;
+ }
+ var dt = new Date().getFullYear().toString();
+ dt += (new Date().getMonth() + 1).toString();
+ dt += new Date().getDate().toString();
+ var tName = "纾ㄨ竟寮�鍚堟姤琛�-" + dt + ".xls";
+ let exportFileContent = document.getElementById('Edg_info').outerHTML;
+ let blob = new Blob([ exportFileContent ], {
+ type : 'text/plain;charset=utf-8'
+ }); // 瑙ｅ喅涓枃涔辩爜闂
+ blob = new Blob([ String.fromCharCode(0xFEFF), blob ], {
+ type : blob.type
+ });
+ // 璁剧疆閾炬帴
+ let
+ link = window.URL.createObjectURL(blob);
+ let
+ a = document.createElement('a'); // 鍒涘缓a鏍囩
+ a.download = tName; // 璁剧疆琚笅杞界殑瓒呴摼鎺ョ洰鏍囷紙鏂囦欢鍚嶏級
+ a.href = link; // 璁剧疆a鏍囩鐨勯摼鎺�
+ document.body.appendChild(a); // a鏍囩娣诲姞鍒伴〉闈�
+ a.click(); // 璁剧疆a鏍囩瑙﹀彂鍗曞嚮浜嬩欢
+ document.body.removeChild(a); // 绉婚櫎a鏍囩
+ }
+ </script>
<!-- 椤甸潰瀹氭椂鍒锋柊 鏆傚仠 鎭㈠
<script>
var interval = setInterval('loadTable()', rTime);//瀹氭椂鍒锋柊
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
index 9920f98..eba3c08 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
@@ -191,6 +191,7 @@
html += " <option value='4' >" + gongyi + " 4 绾�</option>";
} else if (gongyi == "鍐峰姞宸�") {
html += " <option value='3' >" + gongyi + " 3 绾�</option>";
+ html += " <option value='4' >" + gongyi + " 4 绾�</option>";
}
document.getElementById("rf_chanxian").innerHTML += html;
@@ -696,13 +697,15 @@
for(i=0;i<d.length;i++){
d[i][0] = i+1;
zSl+=d[i][6];
- zMj+=d[i][1]*d[i][2]*d[i][6];
+ //zMj+=d[i][1]*d[i][2]*d[i][6];
d[i][7]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000);
- //zMj+=d[i][7]=d[i][1]*d[i][2]*d[i][6];
+ zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000));
+
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
@@ -720,12 +723,15 @@
for(i=0;i<d.length;i++){
d[i][0] = i+1;
zSl+=d[i][5];
- zMj+=d[i][1]*d[i][2]*d[i][5];
+ //zMj+=d[i][1]*d[i][2]*d[i][5];
+
d[i][6]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000);
+ zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000));
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp"
index 29f12d4..7501e69 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp"
@@ -108,13 +108,11 @@
if(data.length>0){
for(var i =0;i<data.length;i++)
current_gongxu_banzu.push(data[i][0]);
-
getFormat(0);//榛樿寮�濮嬫椂闂�
$("#endtime").val(format);
getFormat(6);//榛樿缁撴潫鏃堕棿
$("#starttime").val(format);
myChart.resize();
-
myCharts_.resize();
chat_query();
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/cutmanagerepoortform1.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/cutmanagerepoortform1.jsp"
index 0346aa5..ca041bf 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/cutmanagerepoortform1.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/cutmanagerepoortform1.jsp"
@@ -137,7 +137,8 @@
<th>棰滆壊</th>
<th>鏁伴噺</th>
<th>闈㈢Н</th>
-
+ <th>灏哄</th>
+ <th>鍗曚綅</th>
</tr>
</thead>
<tbody>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/shelfreportform.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/shelfreportform.jsp"
index 8bffa51..cb46760 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/shelfreportform.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/reportform/shelfreportform.jsp"
@@ -131,7 +131,8 @@
<th>鍘氬害</th>
<th>鏁伴噺</th>
<th>鍏ュ簱鏃堕棿</th>
-
+ <th>灏哄</th>
+ <th>鍗曚綅</th>
</tr>
</thead>
<tbody>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp"
index 0381c3d..9047445 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp"
@@ -24,47 +24,47 @@
<!-- FastClick -->
<script
src="${ctx }/static/AdminLTE/bower_components/fastclick/lib/fastclick.js"></script>
- <script type="text/javascript">
- var interval = setInterval('refreshStatus()', 5000);
- $(document).ready(function(){
+<script type="text/javascript">
+ var interval = setInterval('refreshStatus()', 5000);
+ $(document).ready(function() {
var info = $("#info").attr("info");
$("#infos").html(info);
-});
- // 璁惧椤甸潰鑷姩鍒锋柊
- /* function refreshStatus() {
- window.location.reload();
- } */
-
- // 鍋滄椤甸潰鑷姩鍒锋柊
- function disableAutoRefresh() {
- clearInterval(interval);
- }
-
-
- function delAll(type){
- var checkboxs=document.getElementsByName('id');
- for(var i=0;i<checkboxs.length;i++){
- var checkbox=checkboxs[i];
- if(checkbox.checked){
- var RowHtml=checkbox.parentNode.parentNode;
- var taskid=RowHtml.getElementsByClassName("rankid")[0].innerHTML;
-
- $.ajax({
- cache:false,
- type:"POST",
- dataType : "json",
- url:"${ctx}/shelfmanager/updateshelftask",
- data:{
- "taskid":taskid,
- "type":type
- },success:function(data){
- window.location.href="${ctx}/shelfmanager/shelftask";
- }
- });
- }
- }
+ });
+ // 璁惧椤甸潰鑷姩鍒锋柊
+ /* function refreshStatus() {
+ window.location.reload();
+ } */
+
+ // 鍋滄椤甸潰鑷姩鍒锋柊
+ function disableAutoRefresh() {
+ clearInterval(interval);
}
- </script>
+
+ function delAll(type) {
+ var checkboxs = document.getElementsByName('id');
+ for (var i = 0; i < checkboxs.length; i++) {
+ var checkbox = checkboxs[i];
+ if (checkbox.checked) {
+ var RowHtml = checkbox.parentNode.parentNode;
+ var taskid = RowHtml.getElementsByClassName("rankid")[0].innerHTML;
+
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/shelfmanager/updateshelftask",
+ data : {
+ "taskid" : taskid,
+ "type" : type
+ },
+ success : function(data) {
+ window.location.href = "${ctx}/shelfmanager/shelftask";
+ }
+ });
+ }
+ }
+ }
+</script>
</head>
<body style="padding: 20px;">
@@ -81,56 +81,61 @@
<li class="active">璇︽儏</li>
</ol>
</section>
- <div id = "allstatu" allstatu = "${allstatu}"></div>
- <div id = "info" info = "${info}"></div>
+ <div id="allstatu" allstatu="${allstatu}"></div>
+ <div id="info" info="${info}"></div>
<div>
<!-- Main content -->
<section class="content container-fluid">
- <div class="box box-default" style="background-color:#D5EAFF;">
+ <div class="box box-default" style="background-color: #D5EAFF;">
<div class="box-header with-border">
<h3 class="box-title">浠撳偍</h3>
${status}
</div>
<!-- /.box-header -->
- <button type="button" onclick="delAll('閲嶆柊寮�濮�')" class="btn btn-primary ">閲嶆柊寮�濮�</button>
- <button type="button" onclick="delAll('瀹屾垚')" class="btn btn-primary ">浠诲姟瀹屾垚</button>
- <button type="button" onclick="delAll('鍒犻櫎')" class="btn btn-primary ">鍒犻櫎浠诲姟</button>
- <div class="box-body" style="height:300px;overflow-y:auto;">
+ <button type="button" onclick="delAll('閲嶆柊寮�濮�')"
+ class="btn btn-primary ">閲嶆柊寮�濮�</button>
+ <button type="button" onclick="delAll('瀹屾垚')"
+ class="btn btn-primary ">浠诲姟瀹屾垚</button>
+ <button type="button" onclick="delAll('鍒犻櫎')"
+ class="btn btn-primary ">鍒犻櫎浠诲姟</button>
+ <div class="box-body" style="height: 300px; overflow-y: auto;">
<table class="table table-striped table-hover"
- style="font-size: 18px;" id="example2">
- <thead>
- <tr>
- <th>閫夋嫨</th>
- <th style="display:none">缂栧彿</th>
- <th>GlassID</th>
- <th>浠诲姟鎻忚堪</th>
- <th>浠诲姟鐘舵��</th>
- <th>鐜荤拑鍘氬害</th>
- <th>鐜荤拑鑶滅郴</th>
- <th>鍒涘缓鏃堕棿</th>
- </tr>
- </thead>
- <tbody>
- ${shelftasks}
- </tbody>
- </table>
- </div>
- </div>
- </section>
+ style="font-size: 18px;" id="example2">
+ <thead>
+ <tr>
+ <th>閫夋嫨</th>
+ <th style="display: none">缂栧彿</th>
+ <th>GlassID</th>
+ <th>浠诲姟鎻忚堪</th>
+ <th>浠诲姟鐘舵��</th>
+ <th>鐜荤拑鍘氬害</th>
+ <th>鐜荤拑鑶滅郴</th>
+ <th>鍒涘缓鏃堕棿</th>
+ </tr>
+ </thead>
+ <tbody>${shelftasks}
+ </tbody>
+ </table>
+ </div>
</div>
- <div class="callout callout-warning" style="background-color:#D5EAFF !important; border-left:0px">
- <div style='text-align: center;color:red;font-size:30px;border-left:0;'>${lackGlassHtml}</div>
- <h4 style="color: black;">鏁呴殰鎿嶄綔</h4>
- <p style="color: black;">褰撳皬杞﹀彂鐢熸晠闅滄椂锛屽鑷存垜浠殑浠诲姟娌℃湁瀹屾垚灏卞け璐ヤ簡銆傚皬杞﹀洖闆剁偣锛岃繖鏍锋垜浠殑浠诲姟灏变細涓�鐩村牭鍦ㄥ垰鎵嶇殑閭ｄ釜浠诲姟锛屽畬鎴愪笌鍚︽垜浠兘涓嶆竻妤氾紝闇�瑕佸幓鎵嬪姩瑙ｅ喅锛屼换鍔″畬鎴愮殑璇濓紝鐐瑰嚮浠诲姟瀹屾垚鎸夐挳锛屾病鏈夊畬鎴愮偣鍑婚噸鏂板紑濮嬫寜閽�</p>
+ </section>
+ </div>
+ <div class="callout callout-warning"
+ style="background-color: #D5EAFF !important; border-left: 0px">
+ <div
+ style='text-align: center; color: red; font-size: 30px; border-left: 0;'>${lackGlassHtml}</div>
+ <h4 style="color: black;">鏁呴殰鎿嶄綔</h4>
+ <p style="color: black;">褰撳皬杞﹀彂鐢熸晠闅滄椂锛屽鑷存垜浠殑浠诲姟娌℃湁瀹屾垚灏卞け璐ヤ簡銆傚皬杞﹀洖闆剁偣锛岃繖鏍锋垜浠殑浠诲姟灏变細涓�鐩村牭鍦ㄥ垰鎵嶇殑閭ｄ釜浠诲姟锛屽畬鎴愪笌鍚︽垜浠兘涓嶆竻妤氾紝闇�瑕佸幓鎵嬪姩瑙ｅ喅锛屼换鍔″畬鎴愮殑璇濓紝鐐瑰嚮浠诲姟瀹屾垚鎸夐挳锛屾病鏈夊畬鎴愮偣鍑婚噸鏂板紑濮嬫寜閽�</p>
+ <br>
+ <div style='text-align: center;'>
+ <span style='font-size: 30px; color: black;'>褰撳墠浠诲姟锛�${workingtask.description}</span><br>
+
<br>
- <div style='text-align: center;'>
- <span style='font-size: 30px;color: black;'>褰撳墠浠诲姟锛�${workingtask.description}</span><br>
-
- <br> <%-- <a class="btn btn-large btn-success"
+ <%-- <a class="btn btn-large btn-success"
href="${ctx }/shelfmanager/finishshelftask"
style='text-decoration: none;'>浠诲姟瀹屾垚</a> --%>
- <%-- <a class="btn btn-large btn-success"
+ <%-- <a class="btn btn-large btn-success"
href="${ctx }/shelfmanager/againshelftask"
style='text-decoration: none;'>閲嶆柊寮�濮�</a>
@@ -141,12 +146,12 @@
<a class="btn btn-large btn-danger"
href="${ctx }/shelfmanager/deletetloadask"
style='text-decoration: none;'>鍒犻櫎涓婄墖浠诲姟</a> --%>
-
- </div>
+
</div>
-
</div>
- <!-- /.content -->
+
+ </div>
+ <!-- /.content -->
<!-- /.content-wrapper -->
<!-- page script -->
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml"
index d1bed3d..257dcec 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
- <display-name>gmms2</display-name>
+ <display-name>WmMES</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties"
index 20d77d0..938ebf2 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties"
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://localhost/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://localhost:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
index 2000581..1b49ab5 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp"
index 3a800a6..32aa98f 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp"
@@ -54,6 +54,8 @@
</ul>
<div class='menu_title'>鍒囧壊绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
<ul class='test'>
+ <li><a href="${ctx }/cutmanage/gettask/4"> 棰嗗彇鍥�#绾夸换鍔�</a></li>
+ <li class='item_divider'></li>
<li><a href="${ctx }/cutmanage/gettask/3"> 棰嗗彇涓�#绾夸换鍔�</a></li>
<li class='item_divider'></li>
<li><a href="${ctx }/cutmanage/gettask/1"> 棰嗗彇涓�#绾夸换鍔�</a></li>
@@ -266,6 +268,8 @@
<li class='item_divider'></li>
<li><a href="${ctx }/mesview/_ReportForm_merge"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>
<li class='item_divider'></li>
+ <li><a href="${ctx }/mesview/_Edg_Statistics?group=1"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>
+ <li class='item_divider'></li>
<li><a href="${ctx }/mesview/_DT_dapingxianshi" target="_blank"> 澶у睆鏄剧ず</a></li>
<li class='item_divider'></li>
</ul>
@@ -384,7 +388,9 @@
<li><a href="${ctx }/reportform/cutmanagerepoortform1"> 鍒囧壊鎬绘姤琛�</a></li>
<li class='item_divider'></li>
<li><a href="${ctx }/mesview/_ReportForm_merge"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>
- <li class='item_divider'></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/mesview/_Edg_Statistics?group=1"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>
+ <li class='item_divider'></li>
</ul>
</div>
</shiro:hasRole>
@@ -616,6 +622,41 @@
<li class='item_divider'></li>
<li><a href="${ctx }/compoundMachine/queue/3"> 鍦ㄧ嚎闃熷垪</a></li>
<li class='item_divider'></li>
+ </ul>
+ <div class='menu_title'>璁惧绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/device/getstatu"> 璁惧淇℃伅</a></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/device/createcolor"> 鑶滅郴绠＄悊</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ <div class='menu_title'>琛ョ墖<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/mes/ajtab?select=all"> 琛ョ墖</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ </div>
+ </shiro:hasRole>
+
+ <shiro:hasRole name="shangpian4-1">
+ <div class="menu" >
+ <div class='menu_title'>鍘熺墖浠撳偍<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/shelfmanager/rankmanager"> 鏂欐灦绠＄悊</a></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/shelfmanager/shelftask" > 浠撳偍浠诲姟淇℃伅</a></li>
+ <li class='item_divider'></li>
+ <li><a href="${ctx }/mesview/_yuliao?l=3"> 浣欐枡搴�</a></li>
+ <li class='item_divider'></li>
+ <%-- <li><a href="${ctx }/shelfmanager/fragmentsrank"> 娈嬬墖搴撹鎯�</a></li>
+ <li class='item_divider'></li> --%>
+ <li><a href="${ctx }/shelfmanager/enterandexitrack" > 杩涘嚭搴撶鐞�</a></li>
+ <li class='item_divider'></li>
+ </ul>
+ <div class='menu_title'>鍒囧壊绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
+ <ul class='test'>
+ <li><a href="${ctx }/cutmanage/gettask/4"> 棰嗗彇鍥�#绾夸换鍔�</a></li>
+ <li class='item_divider'></li>
</ul>
<div class='menu_title'>璁惧绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>
<ul class='test'>
@@ -1031,6 +1072,8 @@
<li class='item_divider'></li>
<li><a href="${ctx }/mesview/_ReportForm_merge"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>
<li class='item_divider'></li>
+ <li><a href="${ctx }/mesview/_Edg_Statistics?group=1"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>
+ <li class='item_divider'></li>
<li><a href="${ctx }/mesview/_DT_dapingxianshi" target="_blank"> 澶у睆鏄剧ず</a></li>
<li class='item_divider'></li>
</ul>
@@ -1057,6 +1100,8 @@
<li class='item_divider'></li>
<li><a href="${ctx }/mesview/_ReportForm_merge"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>
<li class='item_divider'></li>
+ <li><a href="${ctx }/mesview/_Edg_Statistics?group=1"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>
+ <li class='item_divider'></li>
</ul>
</div>
</shiro:hasRole>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/countmachine/countmachinerack.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/countmachine/countmachinerack.jsp"
index b9b866e..2ee4ada 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/countmachine/countmachinerack.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/countmachine/countmachinerack.jsp"
@@ -484,9 +484,9 @@
} else {
$('#CZ_Sure').modal("toggle");
}
-
+ var str=data.split('_')[0]=='1'?"鎴愬姛":"澶辫触";
$("#cz_Ming").text("鎶ュ伐纭");
- $("#cz_Zhuangtai").text("鎴愬姛");
+ $("#cz_Zhuangtai").text(str);
$("#cz_mingxi").text(data);
$("#CZ_Msg").modal('toggle');
},
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/public_manage.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/public_manage.jsp"
index d75341e..44437da 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/public_manage.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/public_manage.jsp"
@@ -19,6 +19,48 @@
sn = mes.getMesDBHelper().createSession(false);
String strSQL = "";
if ("鏌ヨ".equals(caozuo)) {
+ if ("纾ㄨ竟寮�鍚堟煡璇�".equals(leixing)) {
+ String stime = request.getParameter("stime");
+ String etime = request.getParameter("etime");
+ String trigger = request.getParameter("trigger");
+ String Edg = request.getParameter("Edg");
+ String banzu = request.getParameter("banzu");
+ String gby="";
+ //String isdb = request.getParameter("isdb");
+ System.out.println(etime);
+ /* if("".equals(etime)||etime==null){
+ etime="Now()";
+ }else{
+ etime="'"+etime+"'";
+ } */
+ if("".equals(Edg)||Edg==null||"0".equals(Edg)){
+ Edg="width,height,SendTime,Line,count(*) as piece,ifnull(banzu,'')";
+ gby="Recordsid";
+ }else if("1".equals(Edg)){
+ Edg="width,SendTime,Line,ifnull(banzu,''),count(*) as piece";
+ gby="RecordsidW";
+ }else if("2".equals(Edg)){
+ Edg="height,SendTime,Line,ifnull(banzu,''),count(*) as piece";
+ gby="RecordsidH";
+ }
+
+ if("".equals(banzu)||banzu==null||"0".equals(banzu)){
+ banzu="";
+ }else{
+ banzu=" banzu='"+banzu+"' and";
+ }
+ if("1".equals(trigger)){//鏌ヨ
+ strSQL = "select "+Edg+" from Y_Edg_Statistics"+
+ " where Line="+line+" and "+banzu+" SendTime>='"+stime+"' and SendTime<='"+etime+"'"+
+ " GROUP BY "+gby;
+ }else{//榛樿
+ strSQL ="select width,height,SendTime,Line,count(*) as piece,ifnull(banzu,'') from Y_Edg_Statistics"+
+ " where Line="+line+" and SendTime>=CONCAT(DATE_FORMAT(Now(),'%Y-%m-%d'),' 00:00:00') and SendTime<=CONCAT(DATE_FORMAT(Now(),'%Y-%m-%d'),' 23:59:59')"+
+ " GROUP BY Recordsid";
+ }
+ System.out.println(strSQL);
+
+ }
if ("娆＄牬绫诲瀷".equals(leixing)) {
strSQL = "select id,cipoleixing from cipoleixing";
}
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_yuanpiankucun.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_yuanpiankucun.jsp"
index ab1f3bd..65704fd 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_yuanpiankucun.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_yuanpiankucun.jsp"
@@ -151,7 +151,10 @@
],
yAxis: [
{
- type: 'value'
+ type: 'value',
+ min: 0,
+ max:80,
+ interval:10
}
],
series: [
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DT_dapingxianshi.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DT_dapingxianshi.jsp"
index 8d0fc61..332cd7e 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DT_dapingxianshi.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DT_dapingxianshi.jsp"
@@ -1021,7 +1021,10 @@
],
yAxis: [
{
- type: 'value'
+ type: 'value',
+ min: 0,
+ max:80,
+ interval:10
}
],
series: [
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp"
index 9920f98..eba3c08 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp"
@@ -191,6 +191,7 @@
html += " <option value='4' >" + gongyi + " 4 绾�</option>";
} else if (gongyi == "鍐峰姞宸�") {
html += " <option value='3' >" + gongyi + " 3 绾�</option>";
+ html += " <option value='4' >" + gongyi + " 4 绾�</option>";
}
document.getElementById("rf_chanxian").innerHTML += html;
@@ -696,13 +697,15 @@
for(i=0;i<d.length;i++){
d[i][0] = i+1;
zSl+=d[i][6];
- zMj+=d[i][1]*d[i][2]*d[i][6];
+ //zMj+=d[i][1]*d[i][2]*d[i][6];
d[i][7]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000);
- //zMj+=d[i][7]=d[i][1]*d[i][2]*d[i][6];
+ zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000));
+
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
@@ -720,12 +723,15 @@
for(i=0;i<d.length;i++){
d[i][0] = i+1;
zSl+=d[i][5];
- zMj+=d[i][1]*d[i][2]*d[i][5];
+ //zMj+=d[i][1]*d[i][2]*d[i][5];
+
d[i][6]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000);
+ zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000));
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/cutmanagerepoortform1.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/cutmanagerepoortform1.jsp"
index 0346aa5..ca041bf 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/cutmanagerepoortform1.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/cutmanagerepoortform1.jsp"
@@ -137,7 +137,8 @@
<th>棰滆壊</th>
<th>鏁伴噺</th>
<th>闈㈢Н</th>
-
+ <th>灏哄</th>
+ <th>鍗曚綅</th>
</tr>
</thead>
<tbody>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/shelfreportform.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/shelfreportform.jsp"
index 8bffa51..cb46760 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/shelfreportform.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/shelfreportform.jsp"
@@ -131,7 +131,8 @@
<th>鍘氬害</th>
<th>鏁伴噺</th>
<th>鍏ュ簱鏃堕棿</th>
-
+ <th>灏哄</th>
+ <th>鍗曚綅</th>
</tr>
</thead>
<tbody>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/shelfmanager/shelftask.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/shelfmanager/shelftask.jsp"
index 0381c3d..9047445 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/shelfmanager/shelftask.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/shelfmanager/shelftask.jsp"
@@ -24,47 +24,47 @@
<!-- FastClick -->
<script
src="${ctx }/static/AdminLTE/bower_components/fastclick/lib/fastclick.js"></script>
- <script type="text/javascript">
- var interval = setInterval('refreshStatus()', 5000);
- $(document).ready(function(){
+<script type="text/javascript">
+ var interval = setInterval('refreshStatus()', 5000);
+ $(document).ready(function() {
var info = $("#info").attr("info");
$("#infos").html(info);
-});
- // 璁惧椤甸潰鑷姩鍒锋柊
- /* function refreshStatus() {
- window.location.reload();
- } */
-
- // 鍋滄椤甸潰鑷姩鍒锋柊
- function disableAutoRefresh() {
- clearInterval(interval);
- }
-
-
- function delAll(type){
- var checkboxs=document.getElementsByName('id');
- for(var i=0;i<checkboxs.length;i++){
- var checkbox=checkboxs[i];
- if(checkbox.checked){
- var RowHtml=checkbox.parentNode.parentNode;
- var taskid=RowHtml.getElementsByClassName("rankid")[0].innerHTML;
-
- $.ajax({
- cache:false,
- type:"POST",
- dataType : "json",
- url:"${ctx}/shelfmanager/updateshelftask",
- data:{
- "taskid":taskid,
- "type":type
- },success:function(data){
- window.location.href="${ctx}/shelfmanager/shelftask";
- }
- });
- }
- }
+ });
+ // 璁惧椤甸潰鑷姩鍒锋柊
+ /* function refreshStatus() {
+ window.location.reload();
+ } */
+
+ // 鍋滄椤甸潰鑷姩鍒锋柊
+ function disableAutoRefresh() {
+ clearInterval(interval);
}
- </script>
+
+ function delAll(type) {
+ var checkboxs = document.getElementsByName('id');
+ for (var i = 0; i < checkboxs.length; i++) {
+ var checkbox = checkboxs[i];
+ if (checkbox.checked) {
+ var RowHtml = checkbox.parentNode.parentNode;
+ var taskid = RowHtml.getElementsByClassName("rankid")[0].innerHTML;
+
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/shelfmanager/updateshelftask",
+ data : {
+ "taskid" : taskid,
+ "type" : type
+ },
+ success : function(data) {
+ window.location.href = "${ctx}/shelfmanager/shelftask";
+ }
+ });
+ }
+ }
+ }
+</script>
</head>
<body style="padding: 20px;">
@@ -81,56 +81,61 @@
<li class="active">璇︽儏</li>
</ol>
</section>
- <div id = "allstatu" allstatu = "${allstatu}"></div>
- <div id = "info" info = "${info}"></div>
+ <div id="allstatu" allstatu="${allstatu}"></div>
+ <div id="info" info="${info}"></div>
<div>
<!-- Main content -->
<section class="content container-fluid">
- <div class="box box-default" style="background-color:#D5EAFF;">
+ <div class="box box-default" style="background-color: #D5EAFF;">
<div class="box-header with-border">
<h3 class="box-title">浠撳偍</h3>
${status}
</div>
<!-- /.box-header -->
- <button type="button" onclick="delAll('閲嶆柊寮�濮�')" class="btn btn-primary ">閲嶆柊寮�濮�</button>
- <button type="button" onclick="delAll('瀹屾垚')" class="btn btn-primary ">浠诲姟瀹屾垚</button>
- <button type="button" onclick="delAll('鍒犻櫎')" class="btn btn-primary ">鍒犻櫎浠诲姟</button>
- <div class="box-body" style="height:300px;overflow-y:auto;">
+ <button type="button" onclick="delAll('閲嶆柊寮�濮�')"
+ class="btn btn-primary ">閲嶆柊寮�濮�</button>
+ <button type="button" onclick="delAll('瀹屾垚')"
+ class="btn btn-primary ">浠诲姟瀹屾垚</button>
+ <button type="button" onclick="delAll('鍒犻櫎')"
+ class="btn btn-primary ">鍒犻櫎浠诲姟</button>
+ <div class="box-body" style="height: 300px; overflow-y: auto;">
<table class="table table-striped table-hover"
- style="font-size: 18px;" id="example2">
- <thead>
- <tr>
- <th>閫夋嫨</th>
- <th style="display:none">缂栧彿</th>
- <th>GlassID</th>
- <th>浠诲姟鎻忚堪</th>
- <th>浠诲姟鐘舵��</th>
- <th>鐜荤拑鍘氬害</th>
- <th>鐜荤拑鑶滅郴</th>
- <th>鍒涘缓鏃堕棿</th>
- </tr>
- </thead>
- <tbody>
- ${shelftasks}
- </tbody>
- </table>
- </div>
- </div>
- </section>
+ style="font-size: 18px;" id="example2">
+ <thead>
+ <tr>
+ <th>閫夋嫨</th>
+ <th style="display: none">缂栧彿</th>
+ <th>GlassID</th>
+ <th>浠诲姟鎻忚堪</th>
+ <th>浠诲姟鐘舵��</th>
+ <th>鐜荤拑鍘氬害</th>
+ <th>鐜荤拑鑶滅郴</th>
+ <th>鍒涘缓鏃堕棿</th>
+ </tr>
+ </thead>
+ <tbody>${shelftasks}
+ </tbody>
+ </table>
+ </div>
</div>
- <div class="callout callout-warning" style="background-color:#D5EAFF !important; border-left:0px">
- <div style='text-align: center;color:red;font-size:30px;border-left:0;'>${lackGlassHtml}</div>
- <h4 style="color: black;">鏁呴殰鎿嶄綔</h4>
- <p style="color: black;">褰撳皬杞﹀彂鐢熸晠闅滄椂锛屽鑷存垜浠殑浠诲姟娌℃湁瀹屾垚灏卞け璐ヤ簡銆傚皬杞﹀洖闆剁偣锛岃繖鏍锋垜浠殑浠诲姟灏变細涓�鐩村牭鍦ㄥ垰鎵嶇殑閭ｄ釜浠诲姟锛屽畬鎴愪笌鍚︽垜浠兘涓嶆竻妤氾紝闇�瑕佸幓鎵嬪姩瑙ｅ喅锛屼换鍔″畬鎴愮殑璇濓紝鐐瑰嚮浠诲姟瀹屾垚鎸夐挳锛屾病鏈夊畬鎴愮偣鍑婚噸鏂板紑濮嬫寜閽�</p>
+ </section>
+ </div>
+ <div class="callout callout-warning"
+ style="background-color: #D5EAFF !important; border-left: 0px">
+ <div
+ style='text-align: center; color: red; font-size: 30px; border-left: 0;'>${lackGlassHtml}</div>
+ <h4 style="color: black;">鏁呴殰鎿嶄綔</h4>
+ <p style="color: black;">褰撳皬杞﹀彂鐢熸晠闅滄椂锛屽鑷存垜浠殑浠诲姟娌℃湁瀹屾垚灏卞け璐ヤ簡銆傚皬杞﹀洖闆剁偣锛岃繖鏍锋垜浠殑浠诲姟灏变細涓�鐩村牭鍦ㄥ垰鎵嶇殑閭ｄ釜浠诲姟锛屽畬鎴愪笌鍚︽垜浠兘涓嶆竻妤氾紝闇�瑕佸幓鎵嬪姩瑙ｅ喅锛屼换鍔″畬鎴愮殑璇濓紝鐐瑰嚮浠诲姟瀹屾垚鎸夐挳锛屾病鏈夊畬鎴愮偣鍑婚噸鏂板紑濮嬫寜閽�</p>
+ <br>
+ <div style='text-align: center;'>
+ <span style='font-size: 30px; color: black;'>褰撳墠浠诲姟锛�${workingtask.description}</span><br>
+
<br>
- <div style='text-align: center;'>
- <span style='font-size: 30px;color: black;'>褰撳墠浠诲姟锛�${workingtask.description}</span><br>
-
- <br> <%-- <a class="btn btn-large btn-success"
+ <%-- <a class="btn btn-large btn-success"
href="${ctx }/shelfmanager/finishshelftask"
style='text-decoration: none;'>浠诲姟瀹屾垚</a> --%>
- <%-- <a class="btn btn-large btn-success"
+ <%-- <a class="btn btn-large btn-success"
href="${ctx }/shelfmanager/againshelftask"
style='text-decoration: none;'>閲嶆柊寮�濮�</a>
@@ -141,12 +146,12 @@
<a class="btn btn-large btn-danger"
href="${ctx }/shelfmanager/deletetloadask"
style='text-decoration: none;'>鍒犻櫎涓婄墖浠诲姟</a> --%>
-
- </div>
+
</div>
-
</div>
- <!-- /.content -->
+
+ </div>
+ <!-- /.content -->
<!-- /.content-wrapper -->
<!-- page script -->
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml"
index d1bed3d..257dcec 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
- <display-name>gmms2</display-name>
+ <display-name>WmMES</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
index dbf6c83..b605ee9 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Built-By: SNG-ZDH-012
-Build-Jdk: 1.8.0_291
+Build-Jdk: 1.8.0_121
Created-By: Maven Integration for Eclipse
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
index a30a3a1..5ae1d33 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
@@ -1,7 +1,7 @@
#Generated by Maven Integration for Eclipse
-#Tue May 07 16:23:17 CST 2024
+#Mon May 26 16:23:44 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
-m2e.projectName=MES_11
-m2e.projectLocation=D\:\\workeclipse\\MES_11
+m2e.projectName=WmMES
+m2e.projectLocation=D\:\\workeclipse\\ddd\\MES_11
artifactId=gmms2
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties"
index 6c7284f..fc859f1 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties"
@@ -1,5 +1,5 @@
#Generated by Maven
-#Mon Mar 18 11:50:57 CST 2024
+#Tue Jan 14 12:37:10 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
index 8b0feb1..4756223 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
@@ -1,184 +1,184 @@
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\PatternTask.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\account\ShiroDbRealm.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\device\DeviceController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskShelfDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\RawFileDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\device\DeviceService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\SqlHelper\DBSession.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\toughening\tougheningService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\common\AbstractMachineService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\message\AbstractMessageProcessor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\account\RegisterController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\ArrangeMachineTaskType.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskHollowDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\ServiceException.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\gaoliwei\GaoliweiMachineService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskStockDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\ShelfRackDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\cutmanage\CutManageController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\SlicecageDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\cutmanage\CutManageService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\HexUtil.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\FolderUtil.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\system\SystemService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\galsstask\GalssTaskController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\log\GLoggerConstants.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskBufferDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GlassNumberColorDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTask2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\DBHelper.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\ShelfTaskType.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\SlicecagePattern.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\listener\ServerConnection.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\LiuChengKaReportDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\device\Device.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\MachineService\MachineService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\DropFrameDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\listener\ClientListener.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\AbstractMachineClient.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\LoadRackDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\RawFile.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\MachineMessageDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\reportform\ReportformService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\MachineDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\UserDetails.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\galsstask\GalssTaskService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\LoadRack.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\reportform\ReportformController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Horizontal.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\PatternTaskBuffer.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\ShelfTask.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\listener\MachineClientListener.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\PreprocessingGlass.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\CutmanagedetailisDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\DongZuoTableDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\MachineDisposeDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\countmachinetask\CountMachineTaskService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTaskDetails.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\PatternTaskBufferDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskSlicecageDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\ShelfRackDao2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\TaskDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\SlicecageTemperingDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\hollowslicecage\HollowslicecageService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\ShelfRack2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\task\TaskService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\toughening\tougheningController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\PasswordDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Task.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\PreprocessingGlassDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Machines.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\ShelfRack.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\rest\RestException.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\RankDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\shelfmanager\ShelfManagerService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\TV\DropFrameTVService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\ShelfTask2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\ConnectState.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\SetupUtil.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\standalone\StandAloneController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\IdentifyError.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\IdentifyErrorDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\MessageType.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\UserDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTaskHollow.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTaskStock.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\rest\TaskRestController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\account\UserAdminController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\DropFrame4.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTaskShelf.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTaskBuffer.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\common\AbstractMessageService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\message\MessageProcessor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\DropFrame.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\standalone\StandAloneService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\MachineDispose.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\DropFrameDao4.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTaskSlicecage.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\identifymachine\IdentifyMachineController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\ProdLineState.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\mes\MesController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\hollow\HollowService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\DropFrameDao3.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskDetailsDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\SlicecagePatternDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\slicecage\SlicecageController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\UserDetailsDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\home\Test.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\GlassLayout\Algorithm\AlgorithmDBInterface.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\compound\CompoundMachineController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\Globel\mes.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\identifymachine\IdentifyMachineService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\manage\ManageController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\RawPackage.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\CRCUtil.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GalssTask.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\ping\PingController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Slicecage.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\User.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\listener\ServerListener.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\zfunc.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\account\AccountService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\MachineType.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\shelfmanager\ShelfManagerController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\shelfmanager2\ShelfManagerService2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Yuanpianpandian.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\compound\CompoundMachineService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\applicationListener\InitializeSystemApplicationListener.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\ProdLineStateDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\DropFrameDao2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\LiuChengKaReport.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\MachinesTypeDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\AbstractMachine.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\countmachine\CountMachineController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\mes\JSPController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\HorizontalDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\DropFrame3.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Fragments.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\GalssTaskDao2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\listener\AbstractServerListener.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\EdgPerimeterDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\AbstractMessage.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\MachineMessage.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\hollowslicecage\HollowSlicecageController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\shelfmanager2\ShelfManagerController2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\FunctionNumber.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\DropFrame2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\GlassColor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\MachineFont.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\GlassNumberColor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Password.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\rest\RestExceptionHandler.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\JbarcodeUtil.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\EdgPerimeter.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\RawFileDao2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\ShelfTaskFlag.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\YuanpianpandianDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\IdEntity.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\slicecage\SlicecageService.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\MachineState.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Rank.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\gaoliwei\GaoliweiController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\StateConstants.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\log\GLoggerFactory.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\PatternTaskDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\home\HomeController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\util\ExcelUtil.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\account\ProfileController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\DongZuoTable.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\MachineFontDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\RawFile2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\SqlHelper\DBHelper.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\Cutmanagedetailis.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\entity\SlicecageTempering.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\common\ServiceInterface.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao2.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\service\common\AbstractMessageProcessor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\json\JsonTimeValueProcessor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\hollow\HollowController.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\RawPackageDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\constants\WebColor.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\repository\FragmentsDao.java
-D:\workeclipse\MES_11\src\main\java\com\northglass\web\account\LoginController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineDispose.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\applicationListener\InitializeSystemApplicationListener.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\CRCUtil.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\shelfmanager\ShelfManagerController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskStock.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineDisposeDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\log\GLoggerConstants.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\reportform\ReportformService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\MachineState.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PatternTaskBufferDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\gaoliwei\GaoliweiController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PasswordDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\Globel\mes.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\ServiceInterface.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RawFileDao2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\AbstractMessageService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Rank.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\UserDetails.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\compound\CompoundMachineService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao4.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskSlicecageDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\home\Test.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\SlicecageDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\UserDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\ClientListener.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\WebColor.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\SlicecagePattern.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\GlassColor.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTask2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\SqlHelper\DBHelper.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Slicecage.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\identifymachine\IdentifyMachineController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\message\MessageProcessor.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\slicecage\SlicecageService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\hollow\HollowService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RankDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\ServerConnection.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\LoadRackDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\SlicecagePatternDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineType.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Yuanpianpandian.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\galsstask\GalssTaskController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\mes\MesController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\IdentifyErrorDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\EdgPerimeterDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\HorizontalDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfRackDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\LoginController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DongZuoTableDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Horizontal.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskHollow.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfRack2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\shelfmanager2\ShelfManagerController2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\AbstractMessageProcessor.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\zfunc.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\gaoliwei\GaoliweiMachineService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\HexUtil.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\toughening\tougheningController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\reportform\ReportformController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\account\AccountService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachinesTypeDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\EdgPerimeter.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskDetails.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\PatternTask.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Task.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfTask2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\FolderUtil.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\device\DeviceController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\device\DeviceService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\IdEntity.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\standalone\StandAloneService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\message\AbstractMessageProcessor.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\UserAdminController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame4.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\CutmanagedetailisDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\YuanpianpandianDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\ExcelUtil.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\countmachine\CountMachineController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\cutmanage\CutManageController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\cutmanage\CutManageService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\ProfileController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\IdentifyError.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao3.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskDetailsDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ProdLineState.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTask.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\User.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RawPackageDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\compound\CompoundMachineController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DongZuoTable.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\PreprocessingGlass.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\shelfmanager2\ShelfManagerService2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\UserDetailsDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\StateConstants.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineFont.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\standalone\StandAloneController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ConnectState.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Cutmanagedetailis.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PreprocessingGlassDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskSlicecage.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\galsstask\GalssTaskService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\ServiceException.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\RawFile2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\RawPackage.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\log\GLoggerFactory.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\AbstractMachineService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineMessageDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\slicecage\SlicecageController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\AbstractMachineClient.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\hollowslicecage\HollowSlicecageController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\rest\TaskRestController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\shelfmanager\ShelfManagerService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RawFileDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskStockDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\MachineService\MachineService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskBuffer.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\MachineClientListener.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\AbstractServerListener.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskDao2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\FunctionNumber.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\rest\RestException.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\SlicecageTemperingDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\SqlHelper\DBSession.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\PatternTaskBuffer.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\RawFile.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GlassNumberColorDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskShelfDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskHollowDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\LiuChengKaReportDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\device\Device.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskBufferDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Machines.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\json\JsonTimeValueProcessor.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\ping\PingController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Password.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\hollowslicecage\HollowslicecageService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Fragments.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineMessage.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\DBHelper.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\LiuChengKaReport.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\mes\JSPController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ProdLineStateDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\hollow\HollowController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\identifymachine\IdentifyMachineService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\account\ShiroDbRealm.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\SetupUtil.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\home\HomeController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\countmachinetask\CountMachineTaskService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\JbarcodeUtil.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ShelfTaskFlag.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\GlassLayout\Algorithm\AlgorithmDBInterface.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\rest\RestExceptionHandler.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\SlicecageTempering.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\toughening\tougheningService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\AbstractMessage.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfTask.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfRack.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\FragmentsDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\AbstractMachine.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\task\TaskService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\manage\ManageController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame3.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ArrangeMachineTaskType.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskShelf.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\TaskDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ShelfTaskType.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\MessageType.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfRackDao2.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\LoadRack.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\system\SystemService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\ServerListener.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\RegisterController.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineFontDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\TV\DropFrameTVService.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PatternTaskDao.java
+D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GlassNumberColor.java
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst"
index 709a204..ef7a4d2 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst"
@@ -1,6 +1,6 @@
-D:\workeclipse\MES_11\src\test\java\com\northglass\data\TaskData.java
-D:\workeclipse\MES_11\src\test\java\com\northglass\QuickStartServer.java
-D:\workeclipse\MES_11\src\test\java\com\northglass\service\account\AccountServiceTest.java
-D:\workeclipse\MES_11\src\test\java\com\northglass\data\UserData.java
-D:\workeclipse\MES_11\src\test\java\com\northglass\repository\TaskDaoTest.java
-D:\workeclipse\MES_11\src\test\java\com\northglass\repository\JpaMappingTest.java
+D:\workeclipse\ddd\MES_11\src\test\java\com\northglass\service\account\AccountServiceTest.java
+D:\workeclipse\ddd\MES_11\src\test\java\com\northglass\data\TaskData.java
+D:\workeclipse\ddd\MES_11\src\test\java\com\northglass\QuickStartServer.java
+D:\workeclipse\ddd\MES_11\src\test\java\com\northglass\repository\TaskDaoTest.java
+D:\workeclipse\ddd\MES_11\src\test\java\com\northglass\repository\JpaMappingTest.java
+D:\workeclipse\ddd\MES_11\src\test\java\com\northglass\data\UserData.java
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java"
index 83b7e82..9c49eb2 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java"
@@ -323,8 +323,6 @@
return;
out.write("\r\n");
out.write("\t\t\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_8(_jspx_page_context))
return;
@@ -336,6 +334,9 @@
if (_jspx_meth_shiro_hasRole_9(_jspx_page_context))
return;
out.write("\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_10(_jspx_page_context))
return;
@@ -344,14 +345,14 @@
if (_jspx_meth_shiro_hasRole_11(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_12(_jspx_page_context))
return;
out.write("\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_13(_jspx_page_context))
return;
@@ -360,14 +361,14 @@
if (_jspx_meth_shiro_hasRole_14(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_15(_jspx_page_context))
return;
out.write("\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_16(_jspx_page_context))
return;
@@ -376,50 +377,49 @@
if (_jspx_meth_shiro_hasRole_17(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
- out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_18(_jspx_page_context))
return;
out.write("\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_19(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_20(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t\r\n");
out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_21(_jspx_page_context))
return;
out.write("\r\n");
out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_22(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t\r\n");
out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_23(_jspx_page_context))
return;
out.write("\r\n");
out.write("\t\t\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_24(_jspx_page_context))
return;
out.write("\r\n");
out.write("\t\t\r\n");
- out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_25(_jspx_page_context))
return;
out.write("\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_26(_jspx_page_context))
@@ -430,6 +430,7 @@
if (_jspx_meth_shiro_hasRole_27(_jspx_page_context))
return;
out.write("\r\n");
+ out.write("\t\t\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_28(_jspx_page_context))
return;
@@ -458,9 +459,13 @@
if (_jspx_meth_shiro_hasRole_34(_jspx_page_context))
return;
out.write("\r\n");
- out.write("\t\t<!-- /.sidebar-menu -->\r\n");
out.write("\t\t");
if (_jspx_meth_shiro_hasRole_35(_jspx_page_context))
+ return;
+ out.write("\r\n");
+ out.write("\t\t<!-- /.sidebar-menu -->\r\n");
+ out.write("\t\t");
+ if (_jspx_meth_shiro_hasRole_36(_jspx_page_context))
return;
out.write("\r\n");
out.write("\r\n");
@@ -637,6 +642,10 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t\t<div class='menu_title'>鍒囧壊绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/cutmanage/gettask/4\"> 棰嗗彇鍥�#绾夸换鍔�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
out.write("\t\t\t\t\t<li><a href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/cutmanage/gettask/3\"> 棰嗗彇涓�#绾夸换鍔�</a></li>\r\n");
@@ -1009,8 +1018,10 @@
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/mesview/_ReportForm_merge\"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t");
- out.write("\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_Edg_Statistics?group=1\"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
out.write("\t\t\t\t\t<li><a href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/mesview/_DT_dapingxianshi\" target=\"_blank\"> 澶у睆鏄剧ず</a></li>\r\n");
@@ -1236,8 +1247,10 @@
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/mesview/_ReportForm_merge\"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t");
- out.write("\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_Edg_Statistics?group=1\"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
@@ -1784,9 +1797,84 @@
org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_8 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
_jspx_th_shiro_hasRole_8.setPageContext(_jspx_page_context);
_jspx_th_shiro_hasRole_8.setParent(null);
- _jspx_th_shiro_hasRole_8.setName("cangchu");
+ _jspx_th_shiro_hasRole_8.setName("shangpian4-1");
int _jspx_eval_shiro_hasRole_8 = _jspx_th_shiro_hasRole_8.doStartTag();
if (_jspx_eval_shiro_hasRole_8 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ do {
+ out.write("\r\n");
+ out.write("\t\t\t<div class=\"menu\" >\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>鍘熺墖浠撳偍<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/shelfmanager/rankmanager\"> 鏂欐灦绠＄悊</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/shelfmanager/shelftask\" > 浠撳偍浠诲姟淇℃伅</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_yuliao?l=3\"> 浣欐枡搴�</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t");
+ out.write("\t\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/shelfmanager/enterandexitrack\" > 杩涘嚭搴撶鐞�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\t\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>鍒囧壊绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/cutmanage/gettask/4\"> 棰嗗彇鍥�#绾夸换鍔�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>璁惧绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/device/getstatu\"> 璁惧淇℃伅</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/device/createcolor\"> 鑶滅郴绠＄悊</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\t\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>琛ョ墖<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mes/ajtab?select=all\"> 琛ョ墖</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\t\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t</div>\r\n");
+ out.write("\t\t");
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_8.doAfterBody();
+ if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
+ break;
+ } while (true);
+ }
+ if (_jspx_th_shiro_hasRole_8.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_8);
+ return true;
+ }
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_8);
+ return false;
+ }
+
+ private boolean _jspx_meth_shiro_hasRole_9(PageContext _jspx_page_context)
+ throws Throwable {
+ PageContext pageContext = _jspx_page_context;
+ JspWriter out = _jspx_page_context.getOut();
+ // shiro:hasRole
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_9 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_9.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_9.setParent(null);
+ _jspx_th_shiro_hasRole_9.setName("cangchu");
+ int _jspx_eval_shiro_hasRole_9 = _jspx_th_shiro_hasRole_9.doStartTag();
+ if (_jspx_eval_shiro_hasRole_9 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -1822,30 +1910,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_8.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_9.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_8.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_8);
+ if (_jspx_th_shiro_hasRole_9.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_9);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_8);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_9);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_9(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_10(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_9 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_9.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_9.setParent(null);
- _jspx_th_shiro_hasRole_9.setName("xiapian1");
- int _jspx_eval_shiro_hasRole_9 = _jspx_th_shiro_hasRole_9.doStartTag();
- if (_jspx_eval_shiro_hasRole_9 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_10 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_10.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_10.setParent(null);
+ _jspx_th_shiro_hasRole_10.setName("xiapian1");
+ int _jspx_eval_shiro_hasRole_10 = _jspx_th_shiro_hasRole_10.doStartTag();
+ if (_jspx_eval_shiro_hasRole_10 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -1932,30 +2020,30 @@
out.write("\t\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_9.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_10.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_9.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_9);
+ if (_jspx_th_shiro_hasRole_10.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_10);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_9);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_10);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_10(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_11(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_10 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_10.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_10.setParent(null);
- _jspx_th_shiro_hasRole_10.setName("xiapian2");
- int _jspx_eval_shiro_hasRole_10 = _jspx_th_shiro_hasRole_10.doStartTag();
- if (_jspx_eval_shiro_hasRole_10 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_11 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_11.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_11.setParent(null);
+ _jspx_th_shiro_hasRole_11.setName("xiapian2");
+ int _jspx_eval_shiro_hasRole_11 = _jspx_th_shiro_hasRole_11.doStartTag();
+ if (_jspx_eval_shiro_hasRole_11 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2042,30 +2130,30 @@
out.write("\t\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_10.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_11.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_10.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_10);
+ if (_jspx_th_shiro_hasRole_11.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_11);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_10);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_11);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_11(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_12(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_11 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_11.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_11.setParent(null);
- _jspx_th_shiro_hasRole_11.setName("xiapian3");
- int _jspx_eval_shiro_hasRole_11 = _jspx_th_shiro_hasRole_11.doStartTag();
- if (_jspx_eval_shiro_hasRole_11 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_12 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_12.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_12.setParent(null);
+ _jspx_th_shiro_hasRole_12.setName("xiapian3");
+ int _jspx_eval_shiro_hasRole_12 = _jspx_th_shiro_hasRole_12.doStartTag();
+ if (_jspx_eval_shiro_hasRole_12 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2152,30 +2240,30 @@
out.write("\t\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_11.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_12.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_11.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_11);
+ if (_jspx_th_shiro_hasRole_12.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_12);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_11);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_12);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_12(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_13(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_12 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_12.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_12.setParent(null);
- _jspx_th_shiro_hasRole_12.setName("celiang1");
- int _jspx_eval_shiro_hasRole_12 = _jspx_th_shiro_hasRole_12.doStartTag();
- if (_jspx_eval_shiro_hasRole_12 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_13 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_13.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_13.setParent(null);
+ _jspx_th_shiro_hasRole_13.setName("celiang1");
+ int _jspx_eval_shiro_hasRole_13 = _jspx_th_shiro_hasRole_13.doStartTag();
+ if (_jspx_eval_shiro_hasRole_13 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2218,30 +2306,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_12.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_13.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_12.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_12);
+ if (_jspx_th_shiro_hasRole_13.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_13);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_12);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_13);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_13(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_14(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_13 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_13.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_13.setParent(null);
- _jspx_th_shiro_hasRole_13.setName("celiang2");
- int _jspx_eval_shiro_hasRole_13 = _jspx_th_shiro_hasRole_13.doStartTag();
- if (_jspx_eval_shiro_hasRole_13 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_14 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_14.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_14.setParent(null);
+ _jspx_th_shiro_hasRole_14.setName("celiang2");
+ int _jspx_eval_shiro_hasRole_14 = _jspx_th_shiro_hasRole_14.doStartTag();
+ if (_jspx_eval_shiro_hasRole_14 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2284,30 +2372,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_13.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_14.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_13.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_13);
+ if (_jspx_th_shiro_hasRole_14.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_14);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_13);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_14);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_14(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_15(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_14 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_14.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_14.setParent(null);
- _jspx_th_shiro_hasRole_14.setName("celiang3");
- int _jspx_eval_shiro_hasRole_14 = _jspx_th_shiro_hasRole_14.doStartTag();
- if (_jspx_eval_shiro_hasRole_14 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_15 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_15.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_15.setParent(null);
+ _jspx_th_shiro_hasRole_15.setName("celiang3");
+ int _jspx_eval_shiro_hasRole_15 = _jspx_th_shiro_hasRole_15.doStartTag();
+ if (_jspx_eval_shiro_hasRole_15 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2352,30 +2440,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_14.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_15.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_14.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_14);
+ if (_jspx_th_shiro_hasRole_15.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_15);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_14);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_15);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_15(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_16(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_15 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_15.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_15.setParent(null);
- _jspx_th_shiro_hasRole_15.setName("lipian1");
- int _jspx_eval_shiro_hasRole_15 = _jspx_th_shiro_hasRole_15.doStartTag();
- if (_jspx_eval_shiro_hasRole_15 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_16 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_16.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_16.setParent(null);
+ _jspx_th_shiro_hasRole_16.setName("lipian1");
+ int _jspx_eval_shiro_hasRole_16 = _jspx_th_shiro_hasRole_16.doStartTag();
+ if (_jspx_eval_shiro_hasRole_16 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2410,30 +2498,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_15.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_16.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_15.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_15);
+ if (_jspx_th_shiro_hasRole_16.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_16);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_15);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_16);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_16(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_17(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_16 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_16.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_16.setParent(null);
- _jspx_th_shiro_hasRole_16.setName("lipian2");
- int _jspx_eval_shiro_hasRole_16 = _jspx_th_shiro_hasRole_16.doStartTag();
- if (_jspx_eval_shiro_hasRole_16 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_17 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_17.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_17.setParent(null);
+ _jspx_th_shiro_hasRole_17.setName("lipian2");
+ int _jspx_eval_shiro_hasRole_17 = _jspx_th_shiro_hasRole_17.doStartTag();
+ if (_jspx_eval_shiro_hasRole_17 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2468,30 +2556,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_16.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_17.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_16.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_16);
+ if (_jspx_th_shiro_hasRole_17.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_17);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_16);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_17);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_17(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_18(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_17 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_17.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_17.setParent(null);
- _jspx_th_shiro_hasRole_17.setName("lipian3");
- int _jspx_eval_shiro_hasRole_17 = _jspx_th_shiro_hasRole_17.doStartTag();
- if (_jspx_eval_shiro_hasRole_17 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_18 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_18.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_18.setParent(null);
+ _jspx_th_shiro_hasRole_18.setName("lipian3");
+ int _jspx_eval_shiro_hasRole_18 = _jspx_th_shiro_hasRole_18.doStartTag();
+ if (_jspx_eval_shiro_hasRole_18 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2526,42 +2614,6 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_17.doAfterBody();
- if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
- break;
- } while (true);
- }
- if (_jspx_th_shiro_hasRole_17.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_17);
- return true;
- }
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_17);
- return false;
- }
-
- private boolean _jspx_meth_shiro_hasRole_18(PageContext _jspx_page_context)
- throws Throwable {
- PageContext pageContext = _jspx_page_context;
- JspWriter out = _jspx_page_context.getOut();
- // shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_18 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_18.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_18.setParent(null);
- _jspx_th_shiro_hasRole_18.setName("luojiaxianshi3");
- int _jspx_eval_shiro_hasRole_18 = _jspx_th_shiro_hasRole_18.doStartTag();
- if (_jspx_eval_shiro_hasRole_18 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
- do {
- out.write("\r\n");
- out.write("\t\t\t<div class=\"menu\" >\r\n");
- out.write("\t\t\t\t<div class='menu_title'>涓嬬墖<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
- out.write("\t\t\t\t<ul class='test'>\r\n");
- out.write("\t\t\t\t\t<li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/mes/weihu?line=3&segment=L\"> 钀芥灦鏄剧ず</a></li>\t\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\t\t\r\n");
- out.write("\t\t\t\t</ul>\r\n");
- out.write("\t\t\t</div>\r\n");
- out.write("\t\t");
int evalDoAfterBody = _jspx_th_shiro_hasRole_18.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
@@ -2583,9 +2635,45 @@
org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_19 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
_jspx_th_shiro_hasRole_19.setPageContext(_jspx_page_context);
_jspx_th_shiro_hasRole_19.setParent(null);
- _jspx_th_shiro_hasRole_19.setName("guanliyuan1");
+ _jspx_th_shiro_hasRole_19.setName("luojiaxianshi3");
int _jspx_eval_shiro_hasRole_19 = _jspx_th_shiro_hasRole_19.doStartTag();
if (_jspx_eval_shiro_hasRole_19 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ do {
+ out.write("\r\n");
+ out.write("\t\t\t<div class=\"menu\" >\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>涓嬬墖<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mes/weihu?line=3&segment=L\"> 钀芥灦鏄剧ず</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\t\t\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t</div>\r\n");
+ out.write("\t\t");
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_19.doAfterBody();
+ if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
+ break;
+ } while (true);
+ }
+ if (_jspx_th_shiro_hasRole_19.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_19);
+ return true;
+ }
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_19);
+ return false;
+ }
+
+ private boolean _jspx_meth_shiro_hasRole_20(PageContext _jspx_page_context)
+ throws Throwable {
+ PageContext pageContext = _jspx_page_context;
+ JspWriter out = _jspx_page_context.getOut();
+ // shiro:hasRole
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_20 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_20.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_20.setParent(null);
+ _jspx_th_shiro_hasRole_20.setName("guanliyuan1");
+ int _jspx_eval_shiro_hasRole_20 = _jspx_th_shiro_hasRole_20.doStartTag();
+ if (_jspx_eval_shiro_hasRole_20 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2642,8 +2730,10 @@
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/mesview/_ReportForm_merge\"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t");
- out.write("\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_Edg_Statistics?group=1\"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
out.write("\t\t\t\t\t<li><a href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/mesview/_DT_dapingxianshi\" target=\"_blank\"> 澶у睆鏄剧ず</a></li>\r\n");
@@ -2656,58 +2746,6 @@
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
out.write("/identifymachine/password\"> 淇敼瀵嗙爜</a></li>\t\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
- out.write("\t\t\t\t</ul>\r\n");
- out.write("\t\t\t</div>\r\n");
- out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_19.doAfterBody();
- if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
- break;
- } while (true);
- }
- if (_jspx_th_shiro_hasRole_19.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_19);
- return true;
- }
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_19);
- return false;
- }
-
- private boolean _jspx_meth_shiro_hasRole_20(PageContext _jspx_page_context)
- throws Throwable {
- PageContext pageContext = _jspx_page_context;
- JspWriter out = _jspx_page_context.getOut();
- // shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_20 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_20.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_20.setParent(null);
- _jspx_th_shiro_hasRole_20.setName("qiegebaobiao1");
- int _jspx_eval_shiro_hasRole_20 = _jspx_th_shiro_hasRole_20.doStartTag();
- if (_jspx_eval_shiro_hasRole_20 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
- do {
- out.write("\r\n");
- out.write("\t\t\t<div class=\"menu\" >\r\n");
- out.write("\t\t\t\t<div class='menu_title'>鎶ヨ〃绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
- out.write("\t\t\t\t<ul class='test'>\r\n");
- out.write("\t\t\t\t\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\r\n");
- out.write("\t\t\t\t\t<li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/mesview/_ReportForm?rfName=鍒囧壊鏄庣粏\"> 鍒囧壊鏄庣粏鎶ヨ〃</a></li>\t\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t<li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/reportform/cutmanagerepoortform1\"> 鍒囧壊鎬绘姤琛�</a></li>\t\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t<li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/reportform/cutmanagerepoortform2\"> 鍒囧壊鍗曠墖鎶ヨ〃</a></li>\t\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t<li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/mesview/_ReportForm_merge\"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
- out.write("\t\t\t\t\t");
- out.write("\r\n");
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
@@ -2732,9 +2770,63 @@
org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_21 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
_jspx_th_shiro_hasRole_21.setPageContext(_jspx_page_context);
_jspx_th_shiro_hasRole_21.setParent(null);
- _jspx_th_shiro_hasRole_21.setName("ganghuaqian1");
+ _jspx_th_shiro_hasRole_21.setName("qiegebaobiao1");
int _jspx_eval_shiro_hasRole_21 = _jspx_th_shiro_hasRole_21.doStartTag();
if (_jspx_eval_shiro_hasRole_21 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ do {
+ out.write("\r\n");
+ out.write("\t\t\t<div class=\"menu\" >\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>鎶ヨ〃绠＄悊<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\t\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_ReportForm?rfName=鍒囧壊鏄庣粏\"> 鍒囧壊鏄庣粏鎶ヨ〃</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/reportform/cutmanagerepoortform1\"> 鍒囧壊鎬绘姤琛�</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/reportform/cutmanagerepoortform2\"> 鍒囧壊鍗曠墖鎶ヨ〃</a></li>\t\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_ReportForm_merge\"> 鍘熺墖鍒囪鐜囨姤琛�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_Edg_Statistics?group=1\"> 纾ㄨ竟寮�鍚堟姤琛�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t</div>\r\n");
+ out.write("\t\t");
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_21.doAfterBody();
+ if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
+ break;
+ } while (true);
+ }
+ if (_jspx_th_shiro_hasRole_21.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_21);
+ return true;
+ }
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_21);
+ return false;
+ }
+
+ private boolean _jspx_meth_shiro_hasRole_22(PageContext _jspx_page_context)
+ throws Throwable {
+ PageContext pageContext = _jspx_page_context;
+ JspWriter out = _jspx_page_context.getOut();
+ // shiro:hasRole
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_22 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_22.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_22.setParent(null);
+ _jspx_th_shiro_hasRole_22.setName("ganghuaqian1");
+ int _jspx_eval_shiro_hasRole_22 = _jspx_th_shiro_hasRole_22.doStartTag();
+ if (_jspx_eval_shiro_hasRole_22 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2773,30 +2865,30 @@
out.write("\t\t\t\t\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_21.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_22.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_21.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_21);
+ if (_jspx_th_shiro_hasRole_22.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_22);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_21);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_22);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_22(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_23(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_22 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_22.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_22.setParent(null);
- _jspx_th_shiro_hasRole_22.setName("ganghuaqian2");
- int _jspx_eval_shiro_hasRole_22 = _jspx_th_shiro_hasRole_22.doStartTag();
- if (_jspx_eval_shiro_hasRole_22 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_23 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_23.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_23.setParent(null);
+ _jspx_th_shiro_hasRole_23.setName("ganghuaqian2");
+ int _jspx_eval_shiro_hasRole_23 = _jspx_th_shiro_hasRole_23.doStartTag();
+ if (_jspx_eval_shiro_hasRole_23 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" > \t\r\n");
@@ -2835,30 +2927,30 @@
out.write("\t\t\t\t\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_22.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_23.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_22.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_22);
+ if (_jspx_th_shiro_hasRole_23.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_23);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_22);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_23);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_23(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_24(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_23 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_23.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_23.setParent(null);
- _jspx_th_shiro_hasRole_23.setName("ganghuahou1");
- int _jspx_eval_shiro_hasRole_23 = _jspx_th_shiro_hasRole_23.doStartTag();
- if (_jspx_eval_shiro_hasRole_23 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_24 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_24.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_24.setParent(null);
+ _jspx_th_shiro_hasRole_24.setName("ganghuahou1");
+ int _jspx_eval_shiro_hasRole_24 = _jspx_th_shiro_hasRole_24.doStartTag();
+ if (_jspx_eval_shiro_hasRole_24 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2893,30 +2985,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_23.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_24.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_23.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_23);
+ if (_jspx_th_shiro_hasRole_24.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_24);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_23);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_24);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_24(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_25(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_24 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_24.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_24.setParent(null);
- _jspx_th_shiro_hasRole_24.setName("ganghuahou2");
- int _jspx_eval_shiro_hasRole_24 = _jspx_th_shiro_hasRole_24.doStartTag();
- if (_jspx_eval_shiro_hasRole_24 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_25 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_25.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_25.setParent(null);
+ _jspx_th_shiro_hasRole_25.setName("ganghuahou2");
+ int _jspx_eval_shiro_hasRole_25 = _jspx_th_shiro_hasRole_25.doStartTag();
+ if (_jspx_eval_shiro_hasRole_25 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -2950,30 +3042,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_24.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_25.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_24.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_24);
+ if (_jspx_th_shiro_hasRole_25.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_25);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_24);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_25);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_25(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_26(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_25 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_25.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_25.setParent(null);
- _jspx_th_shiro_hasRole_25.setName("cangchu2");
- int _jspx_eval_shiro_hasRole_25 = _jspx_th_shiro_hasRole_25.doStartTag();
- if (_jspx_eval_shiro_hasRole_25 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_26 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_26.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_26.setParent(null);
+ _jspx_th_shiro_hasRole_26.setName("cangchu2");
+ int _jspx_eval_shiro_hasRole_26 = _jspx_th_shiro_hasRole_26.doStartTag();
+ if (_jspx_eval_shiro_hasRole_26 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3000,30 +3092,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_25.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_26.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_25.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_25);
+ if (_jspx_th_shiro_hasRole_26.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_26);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_25);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_26);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_26(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_27(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_26 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_26.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_26.setParent(null);
- _jspx_th_shiro_hasRole_26.setName("diaozhuangwei2");
- int _jspx_eval_shiro_hasRole_26 = _jspx_th_shiro_hasRole_26.doStartTag();
- if (_jspx_eval_shiro_hasRole_26 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_27 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_27.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_27.setParent(null);
+ _jspx_th_shiro_hasRole_27.setName("diaozhuangwei2");
+ int _jspx_eval_shiro_hasRole_27 = _jspx_th_shiro_hasRole_27.doStartTag();
+ if (_jspx_eval_shiro_hasRole_27 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3062,30 +3154,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_26.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_27.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_26.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_26);
+ if (_jspx_th_shiro_hasRole_27.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_27);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_26);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_27);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_27(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_28(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_27 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_27.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_27.setParent(null);
- _jspx_th_shiro_hasRole_27.setName("zhongkonglipian");
- int _jspx_eval_shiro_hasRole_27 = _jspx_th_shiro_hasRole_27.doStartTag();
- if (_jspx_eval_shiro_hasRole_27 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_28 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_28.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_28.setParent(null);
+ _jspx_th_shiro_hasRole_28.setName("zhongkonglipian");
+ int _jspx_eval_shiro_hasRole_28 = _jspx_th_shiro_hasRole_28.doStartTag();
+ if (_jspx_eval_shiro_hasRole_28 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3119,30 +3211,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_27.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_28.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_27.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_27);
+ if (_jspx_th_shiro_hasRole_28.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_28);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_27);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_28);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_28(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_29(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_28 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_28.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_28.setParent(null);
- _jspx_th_shiro_hasRole_28.setName("zhongkong1");
- int _jspx_eval_shiro_hasRole_28 = _jspx_th_shiro_hasRole_28.doStartTag();
- if (_jspx_eval_shiro_hasRole_28 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_29 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_29.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_29.setParent(null);
+ _jspx_th_shiro_hasRole_29.setName("zhongkong1");
+ int _jspx_eval_shiro_hasRole_29 = _jspx_th_shiro_hasRole_29.doStartTag();
+ if (_jspx_eval_shiro_hasRole_29 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3173,30 +3265,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_28.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_29.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_28.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_28);
+ if (_jspx_th_shiro_hasRole_29.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_29);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_28);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_29);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_29(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_30(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_29 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_29.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_29.setParent(null);
- _jspx_th_shiro_hasRole_29.setName("zhongkong2");
- int _jspx_eval_shiro_hasRole_29 = _jspx_th_shiro_hasRole_29.doStartTag();
- if (_jspx_eval_shiro_hasRole_29 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_30 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_30.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_30.setParent(null);
+ _jspx_th_shiro_hasRole_30.setName("zhongkong2");
+ int _jspx_eval_shiro_hasRole_30 = _jspx_th_shiro_hasRole_30.doStartTag();
+ if (_jspx_eval_shiro_hasRole_30 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3227,30 +3319,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_29.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_30.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_29.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_29);
+ if (_jspx_th_shiro_hasRole_30.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_30);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_29);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_30);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_30(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_31(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_30 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_30.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_30.setParent(null);
- _jspx_th_shiro_hasRole_30.setName("zhongkong3");
- int _jspx_eval_shiro_hasRole_30 = _jspx_th_shiro_hasRole_30.doStartTag();
- if (_jspx_eval_shiro_hasRole_30 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_31 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_31.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_31.setParent(null);
+ _jspx_th_shiro_hasRole_31.setName("zhongkong3");
+ int _jspx_eval_shiro_hasRole_31 = _jspx_th_shiro_hasRole_31.doStartTag();
+ if (_jspx_eval_shiro_hasRole_31 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3280,30 +3372,30 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_30.doAfterBody();
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_31.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
} while (true);
}
- if (_jspx_th_shiro_hasRole_30.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_30);
+ if (_jspx_th_shiro_hasRole_31.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_31);
return true;
}
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_30);
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_31);
return false;
}
- private boolean _jspx_meth_shiro_hasRole_31(PageContext _jspx_page_context)
+ private boolean _jspx_meth_shiro_hasRole_32(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
JspWriter out = _jspx_page_context.getOut();
// shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_31 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_31.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_31.setParent(null);
- _jspx_th_shiro_hasRole_31.setName("zhongkong4");
- int _jspx_eval_shiro_hasRole_31 = _jspx_th_shiro_hasRole_31.doStartTag();
- if (_jspx_eval_shiro_hasRole_31 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_32 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_32.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_32.setParent(null);
+ _jspx_th_shiro_hasRole_32.setName("zhongkong4");
+ int _jspx_eval_shiro_hasRole_32 = _jspx_th_shiro_hasRole_32.doStartTag();
+ if (_jspx_eval_shiro_hasRole_32 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
@@ -3333,42 +3425,6 @@
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
out.write("\t\t");
- int evalDoAfterBody = _jspx_th_shiro_hasRole_31.doAfterBody();
- if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
- break;
- } while (true);
- }
- if (_jspx_th_shiro_hasRole_31.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_31);
- return true;
- }
- _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_31);
- return false;
- }
-
- private boolean _jspx_meth_shiro_hasRole_32(PageContext _jspx_page_context)
- throws Throwable {
- PageContext pageContext = _jspx_page_context;
- JspWriter out = _jspx_page_context.getOut();
- // shiro:hasRole
- org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_32 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
- _jspx_th_shiro_hasRole_32.setPageContext(_jspx_page_context);
- _jspx_th_shiro_hasRole_32.setParent(null);
- _jspx_th_shiro_hasRole_32.setName("zhewan1");
- int _jspx_eval_shiro_hasRole_32 = _jspx_th_shiro_hasRole_32.doStartTag();
- if (_jspx_eval_shiro_hasRole_32 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
- do {
- out.write("\r\n");
- out.write("\t\t\t<div class=\"menu\" >\r\n");
- out.write("\t\t\t\t<div class='menu_title'>鎶樺集<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
- out.write("\t\t\t\t<ul class='test'>\r\n");
- out.write("\t\t\t\t\t<li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/mesview/_WG_Xianshi?group=1\"> 涓┖1#鎶樺集</a></li>\r\n");
- out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
- out.write("\t\t\t\t</ul>\r\n");
- out.write("\t\t\t</div>\r\n");
- out.write("\t\t");
int evalDoAfterBody = _jspx_th_shiro_hasRole_32.doAfterBody();
if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
break;
@@ -3390,7 +3446,7 @@
org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_33 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
_jspx_th_shiro_hasRole_33.setPageContext(_jspx_page_context);
_jspx_th_shiro_hasRole_33.setParent(null);
- _jspx_th_shiro_hasRole_33.setName("zhewan2");
+ _jspx_th_shiro_hasRole_33.setName("zhewan1");
int _jspx_eval_shiro_hasRole_33 = _jspx_th_shiro_hasRole_33.doStartTag();
if (_jspx_eval_shiro_hasRole_33 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
@@ -3400,7 +3456,7 @@
out.write("\t\t\t\t<ul class='test'>\r\n");
out.write("\t\t\t\t\t<li><a href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/mesview/_WG_Xianshi?group=2\"> 涓┖2#鎶樺集</a></li>\r\n");
+ out.write("/mesview/_WG_Xianshi?group=1\"> 涓┖1#鎶樺集</a></li>\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
@@ -3426,7 +3482,7 @@
org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_34 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
_jspx_th_shiro_hasRole_34.setPageContext(_jspx_page_context);
_jspx_th_shiro_hasRole_34.setParent(null);
- _jspx_th_shiro_hasRole_34.setName("zhewan3");
+ _jspx_th_shiro_hasRole_34.setName("zhewan2");
int _jspx_eval_shiro_hasRole_34 = _jspx_th_shiro_hasRole_34.doStartTag();
if (_jspx_eval_shiro_hasRole_34 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
@@ -3436,7 +3492,7 @@
out.write("\t\t\t\t<ul class='test'>\r\n");
out.write("\t\t\t\t\t<li><a href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/mesview/_WG_Xianshi?group=3\"> 涓┖3#鎶樺集</a></li>\r\n");
+ out.write("/mesview/_WG_Xianshi?group=2\"> 涓┖2#鎶樺集</a></li>\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
@@ -3462,15 +3518,17 @@
org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_35 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
_jspx_th_shiro_hasRole_35.setPageContext(_jspx_page_context);
_jspx_th_shiro_hasRole_35.setParent(null);
- _jspx_th_shiro_hasRole_35.setName("jiajiaoxian");
+ _jspx_th_shiro_hasRole_35.setName("zhewan3");
int _jspx_eval_shiro_hasRole_35 = _jspx_th_shiro_hasRole_35.doStartTag();
if (_jspx_eval_shiro_hasRole_35 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
do {
out.write("\r\n");
out.write("\t\t\t<div class=\"menu\" >\r\n");
- out.write("\t\t\t\t<div class='menu_title'>澶硅兌<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>鎶樺集<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
out.write("\t\t\t\t<ul class='test'>\r\n");
- out.write("\t\t\t\t\t<li><a href=\"http://10.12.0.104:8080/GERP/pp/shengchanbaobiao/HTML/fenjiachanliangchaxun.jsp?gx=澶瑰眰\"> 澶硅兌绾�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
+ out.write("/mesview/_WG_Xianshi?group=3\"> 涓┖3#鎶樺集</a></li>\r\n");
out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
out.write("\t\t\t\t</ul>\r\n");
out.write("\t\t\t</div>\r\n");
@@ -3488,6 +3546,40 @@
return false;
}
+ private boolean _jspx_meth_shiro_hasRole_36(PageContext _jspx_page_context)
+ throws Throwable {
+ PageContext pageContext = _jspx_page_context;
+ JspWriter out = _jspx_page_context.getOut();
+ // shiro:hasRole
+ org.apache.shiro.web.tags.HasRoleTag _jspx_th_shiro_hasRole_36 = (org.apache.shiro.web.tags.HasRoleTag) _jspx_tagPool_shiro_hasRole_name.get(org.apache.shiro.web.tags.HasRoleTag.class);
+ _jspx_th_shiro_hasRole_36.setPageContext(_jspx_page_context);
+ _jspx_th_shiro_hasRole_36.setParent(null);
+ _jspx_th_shiro_hasRole_36.setName("jiajiaoxian");
+ int _jspx_eval_shiro_hasRole_36 = _jspx_th_shiro_hasRole_36.doStartTag();
+ if (_jspx_eval_shiro_hasRole_36 != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {
+ do {
+ out.write("\r\n");
+ out.write("\t\t\t<div class=\"menu\" >\r\n");
+ out.write("\t\t\t\t<div class='menu_title'>澶硅兌<span class='indicator' id='indicator'>鈻�</span></div>\r\n");
+ out.write("\t\t\t\t<ul class='test'>\r\n");
+ out.write("\t\t\t\t\t<li><a href=\"http://10.12.0.104:8080/GERP/pp/shengchanbaobiao/HTML/fenjiachanliangchaxun.jsp?gx=澶瑰眰\"> 澶硅兌绾�</a></li>\r\n");
+ out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
+ out.write("\t\t\t\t</ul>\r\n");
+ out.write("\t\t\t</div>\r\n");
+ out.write("\t\t");
+ int evalDoAfterBody = _jspx_th_shiro_hasRole_36.doAfterBody();
+ if (evalDoAfterBody != javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN)
+ break;
+ } while (true);
+ }
+ if (_jspx_th_shiro_hasRole_36.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_36);
+ return true;
+ }
+ _jspx_tagPool_shiro_hasRole_name.reuse(_jspx_th_shiro_hasRole_36);
+ return false;
+ }
+
private boolean _jspx_meth_sitemesh_body_0(PageContext _jspx_page_context)
throws Throwable {
PageContext pageContext = _jspx_page_context;
--
Gitblit v1.8.0