廖井涛
2025-05-26 3a975df5b368bc68ee7a81d34920b209f2ff607b
提交
38个文件已修改
2907 ■■■■ 已修改文件
河北望美项目/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/repository/HorizontalDao.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskBufferDao.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/repository/RawFileDao.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/repository/SlicecageDao.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java 369 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/service/device/DeviceService.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java 121 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/resources/application.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/layouts/left.jsp 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/countmachine/countmachinerack.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/Edg_Statistics.jsp 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/reportform/cutmanagerepoortform1.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/reportform/shelfreportform.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp 161 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/classes/application.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/countmachine/countmachinerack.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/public_manage.jsp 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_yuanpiankucun.jsp 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DT_dapingxianshi.jsp 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/cutmanagerepoortform1.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/reportform/shelfreportform.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/shelfmanager/shelftask.jsp 161 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/maven-archiver/pom.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 368 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java 826 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/cutmanage/gotasks_jsp.java 499 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java
@@ -25,6 +25,9 @@
    @Query("select count(t) from GalssTask t where t.workProcedure='理片'  and t.patternTask.groups=?1 ")
    public int finlipian(Long groups);
    
    @Query("select count(t) from GalssTask t where t.workProcedure='理片'  and t.engineeringId=?1 ")
    public int finlipian2(String engineeringId);
    @Query("select t from GalssTask t where t.workProcedure='下片' and t.workState=?1 and t.patternTask.groups=?2")
    public List<GalssTask> findByCounttask(String state,Long groups);
    
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/HorizontalDao.java
@@ -19,4 +19,7 @@
    
    @Query("select count(t) from Horizontal t where t.gourp=?1 and t.state='使用中' or t.state='出库中' or t.state='进库中'")
    public int findfall2(Long groups);
    @Query(nativeQuery=true,value="select count(*) from gmms_horizontal s left join gmms_galss_task gt on gt.processcard_id=s.processcard_id where engineering_id=?1 and s.state='使用中';")
    public int findfall3(String engineeringid);
}
ºÓ±±ÍûÃÀÏîÄ¿/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);
}
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java
@@ -30,8 +30,11 @@
    @Query("select t from PatternTask t where t.workState='已完成' and  t.groups=?1")
    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")
    @Query("select t from PatternTask t where  t.groups=?1 order by t.id")
    public List<PatternTask> findIdGroup(Long groups);
    
    @Query("select t from PatternTask t where  t.groups=?1 group by t.rawWidth,t.rawHeight,t.rawThickness,t.color")
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/RawFileDao.java
@@ -20,6 +20,9 @@
    @Query("select t from RawFile t where t.state = '已领取' and t.operator=?1")
    public RawFile findAcceptedByGroup(Long operator);
    
    @Query("select t from RawFile t where  t.id=?1")
    public RawFile findAcceptedByGroup2(Long id);
    @Query("select t from RawFile t where t.state = '已下发' and (t.operator=?1 or t.operator=0)")
    public List<RawFile> findAcceptedByGroups(Long operator);
    
@@ -27,6 +30,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);
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/SlicecageDao.java
@@ -1,10 +1,12 @@
package com.northglass.repository;
import java.util.Date;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import com.northglass.entity.GalssTaskDetails;
import com.northglass.entity.ShelfTask;
import com.northglass.entity.Slicecage;
@@ -18,4 +20,7 @@
    
    @Query("select t from Slicecage t where t.id=?1 ")
    public Slicecage findById(long id);
    @Query(nativeQuery=true,value="select count(*) from gmms_slicecage s left join gmms_galss_task gt on gt.processcard_id=s.processcard_id where engineering_id=?1 and s.state='使用中';")
    public int findfall3(String engineeringid);
}
ºÓ±±ÍûÃÀÏîÄ¿/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,41 +211,75 @@
            
            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);
                 if(rawFileDao.findIdGroup1(Long.valueOf(prodLine))==null){
                     model.addAttribute("state", 0);
                 }else{
                     model.addAttribute("state", 1);
                 }
                    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) {
            StringBuffer html = new StringBuffer();
            List<RawFile> rawPackageslist = rawFileDao.findAcceptedByGroups(Long.valueOf(prodLine));
            int num = 1;
            for (RawFile rawPackages : rawPackageslist) {
                int galssTaskcount = galssTaskBufferDao.findbygalsstaskcount(rawPackages.getFileName());
                int patterTaskcount = patternTaskBufferDao.findbypattertaskcount(rawPackages.getFileName());
                 html.append("<tr>");
                 html.append("<td>").append(num++).append("</td>");
                 html.append("<td>").append(rawPackages.getId()).append("</td>");
                 html.append("<td>").append(rawPackages.getFileName()).append("</td>");
                /* html.append("<td>").append(rawPackages.getWidth()).append("</td>");
                 html.append("<td>").append(rawPackages.getHeight()).append("</td>");
                 html.append("<td>").append(rawPackages.getThickness()).append("</td>");*/
                 html.append("<td>").append(galssTaskcount).append("</td>");
                 html.append("<td>").append(patterTaskcount).append("</td>");
                 html.append("<td>").append(rawPackages.getState()).append("</td>");
                 html.append("<td><a href='/gmms2/cutmanage/gottask/").append(rawPackages.getId()).append("/")
                  .append(prodLine).append("'>领取任务</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
@@ -291,7 +329,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 +337,77 @@
        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();
                if(ret==100){
            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);
                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);
                }*/
                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";
@@ -476,33 +547,52 @@
    }
    
    //结束任务
    public String delecttask(Long operator) {
        RawFile rawFile=rawFileDao.findAcceptedByGroup(operator);
        int lipiancount =galssTaskDao.finlipian(operator);
    public String delecttask(Long id,Long line) {
        RawFile rawFile=rawFileDao.findAcceptedByGroup2(id);
        int lipiancount =galssTaskDao.finlipian2(rawFile.getFileName());
        
        int slicecount;
        if (operator==1) {
             slicecount=horizontalDao.findfall2(operator);
        if (line==1) {
             slicecount=horizontalDao.findfall3(rawFile.getFileName());
             //System.out.println(slicecount);
        }else if(line==4){
            slicecount=0;
        }else{
            slicecount=slicecageDao.findfall2(operator);
            slicecount=slicecageDao.findfall3(rawFile.getFileName());
        }
        System.out.println(lipiancount);
        System.out.println(slicecount);
        System.out.println(rawFile.getFileName());
        if(lipiancount>0||slicecount>0){
            return "redirect:cutmanage/gettasks";
        }else{
            Connection conn=DeviceService.getConnection();
            try{
                
                CallableStatement c=conn.prepareCall("{call workmanship(?)}");
                c.setLong(1,operator);
                c.execute();
                c.close();
                if(line==4){
                    CallableStatement c=conn.prepareCall("{call GalssTaskStop4(?,?)}");
                    c.setLong(1,line);
                    c.setLong(2,1);
                    c.execute();
                    c.close();
                }else{
                    CallableStatement c=conn.prepareCall("{call workmanship(?)}");
                    c.setLong(1,line);
                    c.execute();
                    c.close();
                    
                rawFile.setState("已完成");
                rawFile.setReceiveTime(new Date());
                galssTaskDao.deleteGlassTask(rawFile.getFileName());
                patternTaskDao.deletepatternTask(rawFile.getId());
                    rawFile.setState("已完成");
                    rawFile.setReceiveTime(new Date());
                    galssTaskDao.deleteGlassTask(rawFile.getFileName());
                    patternTaskDao.deletepatternTask(rawFile.getId());
                    RawFile rawFile1=rawFileDao.findIdGroup1(line);
                    if(rawFile1!=null){
                        rawFile1.setState("已领取");
                    }
                }
                return "redirect:cutmanage/gettasks";            
            } catch (SQLException e) {
                e.printStackTrace();
@@ -516,16 +606,18 @@
    
    
    //中断任务
    public String delecttask1(Long operator) {
        RawFile rawFile=rawFileDao.findAcceptedByGroup(operator);
        int lipiancount =galssTaskDao.finlipian(operator);
    public String delecttask1(Long id,Long line) {
        RawFile rawFile=rawFileDao.findAcceptedByGroup2(id);
        int lipiancount =galssTaskDao.finlipian2(rawFile.getFileName());
        
        int slicecount;
        if (operator==1) {
             slicecount=horizontalDao.findfall2(operator);
        if (line==1) {
             slicecount=horizontalDao.findfall3(rawFile.getFileName());
             //System.out.println(slicecount);
        }else if(line==4){
            slicecount=0;
        }else{
            slicecount=slicecageDao.findfall2(operator);
            slicecount=slicecageDao.findfall3(rawFile.getFileName());
        }
        if(lipiancount>0||slicecount>0){
            return "redirect:cutmanage/gettasks";
@@ -533,17 +625,31 @@
            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(line==4){
                    CallableStatement c=conn.prepareCall("{call GalssTaskStop4(?,?)}");
                    c.setLong(1,line);
                    c.setLong(2,2);
                    c.execute();
                    c.close();
                }else{
                    CallableStatement c=conn.prepareCall("{call interrupttask(?,?)}");
                    c.setString(1,rawFile.getFileName());
                    c.setLong(2,line);
                    c.execute();
                    c.close();
                    rawFile.setState("中断");
                    rawFile.setReceiveTime(new Date());
                    galssTaskDao.deleteGlassTask(rawFile.getFileName());
                    patternTaskDao.deletepatternTask(rawFile.getId());
                    RawFile rawFile1=rawFileDao.findIdGroup1(line);
                    if(rawFile1!=null){
                        rawFile1.setState("已领取");
                    }
                }
                return "redirect:cutmanage/gettasks";
            } catch (SQLException e) {
                e.printStackTrace();
                return "redirect:cutmanage/gettasks";    
@@ -634,18 +740,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 +764,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("&nbsp<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("&nbsp<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("&nbsp<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 +826,31 @@
            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("&nbsp<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(")'>修改数量</button>");
            html.append("</tr>");
        }
            
@@ -712,6 +871,14 @@
        return html.toString();
    }
    
    public void updatepieces(Long id,String pieces) {
        PatternTask patternTask=patternTaskDao.findOne(id);
        if(patternTask!=null){
            patternTask.setContent(pieces);
            patternTaskDao.save(patternTask);
        }
    }
    
    public void updatetask(Long id) {
        PatternTask patternTask=patternTaskDao.findOne(id);
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/service/device/DeviceService.java
@@ -122,10 +122,10 @@
        MessageProcessor.generateReturnMessage(str,Machine);
    }
    public void connect() {
//        List<Machines> shelf67=machineDao.findAll();
//        for (Machines machines : shelf67) {
//            machineService.connect(machines);
//        }
/*        List<Machines> shelf67=machineDao.findAll();
        for (Machines machines : shelf67) {
            machineService.connect(machines);
        }*/
//        Machines Machine=machineDao.findOne(75L);
//        machineService.connect(Machine);
//        Machines Machine=machineDao.findOne(38L);
@@ -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:3307/gmms","root","");
        } catch (SQLException e) {
            e.printStackTrace();
        }
ºÓ±±ÍûÃÀÏîÄ¿/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";
ºÓ±±ÍûÃÀÏîÄ¿/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);
                        }
ºÓ±±ÍûÃÀÏîÄ¿/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);
    }
@@ -102,9 +103,9 @@
    }
    
    //结束任务
    @RequestMapping(method=RequestMethod.GET,value="/delecttask/{id}")
    public String delecttask(Model model,@PathVariable("id") Long id){
        return cutManageService.delecttask(id);
    @RequestMapping(method=RequestMethod.GET,value="/delecttask/{id}/{line}")
    public String delecttask(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask(id,line);
    }
    
    @RequestMapping(method=RequestMethod.POST, value="/updatedengluname")
@@ -115,9 +116,9 @@
    }
    
    //中断任务
    @RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}")
    public String delecttask1(Model model,@PathVariable("id") Long id){
        return cutManageService.delecttask1(id);
    @RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}/{line}")
    public String delecttask1(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask1(id,line);
    }    
    
@@ -159,6 +160,13 @@
         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("pieces"));
        return true;
    }
     @RequestMapping(method=RequestMethod.POST, value="/updatetask")
    @ResponseBody
    public boolean updatetask(HttpServletRequest request, Model model) {
ºÓ±±ÍûÃÀÏîÄ¿/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:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
ºÓ±±ÍûÃÀÏîÄ¿/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">&nbsp;&nbsp;&nbsp;&nbsp;领取四#线任务</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/cutmanage/gettask/3">&nbsp;&nbsp;&nbsp;&nbsp;领取三#线任务</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/cutmanage/gettask/1">&nbsp;&nbsp;&nbsp;&nbsp;领取一#线任务</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">&nbsp;&nbsp;&nbsp;&nbsp;料架管理</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/shelfmanager/shelftask" >&nbsp;&nbsp;&nbsp;&nbsp;仓储任务信息</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_yuliao?l=3">&nbsp;&nbsp;&nbsp;&nbsp;余料库</a></li>
                    <li class='item_divider'></li>
                    <%-- <li><a href="${ctx }/shelfmanager/fragmentsrank">&nbsp;&nbsp;&nbsp;&nbsp;残片库详情</a></li>
                    <li class='item_divider'></li>     --%>
                    <li><a href="${ctx }/shelfmanager/enterandexitrack" >&nbsp;&nbsp;&nbsp;&nbsp;进出库管理</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">&nbsp;&nbsp;&nbsp;&nbsp;领取四#线任务</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">&nbsp;&nbsp;&nbsp;&nbsp;设备信息</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/device/createcolor">&nbsp;&nbsp;&nbsp;&nbsp;膜系管理</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">&nbsp;&nbsp;&nbsp;&nbsp;补片</a></li>
                    <li class='item_divider'></li>
                </ul>
            </div>
        </shiro:hasRole>
        
        
        <shiro:hasRole name="cangchu">
ºÓ±±ÍûÃÀÏîÄ¿/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');
                },
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp
@@ -10,37 +10,37 @@
<script type="text/javascript">
    //停止页面自动刷新
    function delecttask(id) {
    function delecttask(groups,id) {
        //disableAutoRefresh();
        $.ajax({
            async : false,
            type : "GET",
            url : "${ctx}/cutmanage/delecttask/" + id,
            url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,
            dataType : "text",
            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
        alert(id);
        alert(groups);
    }
    function delecttask1(id) {
    function delecttask1(groups,id) {
        //disableAutoRefresh();disableAutoRefresh();
        $.ajax({
            async : false,
            type : "GET",
            url : "${ctx}/cutmanage/delecttask1/" + id,
            url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,
            dataType : "text",
            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
    }
@@ -78,6 +78,17 @@
            }
        });
    }
    function collectingTasks() {
        //disableAutoRefresh();
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        if(state=="0"){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
    }
    function updatedengluname() {
        $("#updatedengluname").modal('show');
        //disableAutoRefresh();
@@ -187,6 +198,9 @@
                <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='offWork()'>切割-产量</button>
                &nbsp; 
                &nbsp;
                <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='collectingTasks()'>领取任务</button>
                &nbsp;
                &nbsp;
                <small>当前上片工位模式:</small> &nbsp; 
                <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
@@ -208,6 +222,8 @@
        <!-- Main content -->
        <input style="display: none" type="text" name="groups"
            value="${groups}" />
            <input style="display: none" type="text" name="state"
            value="${state}" />
        <section class="content container-fluid">
            <div></div>
            <div>
@@ -218,7 +234,7 @@
            </div>
            <div class="box"
                style="height: 120px; overflow: auto; margin-top: 10px;">
                style="height: 172px; overflow: auto; margin-top: 10px;">
                <table class="table table-striped table-hover"
                    style="overflow-x: auto">
                    <thead>
@@ -231,6 +247,7 @@
                            <th>完成数量</th>
                            <th>总数量</th>
                            <th>完成面积(mm)</th>
                            <th>状态</th>
                            <th>操作</th>
                        </tr>
@@ -240,7 +257,7 @@
                </table>
            </div>
            <div class="box"
                style="height: 600px; overflow: auto; margin-top: 10px;">
                style="height: 500px; overflow: auto; margin-top: 10px;">
                <table class="table table-striped table-hover2"
                    style="overflow-x: auto">
                    <thead>
@@ -251,6 +268,7 @@
                            <th>厚度</th>
                            <th>颜色</th>
                            <th>状态</th>
                            <th>工程</th>
                            <th>操作</th>
                        </tr>
@@ -261,10 +279,10 @@
            </div>
        </section>
        <%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>
        <%-- <%@ include file="/WEB-INF/views/mes/view/modal_tijiaobaogong.jsp"%> --%>
        <%-- <%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_tijiaobaogong.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_tishi.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%> --%>
        <!-- /.content -->
    </div>
    <%@ include file="/WEB-INF/views/mes/view/modal_js_gongwei_mode.jsp" %>
ºÓ±±ÍûÃÀÏîÄ¿/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">
                            æŸ¥è¯¢æ•°æ®æ€»è§ˆï¼š ã€å…±&nbsp;<span id="rNum" class="span-data"></span>&nbsp;条数据】
@@ -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);//定时刷新
ºÓ±±ÍûÃÀÏîÄ¿/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);
ºÓ±±ÍûÃÀÏîÄ¿/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>
ºÓ±±ÍûÃÀÏîÄ¿/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>
ºÓ±±ÍûÃÀÏîÄ¿/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>&nbsp;&nbsp; --%>
                    <%-- <a class="btn btn-large btn-success"
                <%-- <a class="btn btn-large btn-success"
                        href="${ctx }/shelfmanager/againshelftask"
                        style='text-decoration: none;'>重新开始</a>&nbsp;&nbsp;
                        
@@ -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 -->
ºÓ±±ÍûÃÀÏîÄ¿/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:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
ºÓ±±ÍûÃÀÏîÄ¿/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">&nbsp;&nbsp;&nbsp;&nbsp;领取四#线任务</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/cutmanage/gettask/3">&nbsp;&nbsp;&nbsp;&nbsp;领取三#线任务</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/cutmanage/gettask/1">&nbsp;&nbsp;&nbsp;&nbsp;领取一#线任务</a></li>
@@ -266,6 +268,8 @@
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_DT_dapingxianshi"  target="_blank">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</a></li>
                    <li class='item_divider'></li>
                </ul>
@@ -384,7 +388,9 @@
                    <li><a href="${ctx }/reportform/cutmanagerepoortform1">&nbsp;&nbsp;&nbsp;&nbsp;切割总报表</a></li>    
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</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">&nbsp;&nbsp;&nbsp;&nbsp;在线队列</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">&nbsp;&nbsp;&nbsp;&nbsp;设备信息</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/device/createcolor">&nbsp;&nbsp;&nbsp;&nbsp;膜系管理</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">&nbsp;&nbsp;&nbsp;&nbsp;补片</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">&nbsp;&nbsp;&nbsp;&nbsp;料架管理</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/shelfmanager/shelftask" >&nbsp;&nbsp;&nbsp;&nbsp;仓储任务信息</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_yuliao?l=3">&nbsp;&nbsp;&nbsp;&nbsp;余料库</a></li>
                    <li class='item_divider'></li>
                    <%-- <li><a href="${ctx }/shelfmanager/fragmentsrank">&nbsp;&nbsp;&nbsp;&nbsp;残片库详情</a></li>
                    <li class='item_divider'></li>     --%>
                    <li><a href="${ctx }/shelfmanager/enterandexitrack" >&nbsp;&nbsp;&nbsp;&nbsp;进出库管理</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">&nbsp;&nbsp;&nbsp;&nbsp;领取四#线任务</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">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_DT_dapingxianshi"  target="_blank">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</a></li>
                    <li class='item_divider'></li>
                </ul>
@@ -1057,6 +1100,8 @@
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>
                </ul>
            </div>
        </shiro:hasRole>
ºÓ±±ÍûÃÀÏîÄ¿/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');
                },
ºÓ±±ÍûÃÀÏîÄ¿/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";
            }
ºÓ±±ÍûÃÀÏîÄ¿/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: [
ºÓ±±ÍûÃÀÏîÄ¿/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: [
ºÓ±±ÍûÃÀÏîÄ¿/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);
ºÓ±±ÍûÃÀÏîÄ¿/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>
ºÓ±±ÍûÃÀÏîÄ¿/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>
ºÓ±±ÍûÃÀÏîÄ¿/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>&nbsp;&nbsp; --%>
                    <%-- <a class="btn btn-large btn-success"
                <%-- <a class="btn btn-large btn-success"
                        href="${ctx }/shelfmanager/againshelftask"
                        style='text-decoration: none;'>重新开始</a>&nbsp;&nbsp;
                        
@@ -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 -->
ºÓ±±ÍûÃÀÏîÄ¿/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
Built-By: aaa
Build-Jdk: 1.8.0_121
Created-By: Maven Integration for Eclipse
ºÓ±±ÍûÃÀÏîÄ¿/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:09:16 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
m2e.projectName=MES_11
m2e.projectLocation=D\:\\workeclipse\\MES_11
m2e.projectLocation=D\:\\Documents\\MES_Projects\\\u6CB3\u5317\u671B\u7F8E\u9879\u76EE\\MES_11
artifactId=gmms2
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
#Mon Mar 18 11:50:57 CST 2024
#Thu Nov 14 09:03:53 CST 2024
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2
ºÓ±±ÍûÃÀÏîÄ¿/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:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\listener\ClientListener.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\reportform\ReportformController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\device\Device.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\device\DeviceService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\ShelfRack.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\identifymachine\IdentifyMachineService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\slicecage\SlicecageService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\RawPackageDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\common\AbstractMessageProcessor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\identifymachine\IdentifyMachineController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\AbstractMachine.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\common\ServiceInterface.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\MessageType.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\PatternTaskBufferDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\RawPackage.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\device\DeviceController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\ServiceException.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Task.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\account\ShiroDbRealm.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\SetupUtil.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\IdentifyErrorDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTaskSlicecage.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\IdEntity.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\MachineType.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\CRCUtil.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\DropFrameDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\DongZuoTableDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\hollowslicecage\HollowslicecageService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTaskHollow.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\UserDetailsDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\FolderUtil.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\FunctionNumber.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\shelfmanager2\ShelfManagerService2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\Globel\mes.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\ShelfTaskType.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\gaoliwei\GaoliweiController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\account\AccountService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\SlicecagePattern.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\SlicecageDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\standalone\StandAloneService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Rank.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskStockDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\UserDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Slicecage.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\MachineService\MachineService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\mes\JSPController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\WebColor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\EdgPerimeter.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskBufferDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskShelfDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\slicecage\SlicecageController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\DropFrame.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\EdgPerimeterDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\reportform\ReportformService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\SqlHelper\DBHelper.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\SlicecageTempering.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\listener\ServerConnection.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\IdentifyError.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\MachineFont.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\LiuChengKaReport.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\RankDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\SqlHelper\DBSession.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\JbarcodeUtil.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\ConnectState.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTask.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\LiuChengKaReportDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\PreprocessingGlassDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\rest\RestException.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\hollowslicecage\HollowSlicecageController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\rest\RestExceptionHandler.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\standalone\StandAloneController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\toughening\tougheningService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\HorizontalDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\home\Test.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\DropFrameDao2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\MachineFontDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\PatternTaskDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\RawFile.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\MachinesTypeDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\common\AbstractMessageService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskSlicecageDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\shelfmanager2\ShelfManagerController2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\SlicecageTemperingDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GlassNumberColorDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\ShelfRackDao2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\ExcelUtil.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\UserDetails.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\ShelfRackDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\MachineMessageDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Yuanpianpandian.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\DropFrame2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTaskShelf.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\common\AbstractMachineService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\YuanpianpandianDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\task\TaskService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTaskStock.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTaskDetails.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\toughening\tougheningController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\ArrangeMachineTaskType.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Machines.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\account\ProfileController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\SlicecagePatternDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\system\SystemService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\shelfmanager\ShelfManagerService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\manage\ManageController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\GlassColor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\LoadRack.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\hollow\HollowService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\ping\PingController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\gaoliwei\GaoliweiMachineService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\cutmanage\CutManageService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\DBHelper.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\listener\AbstractServerListener.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\StateConstants.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\rest\TaskRestController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\AbstractMessage.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\RawFile2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\json\JsonTimeValueProcessor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\log\GLoggerFactory.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\RawFileDao2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\MachineState.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\cutmanage\CutManageController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskHollowDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\DongZuoTable.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\PatternTask.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskDetailsDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\compound\CompoundMachineController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\ProdLineStateDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\CutmanagedetailisDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Fragments.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\message\MessageProcessor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\MachineDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\MachineDisposeDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTask2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\ShelfRack2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\countmachine\CountMachineController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\MachineDispose.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\PasswordDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\listener\ServerListener.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\DropFrameDao4.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\MachineMessage.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\ProdLineState.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\applicationListener\InitializeSystemApplicationListener.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\GlassLayout\Algorithm\AlgorithmDBInterface.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\mes\MesController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\HexUtil.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\countmachinetask\CountMachineTaskService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\DropFrame3.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GlassNumberColor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Horizontal.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\FragmentsDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Cutmanagedetailis.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\account\RegisterController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\GalssTaskBuffer.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\galsstask\GalssTaskController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\DropFrame4.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\shelfmanager\ShelfManagerController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\message\AbstractMessageProcessor.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\account\LoginController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\PatternTaskBuffer.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\constants\ShelfTaskFlag.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\log\GLoggerConstants.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\account\UserAdminController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\RawFileDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\PreprocessingGlass.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\TaskDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\DropFrameDao3.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\compound\CompoundMachineService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\hollow\HollowController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\ShelfTask.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\ShelfTask2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\AbstractMachineClient.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\LoadRackDao.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\galsstask\GalssTaskService.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\util\zfunc.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\listener\MachineClientListener.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\repository\GalssTaskDao2.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\web\home\HomeController.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\Password.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\entity\User.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\main\java\com\northglass\service\TV\DropFrameTVService.java
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -0,0 +1,6 @@
com\northglass\data\TaskData.class
com\northglass\repository\JpaMappingTest.class
com\northglass\repository\TaskDaoTest.class
com\northglass\QuickStartServer.class
com\northglass\service\account\AccountServiceTest.class
com\northglass\data\UserData.class
ºÓ±±ÍûÃÀÏîÄ¿/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:\Documents\MES_Projects\河北望美项目\MES_11\src\test\java\com\northglass\data\TaskData.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\test\java\com\northglass\repository\TaskDaoTest.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\test\java\com\northglass\QuickStartServer.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\test\java\com\northglass\data\UserData.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\test\java\com\northglass\service\account\AccountServiceTest.java
D:\Documents\MES_Projects\河北望美项目\MES_11\src\test\java\com\northglass\repository\JpaMappingTest.java
ºÓ±±ÍûÃÀÏîÄ¿/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\">&nbsp;&nbsp;&nbsp;&nbsp;领取四#线任务</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\">&nbsp;&nbsp;&nbsp;&nbsp;领取三#线任务</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\">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</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\">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;料架管理</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\" >&nbsp;&nbsp;&nbsp;&nbsp;仓储任务信息</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\">&nbsp;&nbsp;&nbsp;&nbsp;余料库</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\" >&nbsp;&nbsp;&nbsp;&nbsp;进出库管理</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\">&nbsp;&nbsp;&nbsp;&nbsp;领取四#线任务</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\">&nbsp;&nbsp;&nbsp;&nbsp;设备信息</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\">&nbsp;&nbsp;&nbsp;&nbsp;膜系管理</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\">&nbsp;&nbsp;&nbsp;&nbsp;补片</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\">&nbsp;&nbsp;&nbsp;&nbsp;落架显示</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\">&nbsp;&nbsp;&nbsp;&nbsp;落架显示</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\">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</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\">&nbsp;&nbsp;&nbsp;&nbsp;修改密码</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=切割明细\">&nbsp;&nbsp;&nbsp;&nbsp;切割明细报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;切割总报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;切割单片报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</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=切割明细\">&nbsp;&nbsp;&nbsp;&nbsp;切割明细报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;切割总报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;切割单片报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</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\">&nbsp;&nbsp;&nbsp;&nbsp;中空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\">&nbsp;&nbsp;&nbsp;&nbsp;中空2#折弯</a></li>\r\n");
        out.write("/mesview/_WG_Xianshi?group=1\">&nbsp;&nbsp;&nbsp;&nbsp;中空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\">&nbsp;&nbsp;&nbsp;&nbsp;中空3#折弯</a></li>\r\n");
        out.write("/mesview/_WG_Xianshi?group=2\">&nbsp;&nbsp;&nbsp;&nbsp;中空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=夹层\">&nbsp;&nbsp;&nbsp;&nbsp;夹胶线</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\">&nbsp;&nbsp;&nbsp;&nbsp;中空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=夹层\">&nbsp;&nbsp;&nbsp;&nbsp;夹胶线</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;
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/cutmanage/gotasks_jsp.java
@@ -12,10 +12,7 @@
  private static java.util.Vector _jspx_dependants;
  static {
    _jspx_dependants = new java.util.Vector(4);
    _jspx_dependants.add("/WEB-INF/views/mes/view/modal_banzu.jsp");
    _jspx_dependants.add("/WEB-INF/views/mes/view/modal_tishi.jsp");
    _jspx_dependants.add("/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp");
    _jspx_dependants = new java.util.Vector(1);
    _jspx_dependants.add("/WEB-INF/views/mes/view/modal_js_gongwei_mode.jsp");
  }
@@ -77,7 +74,7 @@
      out.write("<script type=\"text/javascript\">\r\n");
      out.write("\t//停止页面自动刷新\r\n");
      out.write("\r\n");
      out.write("\tfunction delecttask(id) {\r\n");
      out.write("\tfunction delecttask(groups,id) {\r\n");
      out.write("\t\t//disableAutoRefresh();\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\tasync : false,\r\n");
@@ -86,20 +83,20 @@
      out.write("\r\n");
      out.write("\t\t\turl : \"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/cutmanage/delecttask/\" + id,\r\n");
      out.write("/cutmanage/delecttask/\" + id +\"/\" +groups,\r\n");
      out.write("\r\n");
      out.write("\t\t\tdataType : \"text\",\r\n");
      out.write("\r\n");
      out.write("\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\twindow.location.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/\" + id;\r\n");
      out.write("/cutmanage/gettask/\" + groups;\r\n");
      out.write("\t\t\t}\r\n");
      out.write("\t\t});\r\n");
      out.write("\t\talert(id);\r\n");
      out.write("\t\talert(groups);\r\n");
      out.write("\t}\r\n");
      out.write("\r\n");
      out.write("\tfunction delecttask1(id) {\r\n");
      out.write("\tfunction delecttask1(groups,id) {\r\n");
      out.write("\t\t//disableAutoRefresh();disableAutoRefresh();\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\tasync : false,\r\n");
@@ -108,14 +105,14 @@
      out.write("\r\n");
      out.write("\t\t\turl : \"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/cutmanage/delecttask1/\" + id,\r\n");
      out.write("/cutmanage/delecttask1/\" + id+\"/\" +groups,\r\n");
      out.write("\r\n");
      out.write("\t\t\tdataType : \"text\",\r\n");
      out.write("\r\n");
      out.write("\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\twindow.location.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/\" + id;\r\n");
      out.write("/cutmanage/gettask/\" + groups;\r\n");
      out.write("\t\t\t}\r\n");
      out.write("\t\t});\r\n");
      out.write("\t}\r\n");
@@ -161,6 +158,19 @@
      out.write("\t\t\t}\r\n");
      out.write("\t\t});\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("\tfunction collectingTasks() {\r\n");
      out.write("\t\t//disableAutoRefresh();\r\n");
      out.write("\t\tvar groups = document.getElementsByName('groups')[0].value;\r\n");
      out.write("\t\tvar state = document.getElementsByName('state')[0].value;\r\n");
      out.write("\t\tif(state==\"0\"){\r\n");
      out.write("\t\t\twindow.location.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/gettasks/\" + groups;\r\n");
      out.write("\t\t}\r\n");
      out.write("\t\t\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("\tfunction updatedengluname() {\r\n");
      out.write("\t\t$(\"#updatedengluname\").modal('show');\r\n");
      out.write("\t\t//disableAutoRefresh();\r\n");
@@ -278,6 +288,9 @@
      out.write("\t\t\t\t<button id=\"btnOffWork\" type='button' class='btn btn-primary ' onclick='offWork()'>切割-产量</button>\r\n");
      out.write("\t\t\t\t&nbsp; \r\n");
      out.write("\t\t\t\t&nbsp;\r\n");
      out.write("\t\t\t\t<button id=\"btnOffWork\" type='button' class='btn btn-primary ' onclick='collectingTasks()'>领取任务</button>\r\n");
      out.write("\t\t\t\t&nbsp; \r\n");
      out.write("\t\t\t\t&nbsp;\r\n");
      out.write("\t\t\t\t<small>当前上片工位模式:</small> &nbsp; \r\n");
      out.write("\r\n");
      out.write("\t\t\t\t<button id=\"btnStatcionMode\" type='button' class='btn btn-primary' onclick='onChangeMode(");
@@ -307,6 +320,10 @@
      out.write("\t\t\tvalue=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${groups}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("\" />\r\n");
      out.write("\t\t\t<input style=\"display: none\" type=\"text\" name=\"state\"\r\n");
      out.write("\t\t\tvalue=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${state}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("\" />\r\n");
      out.write("\t\t<section class=\"content container-fluid\">\r\n");
      out.write("\t\t\t<div></div>\r\n");
      out.write("\t\t\t<div>\r\n");
@@ -318,7 +335,7 @@
      out.write("\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\t\t\t<div class=\"box\"\r\n");
      out.write("\t\t\t\tstyle=\"height: 120px; overflow: auto; margin-top: 10px;\">\r\n");
      out.write("\t\t\t\tstyle=\"height: 172px; overflow: auto; margin-top: 10px;\">\r\n");
      out.write("\t\t\t\t<table class=\"table table-striped table-hover\"\r\n");
      out.write("\t\t\t\t\tstyle=\"overflow-x: auto\">\r\n");
      out.write("\t\t\t\t\t<thead>\r\n");
@@ -331,6 +348,7 @@
      out.write("\t\t\t\t\t\t\t<th>完成数量</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>总数量</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>完成面积(mm)</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>状态</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>操作</th>\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t\t</tr>\r\n");
@@ -342,7 +360,7 @@
      out.write("\t\t\t\t</table>\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\t\t\t<div class=\"box\"\r\n");
      out.write("\t\t\t\tstyle=\"height: 600px; overflow: auto; margin-top: 10px;\">\r\n");
      out.write("\t\t\t\tstyle=\"height: 500px; overflow: auto; margin-top: 10px;\">\r\n");
      out.write("\t\t\t\t<table class=\"table table-striped table-hover2\"\r\n");
      out.write("\t\t\t\t\tstyle=\"overflow-x: auto\">\r\n");
      out.write("\t\t\t\t\t<thead>\r\n");
@@ -353,6 +371,7 @@
      out.write("\t\t\t\t\t\t\t<th>厚度</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>颜色</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>状态</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>工程</th>\r\n");
      out.write("\t\t\t\t\t\t\t<th>操作</th>\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t\t</tr>\r\n");
@@ -366,460 +385,6 @@
      out.write("\t\t</section>\r\n");
      out.write("\r\n");
      out.write("\t\t");
      out.write("\r\n");
      out.write("<!-- æ›´æ¢ç­ç»„信息 -->\r\n");
      out.write("<div class=\"modal fade\" id=\"div_banzu\" tabindex=\"-1\" role=\"dialog\"\r\n");
      out.write("\taria-labelledby=\"myModalLabel\" aria-hidden=\"true\">\r\n");
      out.write("\t<form class=\"form-horizontal\" role=\"form\">\r\n");
      out.write("\t\t<div class=\"modal-dialog\">\r\n");
      out.write("\t\t\t<div class=\"modal-content\">\r\n");
      out.write("\t\t\t\t<div class=\"modal-header\">\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"close\" data-dismiss=\"modal\"\r\n");
      out.write("\t\t\t\t\t\taria-hidden=\"true\">&times;</button>\r\n");
      out.write("\t\t\t\t\t<h3 class=\"modal-title\" id=\"UNum_AlertTitle\">更换班组</h3>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t<div class=\"modal-body\" style=\"text-align: left;\">\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t<div class=\"form-group\">\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t\t<!-- <h4>\r\n");
      out.write("\t\t\t\t\t\t\t\t\t<label class=\"col-lg-4 control-label no-padding-right\"\r\n");
      out.write("\t\t\t\t\t\t\t\t\t\tstyle=\"font-weight: bolder;\">当前班组 </label>\r\n");
      out.write("\t\t\t\t\t\t\t\t</h4>\r\n");
      out.write("\t\t\t\t\t\t\t\t<div class=\"col-lg-6 input-group\">\r\n");
      out.write("\t\t\t\t\t\t\t\t\t<span class=\"input-group-addon s-style\" id='lckNO'>NG</span>\r\n");
      out.write("\t\t\t\t\t\t\t\t</div> -->\r\n");
      out.write("\t\t\t\t\t\t<br /> <br /> <br />\r\n");
      out.write("\t\t\t\t\t\t<h4>\r\n");
      out.write("\t\t\t\t\t\t\t<label class=\"col-lg-4 control-label no-padding-right\"\r\n");
      out.write("\t\t\t\t\t\t\t\tstyle=\"font-weight: bolder;\">选择班组 </label>\r\n");
      out.write("\t\t\t\t\t\t</h4>\r\n");
      out.write("\t\t\t\t\t\t<div class=\"col-lg-6 input-group\">\r\n");
      out.write("\t\t\t\t\t\t\t<select id=\"s_banzu\" class=\"span_tasktext form-control\"\r\n");
      out.write("\t\t\t\t\t\t\t\tstyle=\"font-size: 18px\">\r\n");
      out.write("\t\t\t\t\t\t\t</select>\r\n");
      out.write("\t\t\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t\t\t<br /> <br /> <br />\r\n");
      out.write("\t\t\t\t\t</div>\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t<div class=\"form-group\">\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t\t<p style=\"text-align: center; font-size: 20px; color: red\"\r\n");
      out.write("\t\t\t\t\t\t\tid=\"bz-warring-info\"></p>\r\n");
      out.write("\t\t\t\t\t</div>\r\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t<div class=\"modal-footer\">\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"btn btn-primary btn-lg\"\r\n");
      out.write("\t\t\t\t\t\tdata-dismiss=\"modal\">取消</button>\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"btn btn-danger btn-lg\" id=\"DEL_button\"\r\n");
      out.write("\t\t\t\t\t\tonclick=\"OK_Submit('班组')\">确认</button>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\t\t</div>\r\n");
      out.write("\t</form>\r\n");
      out.write("</div>\r\n");
      out.write("\r\n");
      out.write("<!-- æ›´æ¢ç­ç»„ -->\r\n");
      out.write("<script>\r\n");
      out.write("var p_url = \"/gmms2/mesview/data/_public_manage\";\r\n");
      out.write("\tfunction getCurrentBanZu() {\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\ttype : \"post\",\r\n");
      out.write("\t\t\tdata : {\r\n");
      out.write("\t\t\t\tcaozuo : \"查询\",\r\n");
      out.write("\t\t\t\tleixing : \"当前班组\",\r\n");
      out.write("\t\t\t\tgongyi : gongyi,\r\n");
      out.write("\t\t\t\tline : group\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\tdataType : \"json\",\r\n");
      out.write("\t\t\turl : p_url,\r\n");
      out.write("\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\tvar d = data[0][0];\r\n");
      out.write("\t\t\t\tvar isstop=data[0][1];\r\n");
      out.write("\t\t\t\t\r\n");
      out.write("\t\t\t\tif(d==null || d==\"\"){\r\n");
      out.write("\t\t\t\t//if(data.length==0){\r\n");
      out.write("\t\t\t\t\t\r\n");
      out.write("\t\t\t\t\tcurrent_bz  = null;\r\n");
      out.write("\t\t\t\t\t/* $(\"#btnBanZu\").attr(\"style\",\"display:\");\r\n");
      out.write("\t\t\t\t\t$(\"#btnOffWork\").attr(\"style\",\"display:none\"); */\r\n");
      out.write("\t\t\t\t\t\r\n");
      out.write("\t\t\t\t}else{\r\n");
      out.write("\t\t\t\t\tcurrent_bz = data[0][0];\r\n");
      out.write("\t\t\t\t\t$(\"#s_current_banzu\").text(data[0][0]);\r\n");
      out.write("\t\t\t\t\t/* $(\"#btnOffWork\").attr('style',\"display:\");\r\n");
      out.write("\t\t\t\t\t$(\"#btnBanZu\").attr('style',\"display:none\"); */\r\n");
      out.write("\t\t\t\t\t\r\n");
      out.write("\t\t\t\t}\r\n");
      out.write("\t\t\t\tif(isstop!=null &&isstop!=\"\"){\r\n");
      out.write("\t\t\t\t\tonChangeBanZu();\r\n");
      out.write("\t\t\t\t}\r\n");
      out.write("\t\t\t\t\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\terror : function(data) {\r\n");
      out.write("\r\n");
      out.write("\t\t\t}\r\n");
      out.write("\t\t});\r\n");
      out.write("\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\t\t\ttype : \"post\",\r\n");
      out.write("\t\t\t\t\tdata : {\r\n");
      out.write("\t\t\t\t\t\tcaozuo : \"查询\",\r\n");
      out.write("\t\t\t\t\t\tleixing : \"班组列表\",\r\n");
      out.write("\t\t\t\t\t\tgongyi : gongyi,\r\n");
      out.write("\t\t\t\t\t\tline : group\r\n");
      out.write("\t\t\t\t\t},\r\n");
      out.write("\t\t\t\t\tdataType : \"json\",\r\n");
      out.write("\t\t\t\t\turl : p_url,\r\n");
      out.write("\t\t\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\t\t\td = data;\r\n");
      out.write("\t\t\t\t\t\tvar html = \" <option selected=\\\"selected\\\"  value='0'>选择班组</option>\";\r\n");
      out.write("\t\t\t\t\t\t$(\"#s_banzu\").empty();\r\n");
      out.write("\t\t\t\t\t\tfor (var i = 0; i < d.length; i++) {\r\n");
      out.write("\t\t\t\t\t\t\thtml += \" <option  value=\"+d[i][0]+\">\" + d[i][0]\r\n");
      out.write("\t\t\t\t\t\t\t\t\t+ \"</option>\";\r\n");
      out.write("\t\t\t\t\t\t}\r\n");
      out.write("\t\t\t\t\t\tdocument.getElementById(\"s_banzu\").innerHTML += html;\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t\t//AddBPShow(2,isshow);\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t},\r\n");
      out.write("\t\t\t\t\terror : function(data) {\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t}\r\n");
      out.write("\t\t\t\t});\r\n");
      out.write("\t}\r\n");
      out.write("\r\n");
      out.write("\tfunction onChangeBanZu() {\r\n");
      out.write("\t\t$(\"#div_banzu\").modal('toggle');\r\n");
      out.write("\t\t//$(\"#s_banzu\").selectedIndex= 0;\r\n");
      out.write("\t}\r\n");
      out.write("\r\n");
      out.write("\tfunction OK_Submit(type) {\r\n");
      out.write("\r\n");
      out.write("\t\tswitch (type) {\r\n");
      out.write("\t\tcase \"班组\":\r\n");
      out.write("\t\t\tsetBanZu();\r\n");
      out.write("\t\t\tbreak;\r\n");
      out.write("\t\tcase \"次破\":\r\n");
      out.write("\t\t\tsetCiPo();\r\n");
      out.write("\t\t\tbreak;\r\n");
      out.write("\t\tdefault:\r\n");
      out.write("\t\t\t;\r\n");
      out.write("\t\t}\r\n");
      out.write("\t}\r\n");
      out.write("\r\n");
      out.write("\tfunction setBanZu() {\r\n");
      out.write("\r\n");
      out.write("\t\tvar bz = $(\"#s_banzu\").val();\r\n");
      out.write("\t\tif (bz == 0) {\r\n");
      out.write("\t\t\t$(\"#bz-warring-info\").text(\"请选择正确的班组\");\r\n");
      out.write("\t\t\treturn;\r\n");
      out.write("\t\t}\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\ttype : \"post\",\r\n");
      out.write("\t\t\tdata : {\r\n");
      out.write("\t\t\t\tcaozuo : \"修改\",\r\n");
      out.write("\t\t\t\tleixing : \"变更班组\",\r\n");
      out.write("\t\t\t\tline : group,\r\n");
      out.write("\t\t\t\tgongyi : gongyi,\r\n");
      out.write("\t\t\t\tinfo : bz\r\n");
      out.write("\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\turl : p_url,\r\n");
      out.write("\t\t\tdataType : 'text',\r\n");
      out.write("\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\tif (data == 1) {\r\n");
      out.write("\t\t\t\t\tcurrent_bz = bz;\r\n");
      out.write("\t\t\t\t\t$(\"#s_current_banzu\").text(bz);\r\n");
      out.write("\t\t\t\t\t$(\"#div_banzu\").modal('toggle');\r\n");
      out.write("\t\t\t\t\tgetCurrentBanZu();\r\n");
      out.write("\t\t\t\t\treturn;\r\n");
      out.write("\t\t\t\t} else {\r\n");
      out.write("\t\t\t\t\t$(\"#bz-warring-info\").text(\"班组变更失败,请检查原因:\" + data);\r\n");
      out.write("\t\t\t\t}\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\terror : function(data) {\r\n");
      out.write("\t\t\t\t$(\"#bz-warring-info\").text(\"班组变更异常,请检查原因:\" + data);\r\n");
      out.write("\t\t\t}\r\n");
      out.write("\t\t})\r\n");
      out.write("\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("/* \tfunction offWork(){\r\n");
      out.write("\t\t $.ajax({\r\n");
      out.write("\t\t\t\r\n");
      out.write("\t\t\ttype : \"post\",\r\n");
      out.write("\t\t\tdata : {\r\n");
      out.write("\t\t\t\tcaozuo : \"修改\",\r\n");
      out.write("\t\t\t\tleixing : \"班组下班\",\r\n");
      out.write("\t\t\t\tline : group,\r\n");
      out.write("\t\t\t\tgongyi : gongyi,\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\turl : p_url,\r\n");
      out.write("\t\t\tdataType : 'text',\r\n");
      out.write("\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\tif (data == 1) {\r\n");
      out.write("\t\t\t\t\tcurrent_bz = null;\r\n");
      out.write("\t\t\t\t\t$(\"#s_current_banzu\").text(null);\r\n");
      out.write("\t\t\t\t\t$(\"#btnOffWork\").attr(\"display\",\"none\");\r\n");
      out.write("\t\t\t\t\t$(\"#btnBanZu\").attr(\"display\",\"\");\r\n");
      out.write("\t\t\t\t\tgetCurrentBanZu();\r\n");
      out.write("\t\t\t\t\treturn;\r\n");
      out.write("\t\t\t\t} else {\r\n");
      out.write("\t\t\t\t\t$(\"#bz-warring-info\").text(\"班组下班失败,请检查原因:\" + data);\r\n");
      out.write("\t\t\t\t}\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\terror : function(data) {\r\n");
      out.write("\t\t\t\t$(\"#bz-warring-info\").text(\"班组下班异常,请检查原因:\" + data);\r\n");
      out.write("\t\t\t}\r\n");
      out.write("\t\t\t\r\n");
      out.write("\t\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} */\r\n");
      out.write("\t\r\n");
      out.write("\tgetCurrentBanZu();\r\n");
      out.write("</script>\r\n");
      out.write("\r\n");
      out.write("\t\t");
      out.write("\r\n");
      out.write("\t\t");
      out.write("\r\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("<!-- æ“ä½œç¡®è®¤ -->\r\n");
      out.write("<div class=\"modal fade\" id=\"CZ_Sure\" tabindex=\"-1\" role=\"dialog\"\r\n");
      out.write("\taria-labelledby=\"myModalLabel\" aria-hidden=\"true\">\r\n");
      out.write("\t<form class=\"form-horizontal\" role=\"form\">\r\n");
      out.write("\t\t<div class=\"modal-dialog\">\r\n");
      out.write("\t\t\t<div class=\"modal-content\">\r\n");
      out.write("\t\t\t\t<div class=\"modal-header\">\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"close\" data-dismiss=\"modal\"\r\n");
      out.write("\t\t\t\t\t\taria-hidden=\"true\">&times;</button>\r\n");
      out.write("\t\t\t\t\t<h3 class=\"modal-title\" id=\"CZ_Title\"></h3>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t<div class=\"modal-body\" style=\"text-align: left;\">\r\n");
      out.write("\t\t\t\t\t<h3 id=\"MsgShow\">\r\n");
      out.write("\t\t\t\t\t\t是否确认执行玻璃 &nbsp; <span id=\"czqr_Zhuangtai\"\r\n");
      out.write("\t\t\t\t\t\t\tstyle=\"font-weight: bold\"></span> &nbsp; <span id=\"czqr_Ming\"\r\n");
      out.write("\t\t\t\t\t\t\tstyle=\"font-weight: bold\"></span> &nbsp; æ“ä½œï¼Ÿ\r\n");
      out.write("\t\t\t\t\t</h3>\r\n");
      out.write("\t\t\t\t\t<br/>\r\n");
      out.write("<!-- \t\t\t\t\t<p id=\"p-yuanyin\" style=\"font-size: 15px; font-weight: bold;display:none\">\r\n");
      out.write("\t\t\t\t\t\t<span style=\"font-weight: bold\">原因:</span> <span id=\"error_mingxi\" style=\"font-color: red\"></span>\r\n");
      out.write("\t\t\t\t\t</p> -->\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t<div class=\"modal-footer\">\r\n");
      out.write("\t\t\t\t<button type=\"button\" class=\"btn btn-primary btn-lg\"\r\n");
      out.write("\t\t\t\t\t\tdata-dismiss=\"modal\" id=\"btnCancel\">取消</button>\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"btn btn-primary btn-lg\"\r\n");
      out.write("\t\t\t\t\t\tid=\"btnSure\">确定</button>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\t\t</div>\r\n");
      out.write("\t</form>\r\n");
      out.write("</div>\r\n");
      out.write("\r\n");
      out.write("<!-- ä¿¡æ¯æç¤º -->\r\n");
      out.write("<div class=\"modal fade\" id=\"CZ_Msg\" tabindex=\"-1\" role=\"dialog\"\r\n");
      out.write("\taria-labelledby=\"myModalLabel\" aria-hidden=\"true\">\r\n");
      out.write("\t<form class=\"form-horizontal\" role=\"form\">\r\n");
      out.write("\t\t<div class=\"modal-dialog\">\r\n");
      out.write("\t\t\t<div class=\"modal-content\">\r\n");
      out.write("\t\t\t\t<div class=\"modal-header\">\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"close\" data-dismiss=\"modal\"\r\n");
      out.write("\t\t\t\t\t\taria-hidden=\"true\">&times;</button>\r\n");
      out.write("\t\t\t\t\t<h3 class=\"modal-title\" id=\"TK_AlertTitle\">操作提示:</h3>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t<div class=\"modal-body\" style=\"text-align: left;\">\r\n");
      out.write("\t\t\t\t\t<h3 id=\"MsgShow\">\r\n");
      out.write("\t\t\t\t\t\t<span id=\"cz_Ming\" style=\"font-weight: bold\"></span> <span\r\n");
      out.write("\t\t\t\t\t\t\tid=\"cz_Zhuangtai\" style=\"font-weight: bold\"></span>\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t</h3>\r\n");
      out.write("\t\t\t\t\t<p style=\"font-size: 25px; font-weight: bold\">\r\n");
      out.write("\t\t\t\t\t\t<span style=\"font-weight: bold\">原因:</span> <span id=\"cz_mingxi\"></span>\r\n");
      out.write("\t\t\t\t\t</p>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t\t<div class=\"modal-footer\">\r\n");
      out.write("\t\t\t\t\t<button type=\"button\" class=\"btn btn-primary btn-lg\"\r\n");
      out.write("\t\t\t\t\t\tdata-dismiss=\"modal\">确定</button>\r\n");
      out.write("\t\t\t\t</div>\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\t\t</div>\r\n");
      out.write("\t</form>\r\n");
      out.write("</div>");
      out.write("\r\n");
      out.write("\t\t");
      out.write("\r\n");
      out.write("<!-- æµç¨‹å¡è¯¦æƒ… -->\r\n");
      out.write("<div class=\"modal fade\" id=\"baogong_info\" tabindex=\"-1\" role=\"dialog\"\r\n");
      out.write("\taria-labelledby=\"myModalLabel\" aria-hidden=\"true\"\r\n");
      out.write("\tstyle=\"overflow-y: auto; height: 99%\">\r\n");
      out.write("\t<div class=\"modal-dialog\" style=\"width: 80%; height: 100%\">\r\n");
      out.write("\t\t<div class=\"modal-content\">\r\n");
      out.write("\t\t\t<div class=\"modal-header\">\r\n");
      out.write("\t\t\t\t<button type=\"button\" class=\"close\" data-dismiss=\"modal\"\r\n");
      out.write("\t\t\t\t\taria-hidden=\"true\" data-backdrop=\"static\">&times;</button>\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t<p class=\"modal-title\">\r\n");
      out.write("\t\t\t\t\t<span id=\"bg_title\" style=\"font-weight: bolder; font-size: 25px\"></span>\r\n");
      out.write("\t\t\t\t\t\t&nbsp;&nbsp;&nbsp;&nbsp;\r\n");
      out.write("\t\t\t\t\t\t<button id = \"btnBGTJ\" type=\"button\" class='btn btn-large btn-success' onclick=\"TiJiaoBaoGong()\">提交报工</button>\r\n");
      out.write("\t\t\t\t\t\t&nbsp;&nbsp;&nbsp;&nbsp;\r\n");
      out.write("\t\t\t\t\t\t<span id=\"wg_ps\" style=\"font-weight: bolder; font-size: 18px\"></span>\r\n");
      out.write("\t\t\t\t\t\t&nbsp;&nbsp;&nbsp;&nbsp;\r\n");
      out.write("\t\t\t\t\t\t\r\n");
      out.write("\t\t\t\t</p>\r\n");
      out.write("\t\t\t\t\r\n");
      out.write("\t\t\t\t\r\n");
      out.write("\t\t\t\t\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\r\n");
      out.write("\t\t\t<div class=\"modal-body\">\r\n");
      out.write("\t\t\t\t<div class=\"no-padding\" id=\"bg_detail\"></div>\r\n");
      out.write("\t\t\t</div>\r\n");
      out.write("\t\t\t<div class=\"modal-footer\"></div>\r\n");
      out.write("\t\t</div>\r\n");
      out.write("\t</div>\r\n");
      out.write("</div>\r\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("<!-- åŽŸç‰‡è¯¦æƒ… -->\r\n");
      out.write("<script>\r\n");
      out.write("\tvar url = \"\";  \r\n");
      out.write("\tvar p_url = \"/gmms2/mesview/data/_public_manage\";\r\n");
      out.write("\t\r\n");
      out.write("\tvar current_lck = null;\r\n");
      out.write("\tvar lck_opt = {\r\n");
      out.write("\t\ttable : {\r\n");
      out.write("\t\t\tstyle : \"width:100%\",\r\n");
      out.write("\t\t\t\"class\" : \"table table-striped table-hover\"\r\n");
      out.write("\t\t},\r\n");
      out.write("\t\tcolumns : [\r\n");
      out.write("\t\t{\r\n");
      out.write("\t\t\tname : \"\",\r\n");
      out.write("\t\t\tbinding : 0,\r\n");
      out.write("\t\t\t//editAble:true,//设置列可编辑\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t//设置列可搜索\r\n");
      out.write("\t\t}, {\r\n");
      out.write("\t\t\tname : \"宽\",\r\n");
      out.write("\t\t\tbinding : 1,\r\n");
      out.write("\t\t\t//type : \"element\",\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t}, {\r\n");
      out.write("\t\t\tname : \"高\",\r\n");
      out.write("\t\t\tbinding : 2,\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t},{\r\n");
      out.write("\t\t\tname : \"厚\",\r\n");
      out.write("\t\t\tbinding : 3,\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t},{\r\n");
      out.write("\t\t\tname : \"类型\",\r\n");
      out.write("\t\t\tbinding : 4,\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t},{\r\n");
      out.write("\t\t\tname : \"批次号\",\r\n");
      out.write("\t\t\tbinding : 5,\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t},{\r\n");
      out.write("\t\t\tname : \"数量\",\r\n");
      out.write("\t\t\tbinding : 6,\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t},{\r\n");
      out.write("\t\t\tname : \"班组\",\r\n");
      out.write("\t\t\tbinding : 7,\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t}/* , {\r\n");
      out.write("\t\t\tname : \"操作\",\r\n");
      out.write("\t\t\tbinding : 10,\r\n");
      out.write("\t\t\tstyle : \"width:15%;\",\r\n");
      out.write("\t\t\ttype : \"element\",\r\n");
      out.write("\t\t\tfilter : {}\r\n");
      out.write("\t\t}  */]\r\n");
      out.write("\t};\r\n");
      out.write("\r\n");
      out.write("\t//创建表\r\n");
      out.write("\tvar bg_db = createTable(document.getElementById(\"bg_detail\"), lck_opt);\r\n");
      out.write("\r\n");
      out.write("\t//加载表格内容\t\t\r\n");
      out.write("\tfunction LoadBGTable(Id) {\r\n");
      out.write("\t\tvar wangong_prices=0;\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\t\t\ttype : \"post\",\r\n");
      out.write("\t\t\t\t\tdata : {\r\n");
      out.write("\t\t\t\t\t\tleixing : \"切割原片详情\",\r\n");
      out.write("\t\t\t\t\t\tcaozuo : \"查询\",\r\n");
      out.write("\t\t\t\t\t\tline : group\r\n");
      out.write("\t\t\t\t\t},\r\n");
      out.write("\t\t\t\t\tdataType : \"json\",\r\n");
      out.write("\t\t\t\t\turl : p_url,\r\n");
      out.write("\t\t\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\t\t\tvar d = data;\r\n");
      out.write("\t\t\t\t\t\tfor (var i = 0; i < d.length; i++) {\r\n");
      out.write("\t\t\t\t\t\t\td[i][0] = i+1;\r\n");
      out.write("\t\t\t\t\t\t\twangong_prices+=d[i][6];\r\n");
      out.write("\t\t\t\t\t\t}\r\n");
      out.write("\t\t\t\t\t\tbg_db.update(d);\r\n");
      out.write("\t\t\t\t\t\t$(\"#wg_ps\").text(\"切割总片数:\"+wangong_prices);\r\n");
      out.write("\t\t\t\t\t\t/* alert(posun_mianji);\r\n");
      out.write("\t\t\t\t\t\talert(wangong_mianji); */\r\n");
      out.write("\t\t\t\t\t},\r\n");
      out.write("\t\t\t\t\terror : function(data) {\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t\t\t//$(\"#lck_Info\").modal('toggle');\r\n");
      out.write("\t\t\t\t\t}\r\n");
      out.write("\t\t\t\t});\r\n");
      out.write("\t\t//a = true;\r\n");
      out.write("\t\t\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("\t\r\n");
      out.write("\tfunction offWork() {\r\n");
      out.write("\t\t$(\"#bg_title\").text(\r\n");
      out.write("\t\t\t\t\"切割 \" + group + \" çº¿           \")\r\n");
      out.write("\t\tLoadBGTable(group);\r\n");
      out.write("\t\t$(\"#baogong_info\").modal('toggle');\r\n");
      out.write("\r\n");
      out.write("\t}\r\n");
      out.write("\tfunction TiJiaoBaoGong() {\r\n");
      out.write("\t\t$.ajax({\r\n");
      out.write("\t\t\ttype : \"post\",\r\n");
      out.write("\t\t\tdata : {\r\n");
      out.write("\t\t\t\tcaozuo : \"切割提交\",\r\n");
      out.write("\t\t\t\tline : group,\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\turl : p_url,\r\n");
      out.write("\t\t\tdataType : \"text\",\r\n");
      out.write("\t\t\tsuccess : function(data) {\r\n");
      out.write("\t\t\t\t$('#baogong_info').modal(\"toggle\");\r\n");
      out.write("\r\n");
      out.write("\t\t\t\t$(\"#cz_Ming\").text(\"报工提交\");\r\n");
      out.write("\t\t\t\t$(\"#cz_Zhuangtai\").text(\"成功\");\r\n");
      out.write("\t\t\t\t//$(\"#cz_mingxi\").text(data);\r\n");
      out.write("\t\t\t\t$(\"#CZ_Msg\").modal('toggle');\r\n");
      out.write("\t\t\t\tonChangeBanZu();\r\n");
      out.write("\t\t\t},\r\n");
      out.write("\t\t\terror : function(data) {\r\n");
      out.write("\t\t\t\t$(\"#CZ_Msg\").modal('toggle');\r\n");
      out.write("\t\t\t\t$(\"#cz_Ming\").text(\"报工提交\");\r\n");
      out.write("\t\t\t\t$(\"#cz_Zhuangtai\").text(\"失败\");\r\n");
      out.write("\t\t\t\t$(\"#cz_mingxi\").text(data);\r\n");
      out.write("\t\t\t}\r\n");
      out.write("\r\n");
      out.write("\t\t})\r\n");
      out.write("\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("</script>\r\n");
      out.write("\r\n");
      out.write("\t\t<!-- /.content -->\r\n");
      out.write("\t</div>\r\n");