Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

严智鑫

2025-08-18 3b65a5dc04be7cdac460c84ebaa38bf009405128

Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

# Conflicts:
#	河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks2.jsp

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java

@@ -25,13 +25,16 @@
    @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);
    
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.patternTask.groups=?1 order by t.patternTask.id")
    public List<GalssTask> findByidentify1(Long groups);
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.width>?2 and t.height>?2 and t.patternTask.groups=?1 order by t.patternTask.id,t.engineeringId")
    public List<GalssTask> findByidentify1(Long groups,double minwidths);
    
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.patternTask.groups=?1 and (((t.width<=?3 and t.width>=?2) and (t.height<=?5 and t.height>=?4)) or ((t.width<=?5 and t.width>=?4) and (t.height<=?3 and t.height>=?2))) order by t.patternTask.id")
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.patternTask.groups=?1 and (((t.width<=?3 and t.width>=?2) and (t.height<=?5 and t.height>=?4)) or ((t.width<=?5 and t.width>=?4) and (t.height<=?3 and t.height>=?2))) order by t.patternTask.id,t.engineeringId")
    public List<GalssTask> findByidentify2(Long groups,Double minwidth,Double maxwidth,Double minheigth,Double maxheigth);
    
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' ")
@@ -46,22 +49,25 @@
    @Query("select t from GalssTask t where t.workProcedure='复合' and t.workState='复合失败' and t.patternTask.groups=?1")
    public List<GalssTask> findIncompound(Long groups);
    
    @Query("select t from GalssTask t where t.typeId=?1 and t.patternTask.groups=?2")
    public List<GalssTask> findbyTypeId(Long id,Long groups);
    @Query("select t from GalssTask t where t.typeId=?1 and t.processcardId=?2 and t.patternTask.groups=?3")
    public List<GalssTask> findbyTypeId(Long id,String processcardId,Long groups);
    
    @Query("select t from GalssTask t where t.patternTask.id=?1")
    public List<GalssTask> findpattern(Long id);
    
    @Query("select t from GalssTask t where t.patternTask.id=?1 and t.workState='待识别' and t.workProcedure='测量'")
    public List<GalssTask> findpattern1(Long id);
    @Query("select t from GalssTask t where t.patternTask.id=?1 and t.width>?2 and t.height>?2 and t.workState='待识别' and t.workProcedure='测量'")
    public List<GalssTask> findpattern1(Long id,double minwidths);
	
    @Query("select t from GalssTask t where t.patternTask.groups=?1 and t.width>?2 and t.height>?2 and t.patternTask.flag=1 and t.workState='待识别' and t.workProcedure='测量'")
    public List<GalssTask> findpattern2(Long id,double minwidths);
    
    @Query("select t from GalssTask t where t.typeId=?1 ")
    public List<GalssTask> findbyTypeId1(Long id);
    
    @Query("select t.dropFrame from GalssTask t where t.patternTask.groups=?1 group by dropFrame ")
    @Query("select t.dropFrame from GalssTask t where t.patternTask.groups=?1 and t.patternTask.rawFile.state='已领取' group by dropFrame ")
    public List<GalssTask> findDroplist(Long groups);
    
    @Query("select t from GalssTask t where t.dropFrame=?1 and t.patternTask.groups=?2")
    @Query("select t from GalssTask t where t.dropFrame=?1 and t.patternTask.rawFile.state='已领取' and t.patternTask.groups=?2")
    public List<GalssTask> findDropframeList(String dropframe,Long groups);
    
    @Query("select t from GalssTask t where t.slicecageRank=?1 and t.patternTask.groups=?2")
@@ -71,7 +77,7 @@
    public List<GalssTask> findslicecagerank2(Long slicecageid,Long groups);
    
    
    @Query("select count(t) from GalssTask t where t.dropFrame=?1 and t.patternTask.groups=?2")
    @Query("select count(t) from GalssTask t where t.dropFrame=?1 and t.patternTask.rawFile.state='已领取' and t.patternTask.groups=?2")
    public int finddropframecount(String dropframe,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/PatternTaskDao.java

@@ -35,7 +35,7 @@
    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.rawFile.createTime desc,t.rank")
    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);
    

 ºÓ±±ÍûÃÀÏîÄ¿/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

@@ -206,6 +206,10 @@
            model.addAttribute("line", prodLine);
            model.addAttribute("groups", prodLine);
            model.addAttribute("rawPackageslist", html.toString());
			
            StringBuffer html3 = new StringBuffer();
            html3.append("<button type='button' onclick='task()' class='btn btn-primary' id='app'>手动任务</button>");
            model.addAttribute("app", html3.toString());


            
@@ -237,6 +241,12 @@
                 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='上片机'");
@@ -263,14 +273,17 @@
    public String getTasks(String prodLine, Model model) {

            StringBuffer html = new StringBuffer();
            List<RawFile> rawPackageslist = rawFileDao.findAcceptedByGroups(Long.valueOf(prodLine));
            List<RawFile> rawPackageslist = rawFileDao.findTasks(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;");
@@ -281,8 +294,11 @@
            StringBuffer html2 = new StringBuffer();
            UserDetails userDetails=userDetailsDao.findgroups(prodLine);
            html2.append("<button id='dengluname' style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatedengluname()'>"+userDetails.getName()+"</button>");
			
            model.addAttribute("rawPackageslist", html.toString());
            model.addAttribute("rawPackageslistname", html2.toString());
            model.addAttribute("line", prodLine);
            model.addAttribute("groups", prodLine);
            return "cutmanage/gettask";
        
        
@@ -339,19 +355,13 @@
                int ret= c.getInt(3);
                c.close();
                
//                CallableStatement c=conn.prepareCall("{call GalssTask(?,?,?)}");
//                c.setLong(1,id);
//                c.setLong(2, line);
//                c.registerOutParameter(3, java.sql.Types.INTEGER);
//                c.execute(); 
//                int ret= c.getInt(3);
//                c.close();
//                System.out.println(ret);
                if(ret==100){
                    model.addAttribute("message",100);
                    model.addAttribute("pattertaskHtml", getpattertaskHtml(Long.valueOf(line)));
                    model.addAttribute("pattertaskHtml2", getpattertaskHtml4(Long.valueOf(line)));
                    model.addAttribute("groups", line);

				
                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";
@@ -544,49 +554,55 @@
    }
    
    //结束任务
    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(operator==4){
        }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";
            return "理片存在当前订单玻璃:任务存在"+lipiancount+","+slicecount;
        }else{
            Connection conn=DeviceService.getConnection();
            try{
                
                if(operator==4){
                if(line==4){
                    CallableStatement c=conn.prepareCall("{call GalssTaskStop4(?,?)}");
                    c.setLong(1,operator);
                    c.setLong(1,line);
                    c.setLong(2,1);
                    c.execute(); 
                    c.close();
                }else{
                    CallableStatement c=conn.prepareCall("{call workmanship(?)}");
                    c.setLong(1,operator);
                    c.setLong(1,id);
                    c.execute(); 
                    c.close();
						
                    
                    rawFile.setState("已完成");
                    rawFile.setReceiveTime(new Date());
                    rawFileDao.save(rawFile);
                    galssTaskDao.deleteGlassTask(rawFile.getFileName());
                    patternTaskDao.deletepatternTask(rawFile.getId());
					
                    RawFile rawFile1=rawFileDao.findIdGroup1(line);
                    if(rawFile1!=null){
                        rawFile1.setState("已领取");
                    }
                }
            
                return "redirect:cutmanage/gettasks";			
                return "结束成功";			
            } catch (SQLException e) {
                e.printStackTrace();
                return "redirect:cutmanage/gettasks";	
                return "服务器连接错误";
            }finally{
                messageProcessor.close(conn);
            }
@@ -596,35 +612,35 @@
    
    
    //中断任务
    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(operator==4){
        }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";
            return "理片存在当前订单玻璃:任务存在"+lipiancount+","+slicecount;
        }else{
            Connection conn=DeviceService.getConnection();
            try {
                
                if(operator==4){
                if(line==4){
                    CallableStatement c=conn.prepareCall("{call GalssTaskStop4(?,?)}");
                    c.setLong(1,operator);
                    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,operator);
                    c.setLong(2,line);
                    c.execute(); 
                    c.close();    
                    
@@ -632,12 +648,17 @@
                    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";
                return "中断成功";
            } catch (SQLException e) {
                e.printStackTrace();
                return "redirect:cutmanage/gettasks";	
                return "服务器连接错误";	
            }finally{
                messageProcessor.close(conn);
            }
@@ -741,7 +762,7 @@
            int count=patternTaskDao.findcount(rawFile.getId());
            int sum=patternTaskDao.findsum(rawFile.getId());
            html.append("<tr>");
            html.append("<td>").append(rawFile.getFileName()).append("</td>");
            html.append("<td id='fileName'>").append(rawFile.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>");
@@ -863,6 +884,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 updatepieces(Long id,String width,String height,String thinkness,String color,String count) {
//        PatternTask patternTask=patternTaskDao.findOne(id);
//        if(patternTask!=null){

 ºÓ±±ÍûÃÀÏîÄ¿/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);
@@ -241,9 +241,9 @@
    }
    
    public static Connection getConnection() {
        //localhost 192.168.200.201 192.168.2.6   10.12.0.100
        //localhost:3307 192.168.200.201 192.168.2.6   10.12.0.100:3306
        try {
            return DriverManager.getConnection("jdbc:mariadb://localhost:3306/gmms","root",""); 					
            return DriverManager.getConnection("jdbc:mariadb://localhost:3307/gmms","root",""); 					
        } catch (SQLException e) {
            e.printStackTrace();
        }

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/service/identifymachine/IdentifyMachineService.java

@@ -132,7 +132,7 @@
            return glass;
        }else{
            List<GalssTask> glass=new ArrayList<GalssTask>();
            glass=galssTaskDao.findByidentify1(groups);
            glass=galssTaskDao.findByidentify1(groups,preprocessingGlass.getMinwidths());
            return glass;
        }
        
@@ -143,7 +143,9 @@
        PreprocessingGlass preprocessingGlass=preprocessingGlassDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
        List<GalssTask> glass;
        if(patternTask!=null){
             glass=galssTaskDao.findpattern1(patternTask.getId());
             glass=galssTaskDao.findpattern2(groups,preprocessingGlass.getMinwidths());
             /*glass=galssTaskDao.findByidentify1(groups);*/
             glass.addAll(galssTaskDao.findpattern1(patternTask.getId(),preprocessingGlass.getMinwidths()));
        }else if(preprocessingGlass.getStatu().equals("多数据匹配")){
            IdentifyError identifyError=identifyErrorDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
            double minwidth=preprocessingGlass.getActualWidth()-identifyError.getHeigtherror();
@@ -154,7 +156,7 @@
            glass=galssTaskDao.findByidentify2(groups,minwidth,maxwidth,minheigth,maxheigth);
            return glass;
        }else{
             glass=galssTaskDao.findByidentify1(groups);
             glass=galssTaskDao.findByidentify1(groups,preprocessingGlass.getMinwidths());
        }
        
        return glass;

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/service/slicecage/SlicecageService.java

@@ -65,11 +65,12 @@
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td></td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
                else{
                    List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),groups);
                    List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),slicecages.getProcesscardId(),groups);
                    GalssTask galssTask=galssTasklist.get(0);
                    html.append("<tr>");
                    html.append("<td style='width:30px'><input type='checkbox' name='id' value="+slicecages.getId() +" /></td>");
@@ -82,7 +83,8 @@
                    html.append("<td>"+galssTask.getThickness()+"</td>");
                    html.append("<td>"+slicecages.getCount()+"</td>");
                    html.append("<td>"+slicecages.getProcesscardId()+"</td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td>"+galssTask.getEngineeringId()+"</td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
            }
@@ -108,11 +110,12 @@
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td></td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
                else{
                    List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),groups);
                    List<GalssTask> galssTasklist = galssTaskDao.findbyTypeId(slicecages.getTypeId(),slicecages.getProcesscardId(),groups);
                    GalssTask galssTask=galssTasklist.get(0);
                    html.append("<tr>");
                    html.append("<td style='width:30px'><input type='checkbox' name='id' value="+slicecages.getId() +" /></td>");
@@ -125,7 +128,8 @@
                    html.append("<td>"+galssTask.getThickness()+"</td>");
                    html.append("<td>"+slicecages.getCount()+"</td>");
                    html.append("<td>"+slicecages.getProcesscardId()+"</td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td>"+galssTask.getEngineeringId()+"</td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
            }

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java

@@ -103,9 +103,10 @@
    }
    
    //结束任务
    @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}")
    @ResponseBody
    public String delecttask(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask(id,line);
    }
    
    @RequestMapping(method=RequestMethod.POST, value="/updatedengluname")
@@ -116,9 +117,11 @@
    }
    
    //中断任务
    @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}")
    @ResponseBody
    public String delecttask1(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask1(id,line);
    }    

    

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/resources/application.properties

@@ -13,10 +13,10 @@
#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XE
#jdbc.username=gmms2
#jdbc.password=gmms2
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost:3306/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

@@ -58,6 +58,8 @@
                    <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/2">&nbsp;&nbsp;&nbsp;&nbsp;领取二#线任务</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/cutmanage/gettask/1">&nbsp;&nbsp;&nbsp;&nbsp;领取一#线任务</a></li>
                    <li class='item_divider'></li>    
                    <li><a href="${ctx }/cutmanage/loadmachinerack">&nbsp;&nbsp;&nbsp;&nbsp;上片位信息</a></li>    

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gettask.jsp

@@ -80,6 +80,11 @@
              
}
    
    function task(){
        window.location.href="${ctx}/cutmanage/task";
	
    }
	
    function updatedengluname(){
          $("#updatedengluname").modal('show');
    
@@ -132,9 +137,8 @@
                <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
                <small style='color:red'>（单击按钮切换工位模式）</small>
                &nbsp;
            <button type="button"
                onclick="{location.href='${ctx }/cutmanage/task'}"
                class="btn btn-primary" id="app">手动任务</button>
            <%-- ${app} --%>
            <button type='button' onclick='task()' class='btn btn-primary' id='app'>手动任务</button>
            <button type="button"
                onclick="{location.href='${ctx }/cutmanage/gettask/${line}'}"
                class="btn btn-primary" id="app">领取 ${line} å·çº¿ä»»åŠ¡</button>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp

@@ -10,40 +10,97 @@
<script type="text/javascript">
    //停止页面自动刷新

    function delecttask(id) {
        //disableAutoRefresh();
        $.ajax({
            async : false,
    var groups=0;
    var id=0;
    var state=0;
    //结束任务弹窗
    function delecttask(groups1,id1) {
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
        $("#add-info1").modal('show');
        groups=groups1;
        id=id1;
        state=1
		
    }
    //中断任务弹窗
    function delecttask1(groups1,id1) {
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
        $("#add-info1").modal('show');
        groups=groups1;
        id=id1;
        state=2
		
    }
    //结束中断任务
    function delecttask3() {
        if(state==1){
            $.ajax({
                async : false,

            type : "GET",
                type : "GET",

            url : "${ctx}/cutmanage/delecttask/" + id,
                url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,

            dataType : "text",
                dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
            }
        });
        alert(id);
                success : function(data) {
                    alert(groups+"号线"+data);
                    if(data=="结束成功"){
                        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                    }
					
                }
            }); 
        }else if(state==2){
            $.ajax({
                async : false,

                type : "GET",

                url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,

                dataType : "text",

                success : function(data) {
                    alert(groups+"号线"+data);
                    if(data=="中断成功"){
                        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                    }
					
                }
            });
        }
		
    }
    //弹窗取消
    function delecttask4() {
        window.location.href = "${ctx}/cutmanage/gettask/" + 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;
                alert(groups+"号线"+data);
                if(data=="中断成功"){
                    window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                }
				
            }
        });
    }
    } */

    function updatetask(id) {
        //disableAutoRefresh();
@@ -78,6 +135,23 @@
            }
        });
    }
	
    function collectingTasks() {
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
		
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        var fileName = document.getElementById("fileName").innerHTML;
        if(state=="0"){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
        if(state=="1"){
            alert("当前已存在两个任务")
        }
    }
	
    function updatedengluname() {
        $("#updatedengluname").modal('show');
        //disableAutoRefresh();
@@ -187,6 +261,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 +285,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 +297,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 +310,7 @@
                            <th>完成数量</th>
                            <th>总数量</th>
                            <th>完成面积(mm)</th>
                            <th>状态</th>
                            <th>操作</th>

                        </tr>
@@ -240,7 +320,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 +331,7 @@
                            <th>厚度</th>
                            <th>颜色</th>
                            <th>状态</th>
                            <th>工程</th>
                            <th>操作</th>

                        </tr>
@@ -259,10 +340,41 @@
                    </tbody>
                </table>
            </div>
			
			
            <div class="modal fade" id="add-info1" tabindex="-1" role="dialog"
            aria-labelledby="myModalLabel" aria-hidden="true">
            <form class="form-horizontal" role="form">
                <div class="modal-dialog">
                    <div class="modal-content">
                        <div class="modal-header">
                            <button type="button" class="close" onclick="delecttask4()" data-dismiss="modal"
                                aria-hidden="true">&times;</button>
                            <h3 class="modal-title" id="DEL_AlertTitle">操作提示：</h3>
                        </div>
                        <div class="modal-body" style="text-align: left;">
                            <h3 id="DEL_MsgShow">
                                æ˜¯å¦ç¡®å®šæ‰§è¡Œ <span id="DEL_Id" style="sixe: 25px; font-weight: bold"></span>
                                <span style="sixe: 20px; color: red; font-weight: bold">结束/中断任务
                                </span> æ“ä½œï¼Ÿ
                            </h3>
                        </div>
                        <div class="modal-footer">

                            <button type="button" onclick="delecttask4()" class="btn btn-default btn-lg"
                                    data-dismiss="modal">否</button>
                                <button type="button" onclick="delecttask3()" class="btn btn-primary btn-lg" id="addbtnsubmit">是</button>
                        </div>
                    </div>
                </div>
            </form>
        </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_tijiaobaogong.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_tishi.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%>
        <!-- /.content -->
@@ -280,9 +392,12 @@
            interval = setInterval('refreshStatus()', rTime);//刷新恢复
        }

        function stopRefresh() {
            clearInterval(interval);//停止刷新
        } */
         */
         function stopRefresh() {
                clearInterval(interval);//停止刷新
            } 
		 
		 
        var interval = setInterval('isStop()', rTime);//定时刷新
        function isStop(){  //2024-1-10  yzx ä¿®æ”¹  åŽŸå› ï¼šåŽŸåˆ·æ–°é¡µé¢æœ‰é—®é¢˜
            var str=['baogong_info','div_banzu'];

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks2.jsp

@@ -13,37 +13,37 @@

    //停止页面自动刷新

    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);
    }

    function delecttask1(id) {
    function delecttask1(groups,id) {
        //disableAutoRefresh();disableAutoRefresh();
        $.ajax({
            async : false,

            type : "GET",

            url : "${ctx}/cutmanage/delecttask1/" + 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;
            }
        });
    }
@@ -384,8 +384,7 @@
                                </div>
                            </div>
                            <div class="modal-footer" >
                                <button type="button" class="btn btn-default btn-lg"
                                    data-dismiss="modal">关闭</button>
                                <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">关闭</button>
                                <button type="button" onclick="addrack1()" class="btn btn-primary btn-lg"
                                    id="addbtnsubmit">提交</button>
                            </div>
@@ -422,4 +421,4 @@
    </script>
    <!-- /.content-wrapper -->
</body>
</html>
</html>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/identifymachine/celiangmanage2.jsp

@@ -17,7 +17,7 @@
#example tbody {
      display:block;
      height:595px;
      overflow-y:scroll;
      
}
#example thead,#example tbody tr {
     display:table;
@@ -25,7 +25,6 @@
     table-layout:fixed;
}
#example thead {
     width: calc(100% - 1em);
}
#example thead th {
     background:#ccc;
@@ -360,8 +359,8 @@
            </fieldset>
            <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content"  style="width:700px">
                <div class="modal-dialog" style="width:1200px;">
                    <div class="modal-content"  style="width:1200px;">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true" data-backdrop="static">&times;</button>
@@ -370,28 +369,32 @@
                        </div>
                        <form method="post" class="form-horizontal"
                    action="${ctx}/identifymachine/modify/${groups}">
                    <div class="modal-body">
                    <div class="modal-body"  style="height: 600px;overflow: auto;">
                        <div class="control-group">
                            <table id="example" class="table table-striped table-hover" style='font-size:20px;'>
                            <table id="example" class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
                                
                                <thead>
                                    <tr>
                                        <th style="width:10%">选择</th>
                                        <th style="width:20%">ID</th>
                                        <th style="width:20%">高</th>
                                        <th style="width:20%">宽</th>
                                        <th>流程卡</th>
                                        <th style='text-align: center;'>选择</th>
                                        <th style='text-align: center;'>ID</th>
                                        <th style='text-align: center;'>高</th>
                                        <th style='text-align: center;'>宽</th>
                                        <th style='text-align: center;'>流程卡</th>
                                        <th style='text-align: center;'>版图号</th>
                                        <th style='text-align: center;'>工程号</th>
                                    </tr>
                                </thead>
                                <tbody>
                                <c:forEach items="${glassLists}" var="glass" varStatus="status">
                                    <tr>
                                        <td style="width:10%"><input type="radio" name="glassid"
                                        <td><input type="radio" name="glassid"
                                            value="${glass.id}" /></td>
                                        <td style="width:20%">${glass.id}</td>
                                        <td style="width:20%">${glass.height}</td>
                                        <td style="width:20%">${glass.width}</td>
                                        <td >${glass.id}</td>
                                        <td >${glass.height}</td>
                                        <td >${glass.width}</td>
                                        <td>${glass.processcardId}</td>
                                        <td>${glass.patternTask.rank}</td>
                                        <td>${glass.engineeringId}</td>
                                    </tr>
                                </c:forEach>
                                </tbody>
@@ -436,8 +439,8 @@
            
            <div class="modal fade" id="delete-fix-info" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content">
                <div class="modal-dialog" style="width:1200px;">
                    <div class="modal-content" style="width:1200px;">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true" data-backdrop="static">&times;</button>
@@ -445,26 +448,32 @@
                                style="font-weight: bolder;">破损选择</h3>
                        </div>
                        <form method="post" class="form-horizontal" action="${ctx}/identifymachine/modifyy/${groups}">
                    <div class="modal-body">
                    <div class="modal-body" style="height: 600px;overflow: auto;">
                        <div class="control-group">
                            <table class="table table-striped table-hover" style='font-size:20px;'>
                            <table class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
                                <tbody>
                                <thead>
                                    <tr>
                                        <th>人工选择</th>
                                        <th>#</th>
                                        <th>高</th>
                                        <th>宽</th>
                                        <th style='text-align: center;'>选择</th>
                                        <th style='text-align: center;'>ID</th>
                                        <th style='text-align: center;'>高</th>
                                        <th style='text-align: center;'>宽</th>
                                        <th style='text-align: center;'>流程卡</th>
                                        <th style='text-align: center;'>版图号</th>
                                        <th style='text-align: center;'>工程号</th>
                                        
                                    </tr>
                                </thead>
                                <c:forEach items="${glassLists}" var="glass" varStatus="status">
                                    <tr>
                                        <td><input type="radio" name="glassid2"
                                        <td><input type="radio" name="glassid"
                                            value="${glass.id}" /></td>
                                        <td>${glass.id}</td>
                                        <td>${glass.height}</td>
                                        <td>${glass.width}</td>
                                        <td >${glass.id}</td>
                                        <td >${glass.height}</td>
                                        <td >${glass.width}</td>
                                        <td>${glass.processcardId}</td>
                                        <td>${glass.patternTask.rank}</td>
                                        <td>${glass.engineeringId}</td>
                                    </tr>
                                </c:forEach>
                            </table>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/mes/data/reportform_manage.jsp

@@ -205,6 +205,31 @@
            }
            strSQL += " group by operator";
        }
		
        if(gongyi.equals("修改原片使用")){
            System.out.println(11);
            String width = request.getParameter("width");
            String height = request.getParameter("height");
            String thickness = request.getParameter("thickness");
            String colour = request.getParameter("colour");
            String batch = request.getParameter("batch");
			
            int quantity = Integer.parseInt(request.getParameter("quantity"));
            int groups = Integer.parseInt(request.getParameter("line"));
            String teams = request.getParameter("teams");
            String reportingTime = request.getParameter("reportingTime");
            String type="手动新增";
            if(batch==""){
                strSQL = "insert into gmms_cutmanage(width,height,thickness,color,batch_id,pieces,groups,dengluname,BgTime,engineering_id)"+ 
                        "values ("+width+","+height+","+thickness+",'"+colour+"',"+null+","+quantity+","+groups+",'"+teams+"','"+reportingTime+"','"+type+"')";
            }else{
                strSQL = "insert into gmms_cutmanage(width,height,thickness,color,batch_id,pieces,groups,dengluname,BgTime,engineering_id)"+ 
                        "values ("+width+","+height+","+thickness+",'"+colour+"','"+batch+"',"+quantity+","+groups+",'"+teams+"','"+reportingTime+"','"+type+"')";
            }
			
			
            System.out.println(strSQL);
        }
        //2023-09-19 æ–°å¢ž ç»“束
        //System.out.println("报表SQL：" + strSQL);
        sn.createSql(strSQL);

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp

@@ -147,6 +147,135 @@
                    
                </div>
                <div class="box-body no-padding" id="glass-data" style="overflow-y:scroll"></div>
				
				
        <!-- ä¿®æ”¹åŽŸä½¿ç”¨ -->
        <div class="modal fade" id="UNum-info" tabindex="-1" role="dialog"
            aria-labelledby="myModalLabel" aria-hidden="true">
            <form class="form-horizontal" role="form">
                <div class="modal-dialog">
                    <div class="modal-content">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true">&times;</button>
                            <h3 class="modal-title" id="UNum_AlertTitle">修改原使用：</h3>
                        </div>
                        <div class="modal-body" style="text-align: left;">

                            <div class="form-group">
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">宽： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="width">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">高： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="height">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">厚： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="thickness">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">颜色： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="colour">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">批次： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="batch">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">数量： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="quantity">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">线路： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="line">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">班组： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="text" class="form-control" style="font-size: 18px"
                                        id="teams">
                                </div>
								
                                <h4>
                                    <label class="col-lg-4 control-label no-padding-right"
                                        style="font-weight: bolder;">报工时间： </label>
                                </h4>

                                <div class="col-lg-6 input-group">
                                    <input type="date" class="form-control" style="font-size: 18px"
                                        id="reportingTime">
                                </div>
								
                                <h4 style="text-align: center">
                                    <label class="control-label no-padding-right"
                                        style="font-weight: bolder; color: red;" id="aMsg"> </label>
                                </h4>

                            </div>


                        </div>
                        <div class="modal-footer">

                            <button type="button" class="btn btn-primary btn-lg"
                                data-dismiss="modal">取消</button>

                            <button type="button" class="btn btn-danger btn-lg"
                                id="DEL_button" onclick="UNum_Submit()">确认</button>
                        </div>
                    </div>
                </div>
            </form>
        </div>
				
            </section>
        </div>

@@ -570,6 +699,11 @@
                name : "报工时间",
                binding : 10,
                filter : {}
            }, {
                name : "操作",
                binding : 11,
                type : "element",
                filter : {}
            } ]
        };
        
@@ -634,6 +768,11 @@
                name : "报工时间",
                binding : 9,
                filter : {}
            }, {
                name : "操作",
                binding : 10,
                type : "element",
                filter : {}
            }]
        };
        
@@ -687,6 +826,7 @@
                dataType:'json',
                url:rf_url,
                success:function(data){
					
                    if($("#pc_isShow").is(':checked')){
                        var cDB = createTable(document.getElementById("glass-data"), cuteOpt);
                        var d = data;
@@ -695,11 +835,41 @@
                        if(d!=null && d.length>0){
                            total_num = d.length;
                            for(i=0;i<d.length;i++){
                                var s = "";
                                d[i][0] = i+1;
                                zSl+=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+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000));
								
                                if(!$("#fz_isShow").is(':checked')){
                                    s += "<button class='btn btn-large btn-warning' onclick='updateType("
                                        + d[i][1]
                                        + ","
                                        + d[i][2]
                                        + ","
                                        + d[i][3]
                                        + ",\""
                                        + d[i][4]
                                        + "\",\""
                                        + d[i][5]
                                        + "\","
                                        + zSl
                                        + ","
                                        + d[i][8]
                                        + ",\""
                                        + d[i][9]
                                        + "\",\""
                                        + d[i][10]
                                        + "\")'>修改</button>";
										
                                    var a = d[i];
                                    a.push(s);
                                }else{
                                    var a = d[i];
                                    a.push(s);
                                }
								

                            }
                            $("#rRow").text(d.length);
@@ -721,12 +891,42 @@
                        if(d!=null && d.length>0){
                            total_num = d.length;
                            for(i=0;i<d.length;i++){
                                var s = "";
                                d[i][0] = i+1;
                                zSl+=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));
								
                                if(!$("#fz_isShow").is(':checked')){
                                    s += "<button class='btn btn-large btn-warning' onclick='updateType("
                                        + d[i][1]
                                        + ","
                                        + d[i][2]
                                        + ","
                                        + d[i][3]
                                        + ",\""
                                        + d[i][4]
                                        + "\","
                                        + "\"\""
                                        + ","
                                        + zSl
                                        + ","
                                        + d[i][7]
                                        + ",\""
                                        + d[i][8]
                                        + "\",\""
                                        + d[i][9]
                                        + "\")'>修改</button>";
										
                                    var a = d[i];
                                    a.push(s);
                                }else{
                                    var a = d[i];
                                    a.push(s);
                                }
								
                            }
                            $("#rRow").text(d.length);
                            $("#rSL").text(zSl);
@@ -822,7 +1022,7 @@
 function pageShow(){
    var winHeight=0;
    winHeight=document.body.scrollHeight;
    document.getElementById("glass-data").style.height =(winHeight-100)+"px";
    document.getElementById("glass-data").style.height =(winHeight-360)+"px";
}
 
function ChaXun() {
@@ -835,5 +1035,76 @@
pageShow();
</script>

<script>
function updateType(width, height, thickness, colour,batch,quantity,line,teams,reportingTime) {
	
    document.getElementById("width").value=width;
    document.getElementById("height").value=height;
    document.getElementById("thickness").value=thickness;
    document.getElementById("colour").value=colour;
    document.getElementById("batch").value=batch;
    document.getElementById("quantity").value=quantity;
    document.getElementById("line").value=line;
    document.getElementById("teams").value=teams;
    document.getElementById("reportingTime").value=reportingTime;
    $('#UNum-info').modal('toggle');
	
}


function UNum_Submit(){
    var width = $('#width').val();
    var height = $('#height').val();
    var thickness = $('#thickness').val();
    var colour = $('#colour').val();
    var batch = $('#batch').val();
    var quantity = $('#quantity').val();
    var line = $('#line').val();
    var teams = $('#teams').val();
    var reportingTime = $('#reportingTime').val();
	
    if(width!=""&&height!=""&&thickness!=""&&colour!=""&&quantity!=""&&line!=""&&teams!=""&&reportingTime!=""){
        if(isNaN(quantity)){
            $("#aMsg").html("请输入数量！");
        }else{
			
            $("#aMsg").html("");
			
             $.ajax({
                type:'post',
                url:rf_url,
                dataType:'text',
                data:{
                    gongyi:"修改原片使用",
                    width:width,
                    height:height,
                    thickness:thickness,
                    colour:colour,
                    batch:batch,
                    quantity:quantity,
                    line:line,
                    teams:teams,
                    reportingTime:reportingTime,
                },success:function(data){
                    var d= data.trim();
                    if(d = 1){
                        $('#UNum-info').modal('hide');
                        ChaXun();
					
                    }
                },error:function(data){
					
                    $("#aMsg").html("修改失败,失败原因："+data);
                }
				
            }); 
        }		
    }else{
        $("#aMsg").html("输入不能为空！");
    } 

}
</script>

</body>
</html>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/slicecage/slicecagerank.jsp

@@ -272,7 +272,8 @@
                        <th>厚度(mm)</th>
                        <th>数量</th>
                        <th>流程卡号</th>
                        <th>禁用状态(1为禁用)</th>
                        <th>工程号</th>
                        <th style="width:200px">禁用状态(1为禁用)</th>
                    </tr>
                </thead>
                <tbody>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/slicecage/slicecagerank2.jsp

@@ -272,7 +272,8 @@
                        <th>厚度(mm)</th>
                        <th>数量</th>
                        <th>流程卡号</th>
                        <th>禁用状态(1为禁用)</th>
                        <th>工程号</th>
                        <th style="width:200px">禁用状态(1为禁用)</th>
                    </tr>
                </thead>
                <tbody>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/classes/application.properties

@@ -13,10 +13,10 @@
#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XE
#jdbc.username=gmms2
#jdbc.password=gmms2
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost:3306/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

@@ -58,6 +58,8 @@
                    <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/2">&nbsp;&nbsp;&nbsp;&nbsp;领取二#线任务</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/cutmanage/gettask/1">&nbsp;&nbsp;&nbsp;&nbsp;领取一#线任务</a></li>
                    <li class='item_divider'></li>    
                    <li><a href="${ctx }/cutmanage/loadmachinerack">&nbsp;&nbsp;&nbsp;&nbsp;上片位信息</a></li>    

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp

@@ -80,6 +80,11 @@
              
}
    
    function task(){
        window.location.href="${ctx}/cutmanage/task";
	
    }
	
    function updatedengluname(){
          $("#updatedengluname").modal('show');
    
@@ -132,9 +137,8 @@
                <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
                <small style='color:red'>（单击按钮切换工位模式）</small>
                &nbsp;
            <button type="button"
                onclick="{location.href='${ctx }/cutmanage/task'}"
                class="btn btn-primary" id="app">手动任务</button>
            <%-- ${app} --%>
            <button type='button' onclick='task()' class='btn btn-primary' id='app'>手动任务</button>
            <button type="button"
                onclick="{location.href='${ctx }/cutmanage/gettask/${line}'}"
                class="btn btn-primary" id="app">领取 ${line} å·çº¿ä»»åŠ¡</button>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp

@@ -10,40 +10,97 @@
<script type="text/javascript">
    //停止页面自动刷新

    function delecttask(id) {
        //disableAutoRefresh();
        $.ajax({
            async : false,
    var groups=0;
    var id=0;
    var state=0;
    //结束任务弹窗
    function delecttask(groups1,id1) {
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
        $("#add-info1").modal('show');
        groups=groups1;
        id=id1;
        state=1
		
    }
    //中断任务弹窗
    function delecttask1(groups1,id1) {
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
        $("#add-info1").modal('show');
        groups=groups1;
        id=id1;
        state=2
		
    }
    //结束中断任务
    function delecttask3() {
        if(state==1){
            $.ajax({
                async : false,

            type : "GET",
                type : "GET",

            url : "${ctx}/cutmanage/delecttask/" + id,
                url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,

            dataType : "text",
                dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
            }
        });
        alert(id);
                success : function(data) {
                    alert(groups+"号线"+data);
                    if(data=="结束成功"){
                        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                    }
					
                }
            }); 
        }else if(state==2){
            $.ajax({
                async : false,

                type : "GET",

                url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,

                dataType : "text",

                success : function(data) {
                    alert(groups+"号线"+data);
                    if(data=="中断成功"){
                        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                    }
					
                }
            });
        }
		
    }
    //弹窗取消
    function delecttask4() {
        window.location.href = "${ctx}/cutmanage/gettask/" + 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;
                alert(groups+"号线"+data);
                if(data=="中断成功"){
                    window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                }
				
            }
        });
    }
    } */

    function updatetask(id) {
        //disableAutoRefresh();
@@ -78,6 +135,23 @@
            }
        });
    }
	
    function collectingTasks() {
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
		
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        var fileName = document.getElementById("fileName").innerHTML;
        if(state=="0"){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
        if(state=="1"){
            alert("当前已存在两个任务")
        }
    }
	
    function updatedengluname() {
        $("#updatedengluname").modal('show');
        //disableAutoRefresh();
@@ -187,6 +261,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 +285,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 +297,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 +310,7 @@
                            <th>完成数量</th>
                            <th>总数量</th>
                            <th>完成面积(mm)</th>
                            <th>状态</th>
                            <th>操作</th>

                        </tr>
@@ -240,7 +320,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 +331,7 @@
                            <th>厚度</th>
                            <th>颜色</th>
                            <th>状态</th>
                            <th>工程</th>
                            <th>操作</th>

                        </tr>
@@ -259,10 +340,41 @@
                    </tbody>
                </table>
            </div>
			
			
            <div class="modal fade" id="add-info1" tabindex="-1" role="dialog"
            aria-labelledby="myModalLabel" aria-hidden="true">
            <form class="form-horizontal" role="form">
                <div class="modal-dialog">
                    <div class="modal-content">
                        <div class="modal-header">
                            <button type="button" class="close" onclick="delecttask4()" data-dismiss="modal"
                                aria-hidden="true">&times;</button>
                            <h3 class="modal-title" id="DEL_AlertTitle">操作提示：</h3>
                        </div>
                        <div class="modal-body" style="text-align: left;">
                            <h3 id="DEL_MsgShow">
                                æ˜¯å¦ç¡®å®šæ‰§è¡Œ <span id="DEL_Id" style="sixe: 25px; font-weight: bold"></span>
                                <span style="sixe: 20px; color: red; font-weight: bold">结束/中断任务
                                </span> æ“ä½œï¼Ÿ
                            </h3>
                        </div>
                        <div class="modal-footer">

                            <button type="button" onclick="delecttask4()" class="btn btn-default btn-lg"
                                    data-dismiss="modal">否</button>
                                <button type="button" onclick="delecttask3()" class="btn btn-primary btn-lg" id="addbtnsubmit">是</button>
                        </div>
                    </div>
                </div>
            </form>
        </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_tijiaobaogong.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_tishi.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%>
        <!-- /.content -->
@@ -280,9 +392,12 @@
            interval = setInterval('refreshStatus()', rTime);//刷新恢复
        }

        function stopRefresh() {
            clearInterval(interval);//停止刷新
        } */
         */
         function stopRefresh() {
                clearInterval(interval);//停止刷新
            } 
		 
		 
        var interval = setInterval('isStop()', rTime);//定时刷新
        function isStop(){  //2024-1-10  yzx ä¿®æ”¹  åŽŸå› ï¼šåŽŸåˆ·æ–°é¡µé¢æœ‰é—®é¢˜
            var str=['baogong_info','div_banzu'];

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/identifymachine/celiangmanage2.jsp

@@ -17,7 +17,7 @@
#example tbody {
      display:block;
      height:595px;
      overflow-y:scroll;
      
}
#example thead,#example tbody tr {
     display:table;
@@ -25,7 +25,6 @@
     table-layout:fixed;
}
#example thead {
     width: calc(100% - 1em);
}
#example thead th {
     background:#ccc;
@@ -360,8 +359,8 @@
            </fieldset>
            <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content"  style="width:700px">
                <div class="modal-dialog" style="width:1200px;">
                    <div class="modal-content"  style="width:1200px;">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true" data-backdrop="static">&times;</button>
@@ -370,28 +369,32 @@
                        </div>
                        <form method="post" class="form-horizontal"
                    action="${ctx}/identifymachine/modify/${groups}">
                    <div class="modal-body">
                    <div class="modal-body"  style="height: 600px;overflow: auto;">
                        <div class="control-group">
                            <table id="example" class="table table-striped table-hover" style='font-size:20px;'>
                            <table id="example" class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
                                
                                <thead>
                                    <tr>
                                        <th style="width:10%">选择</th>
                                        <th style="width:20%">ID</th>
                                        <th style="width:20%">高</th>
                                        <th style="width:20%">宽</th>
                                        <th>流程卡</th>
                                        <th style='text-align: center;'>选择</th>
                                        <th style='text-align: center;'>ID</th>
                                        <th style='text-align: center;'>高</th>
                                        <th style='text-align: center;'>宽</th>
                                        <th style='text-align: center;'>流程卡</th>
                                        <th style='text-align: center;'>版图号</th>
                                        <th style='text-align: center;'>工程号</th>
                                    </tr>
                                </thead>
                                <tbody>
                                <c:forEach items="${glassLists}" var="glass" varStatus="status">
                                    <tr>
                                        <td style="width:10%"><input type="radio" name="glassid"
                                        <td><input type="radio" name="glassid"
                                            value="${glass.id}" /></td>
                                        <td style="width:20%">${glass.id}</td>
                                        <td style="width:20%">${glass.height}</td>
                                        <td style="width:20%">${glass.width}</td>
                                        <td >${glass.id}</td>
                                        <td >${glass.height}</td>
                                        <td >${glass.width}</td>
                                        <td>${glass.processcardId}</td>
                                        <td>${glass.patternTask.rank}</td>
                                        <td>${glass.engineeringId}</td>
                                    </tr>
                                </c:forEach>
                                </tbody>
@@ -436,8 +439,8 @@
            
            <div class="modal fade" id="delete-fix-info" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content">
                <div class="modal-dialog" style="width:1200px;">
                    <div class="modal-content" style="width:1200px;">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true" data-backdrop="static">&times;</button>
@@ -445,26 +448,32 @@
                                style="font-weight: bolder;">破损选择</h3>
                        </div>
                        <form method="post" class="form-horizontal" action="${ctx}/identifymachine/modifyy/${groups}">
                    <div class="modal-body">
                    <div class="modal-body" style="height: 600px;overflow: auto;">
                        <div class="control-group">
                            <table class="table table-striped table-hover" style='font-size:20px;'>
                            <table class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
                                <tbody>
                                <thead>
                                    <tr>
                                        <th>人工选择</th>
                                        <th>#</th>
                                        <th>高</th>
                                        <th>宽</th>
                                        <th style='text-align: center;'>选择</th>
                                        <th style='text-align: center;'>ID</th>
                                        <th style='text-align: center;'>高</th>
                                        <th style='text-align: center;'>宽</th>
                                        <th style='text-align: center;'>流程卡</th>
                                        <th style='text-align: center;'>版图号</th>
                                        <th style='text-align: center;'>工程号</th>
                                        
                                    </tr>
                                </thead>
                                <c:forEach items="${glassLists}" var="glass" varStatus="status">
                                    <tr>
                                        <td><input type="radio" name="glassid2"
                                        <td><input type="radio" name="glassid"
                                            value="${glass.id}" /></td>
                                        <td>${glass.id}</td>
                                        <td>${glass.height}</td>
                                        <td>${glass.width}</td>
                                        <td >${glass.id}</td>
                                        <td >${glass.height}</td>
                                        <td >${glass.width}</td>
                                        <td>${glass.processcardId}</td>
                                        <td>${glass.patternTask.rank}</td>
                                        <td>${glass.engineeringId}</td>
                                    </tr>
                                </c:forEach>
                            </table>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/DP_chanliang.jsp

@@ -7,15 +7,11 @@
            <div class="modal-content" style="background-color: #d9d9d9;">
                <div class="modal-header">
                    <div class="form-group" style="margin: auto; text-align: center">
						

                        <button type="button" class="btn btn-primary close"
                            data-dismiss="modal" aria-hidden="true">【关闭】</button>
                    </div>
                </div>
                <div class="modal-body" style=" width:1200px;height: 600px; display: flex;">


                    <div id="cl_container2" style=" width: 400px;height: 600px; float:left;"></div>
                    <div id="cl_container3" style=" width: 1200px;height: 600px; float:left;"></div>
                    
@@ -25,7 +21,6 @@
        </div>
    </form>
</div>

<script>
function modalDPShow_chanliang() {
    $("#div_daping_chanliang").modal('toggle');
@@ -89,10 +84,10 @@
    zongzhi2=y2;
}
var chartDom11 = document.getElementById('cl_container2');

var myChart11 = echarts.init(chartDom11);
var option11;
option11 = {

  title: {
    text:'产量',//主标题文本
            left:'center',
@@ -167,7 +162,6 @@
    }
  ]
};

option11 && myChart11.setOption(option11);



 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/modal_daping.jsp

@@ -108,13 +108,11 @@
                if(data.length>0){
                    for(var i =0;i<data.length;i++)
                        current_gongxu_banzu.push(data[i][0]);
					
                    getFormat(0);//默认开始时间
                    $("#endtime").val(format);
                    getFormat(6);//默认结束时间
                    $("#starttime").val(format);
                    myChart.resize();

                    myCharts_.resize();

                    chat_query();

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/slicecage/slicecagerank.jsp

@@ -272,7 +272,8 @@
                        <th>厚度(mm)</th>
                        <th>数量</th>
                        <th>流程卡号</th>
                        <th>禁用状态(1为禁用)</th>
                        <th>工程号</th>
                        <th style="width:200px">禁用状态(1为禁用)</th>
                    </tr>
                </thead>
                <tbody>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/slicecage/slicecagerank2.jsp

@@ -272,7 +272,8 @@
                        <th>厚度(mm)</th>
                        <th>数量</th>
                        <th>流程卡号</th>
                        <th>禁用状态(1为禁用)</th>
                        <th>工程号</th>
                        <th style="width:200px">禁用状态(1为禁用)</th>
                    </tr>
                </thead>
                <tbody>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.xml

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
#Generated by Maven
#Tue Jan 14 12:37:10 CST 2025
#Fri Jun 13 11:06:57 CST 2025
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\ddd\MES_11\src\main\java\com\northglass\entity\MachineDispose.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\applicationListener\InitializeSystemApplicationListener.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\CRCUtil.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\shelfmanager\ShelfManagerController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskStock.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineDisposeDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\log\GLoggerConstants.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\reportform\ReportformService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\MachineState.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PatternTaskBufferDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\gaoliwei\GaoliweiController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PasswordDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\Globel\mes.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\ServiceInterface.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RawFileDao2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\AbstractMessageService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Rank.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\UserDetails.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\compound\CompoundMachineService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao4.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskSlicecageDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\home\Test.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\SlicecageDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\UserDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\ClientListener.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\WebColor.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\SlicecagePattern.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\GlassColor.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTask2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\SqlHelper\DBHelper.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Slicecage.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\identifymachine\IdentifyMachineController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\message\MessageProcessor.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\slicecage\SlicecageService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\hollow\HollowService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RankDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\ServerConnection.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\LoadRackDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\SlicecagePatternDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineType.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Yuanpianpandian.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\galsstask\GalssTaskController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\mes\MesController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\IdentifyErrorDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\EdgPerimeterDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\HorizontalDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfRackDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\LoginController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DongZuoTableDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Horizontal.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskHollow.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfRack2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\shelfmanager2\ShelfManagerController2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\AbstractMessageProcessor.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\zfunc.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\gaoliwei\GaoliweiMachineService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\HexUtil.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\toughening\tougheningController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\reportform\ReportformController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\account\AccountService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachinesTypeDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\EdgPerimeter.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskDetails.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\PatternTask.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Task.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfTask2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\FolderUtil.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\device\DeviceController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\device\DeviceService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\IdEntity.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\standalone\StandAloneService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\message\AbstractMessageProcessor.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\UserAdminController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame4.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\CutmanagedetailisDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\YuanpianpandianDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\ExcelUtil.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\countmachine\CountMachineController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\cutmanage\CutManageController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\cutmanage\CutManageService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\ProfileController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\IdentifyError.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\DropFrameDao3.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskDetailsDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ProdLineState.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTask.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\User.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RawPackageDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\compound\CompoundMachineController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DongZuoTable.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\PreprocessingGlass.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\shelfmanager2\ShelfManagerService2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\UserDetailsDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\StateConstants.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineFont.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\standalone\StandAloneController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ConnectState.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Cutmanagedetailis.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PreprocessingGlassDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskSlicecage.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\galsstask\GalssTaskService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\ServiceException.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\RawFile2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\RawPackage.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\log\GLoggerFactory.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\common\AbstractMachineService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineMessageDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\slicecage\SlicecageController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\AbstractMachineClient.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\hollowslicecage\HollowSlicecageController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\rest\TaskRestController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\shelfmanager\ShelfManagerService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\RawFileDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskStockDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\MachineService\MachineService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskBuffer.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\MachineClientListener.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\AbstractServerListener.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskDao2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\FunctionNumber.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\rest\RestException.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\SlicecageTemperingDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\SqlHelper\DBSession.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\PatternTaskBuffer.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\RawFile.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GlassNumberColorDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskShelfDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskHollowDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\LiuChengKaReportDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\device\Device.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\GalssTaskBufferDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Machines.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\json\JsonTimeValueProcessor.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\ping\PingController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Password.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\hollowslicecage\HollowslicecageService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\Fragments.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\MachineMessage.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\DBHelper.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\LiuChengKaReport.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\mes\JSPController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ProdLineStateDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\hollow\HollowController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\identifymachine\IdentifyMachineService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\account\ShiroDbRealm.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\SetupUtil.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\home\HomeController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\countmachinetask\CountMachineTaskService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\util\JbarcodeUtil.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ShelfTaskFlag.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\GlassLayout\Algorithm\AlgorithmDBInterface.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\rest\RestExceptionHandler.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\SlicecageTempering.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\toughening\tougheningService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\AbstractMessage.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfTask.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\ShelfRack.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\FragmentsDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\AbstractMachine.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\task\TaskService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\manage\ManageController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\DropFrame3.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ArrangeMachineTaskType.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GalssTaskShelf.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\TaskDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\ShelfTaskType.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfTaskDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\constants\MessageType.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\ShelfRackDao2.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\LoadRack.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\system\SystemService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\listener\ServerListener.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\web\account\RegisterController.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\MachineFontDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\service\TV\DropFrameTVService.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\repository\PatternTaskDao.java
D:\workeclipse\ddd\MES_11\src\main\java\com\northglass\entity\GlassNumberColor.java
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

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/cutmanage/gettask_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/cutmanage/gotasks_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/error/_404_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/error/_500_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/gaoliwei/gaoliweiFinish_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/gaoliwei/gaoliwei_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/manage/NewFile_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/cangchu_005fmangage_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/cangchuliaojia_005fmangage_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/dapingxianshi_005fmangage_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/guanghuaqian_005fmanage_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/public_005fmanage_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/switch_005fganghua_005fmode_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/CC_005fliaojia_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/CC_005frenwu_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/DT_005fdapingxianshi_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/Edg_005fStatistics2_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/Edg_005fStatistics_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/GH_005fShangPianWei_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/view/ReportForm_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/shelfmanager/rankmanager_jsp.java

File was deleted

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java

@@ -325,13 +325,14 @@
        }
        List<Integer> countPiece = this.countPiece(taskList);
        model.addAttribute("taskhtml", this.getTasks(line));
        model.addAttribute("patterns", taskList);
        model.addAttribute("patterns", this.gettas(line));
        model.addAttribute("sumPiece", countPiece.get(0));
        model.addAttribute("comPiece", countPiece.get(1));
        model.addAttribute("line", line);
        Map<String, Object> param1 = manageService.showMachineState();
         model.addAttribute("info", param1.get("info"));
        return "redirect:/cutmanage/gettask/"+line;
        model.addAttribute("allstatu", param1.get("allstatu"));
        model.addAttribute("info", param1.get("info"));
        model.addAttribute("line", line);
        return "cutmanage/gottask";
    }

    

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java

@@ -196,7 +196,7 @@
    public void connect() {
//        shelfService.connect();
//        measureMachineService.connect();
        loadMachineService.connect();
        /*loadMachineService.connect();
        cutMachineService.connect();
        identifyMachineService.connect();
        arrangeMachineService.connect();
@@ -204,7 +204,7 @@
        gaoliweiMachineService.connect();
        edgeMachineService.connect();
        washMachineService.connect();
        countMachineService.connect();
        countMachineService.connect();*/
    }

    public List<Device> deviceManage() {

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java

@@ -313,6 +313,11 @@
                                }
                                if (line.length() > 8 && line.startsWith("PzNOTE11")) {
                                    String PzNOTE11 = line.substring(9);// ç²¾ç£¨
                                    if(!PzNOTE11.trim().equals("")){
                                        gla.setPolish(PzNOTE11);
                                    }else{
                                        gla.setPolish("0");
                                    }
                                }
                                if (line.length() > 8 && line.startsWith("PzNOTE12")) {
                                    String PzNOTE12 = line.substring(9);// æ¥¼å±‚号

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/src/main/resources/application.properties

@@ -16,7 +16,7 @@

#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.url=jdbc:mariadb://localhost:3307/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=


 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/src/main/webapp/static/optFile1/CUTMACHINE1_300ƬÓÅ»¯ _2021-01-07-15-43-43.opt

File was deleted

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/target/classes/application.properties

@@ -16,7 +16,7 @@

#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.url=jdbc:mariadb://localhost:3307/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=


 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Built-By: northglass
Build-Jdk: 1.8.0_31
Built-By: aaa
Build-Jdk: 1.8.0_121
Created-By: Maven Integration for Eclipse


 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties

@@ -1,7 +1,7 @@
#Generated by Maven Integration for Eclipse
#Fri Feb 05 08:53:05 CST 2021
#Mon May 26 16:09:18 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
m2e.projectName=gmms_nglass
m2e.projectLocation=D\:\\workeclipse\\gmms_nglass
m2e.projectName=gmms2
m2e.projectLocation=D\:\\Documents\\MES_Projects\\\u73BB\u7483\u516C\u53F8\u9879\u76EE\\gmms_nglass
artifactId=gmms2

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,354 @@
com\northglass\web\account\UserAdminController.class
com\northglass\repository\ShelfHoistDao.class
com\northglass\listener\ShelfConnection.class
com\northglass\constants\StateConstants$GlassArrangeState.class
com\northglass\listener\ClientListener.class
com\northglass\service\countmachine\CountMachineService.class
com\northglass\service\filmremovemachine\FilmRemoveMachineService.class
com\northglass\entity\ArrangeMachine.class
com\northglass\repository\GlassNumberColorDao.class
com\northglass\entity\DummyFixRack.class
com\northglass\web\countmachine\CountMachineController.class
com\northglass\constants\FunctionNumber$CountMachineFunctionNumber.class
com\northglass\constants\StateConstants$IdentifyMachineState.class
com\northglass\entity\MeasureMachine.class
com\northglass\repository\ShelfMessageDao.class
com\northglass\service\ServiceException.class
com\northglass\web\common\UploadController.class
com\northglass\repository\ArrangeMachineDao.class
com\northglass\web\account\RegisterController.class
com\northglass\entity\CardNumber.class
com\northglass\repository\ArrangeMachineStatuDao.class
com\northglass\log\GLoggerFactory.class
com\northglass\entity\Shelf.class
com\northglass\repository\DummyFixRackDao.class
com\northglass\listener\GMMSPrinter.class
com\northglass\constants\StateConstants$ManufactureBatchState.class
com\northglass\constants\StateConstants$ArrangeMachineTaskState.class
com\northglass\constants\StateConstants$LoadMachineState.class
com\northglass\service\message\ShelfMessageProcessor.class
com\northglass\constants\StateConstants$CountMachineState.class
com\northglass\service\message\TidyMachineMessageProcessor.class
com\northglass\entity\SingalGlass.class
com\northglass\repository\ShelfTaskDao.class
com\northglass\entity\EdgeMachine.class
com\northglass\constants\StateConstants$GrindFaceMachineState.class
com\northglass\listener\CutMachineClientListener.class
com\northglass\repository\ManufactureBatchDao.class
com\northglass\service\device\Device.class
com\northglass\constants\StateConstants$GaoliweiFunctionNumber.class
com\northglass\service\message\ChamferMessageProcessor.class
com\northglass\repository\GaoliweiMachineDao.class
com\northglass\constants\StateConstants$RackState.class
com\northglass\repository\RawPackageDao.class
com\northglass\service\common\ServiceInterface.class
com\northglass\web\task\TaskController.class
com\northglass\constants\StateConstants$ArrangeMachineState.class
com\northglass\service\shelf\ShelfService.class
com\northglass\entity\Rack.class
com\northglass\repository\ChamferMachineDao.class
com\northglass\repository\WashMachineTaskDao.class
com\northglass\entity\Machine.class
com\northglass\entity\GlassNumberColor.class
com\northglass\service\rawpackage\RawPackageService$1.class
com\northglass\constants\StateConstants$ArrangePieceStatu.class
com\northglass\constants\FunctionNumber.class
com\northglass\repository\LoadMachineFixRackDao.class
com\northglass\constants\StateConstants$WashMachineState.class
com\northglass\constants\StateConstants$ShelfState.class
com\northglass\entity\Cutting.class
com\northglass\service\task\TaskService.class
com\northglass\entity\ArrangeMachineRank.class
com\northglass\service\glass\GlassService.class
com\northglass\constants\ShelfTaskType.class
com\northglass\web\systemmgmt\SystemMgmtController.class
com\northglass\entity\GlassCommer.class
com\northglass\entity\GaoliweiMachineTask.class
com\northglass\repository\GaoliweiMachineTaskDao.class
com\northglass\constants\StateConstants$LightTaskState.class
com\northglass\entity\OPattern.class
com\northglass\entity\CountMachineStatu.class
com\northglass\service\countmachinetask\CountMachineTaskService.class
com\northglass\repository\ReportTaskDao.class
com\northglass\listener\EdgeMachineClientListener.class
com\northglass\service\message\AbstractMessageProcessor.class
com\northglass\repository\LoadMessageDao.class
com\northglass\entity\GaoliweiMachine.class
com\northglass\entity\IdEntity.class
com\northglass\service\shelfmanager\ShelfManagerService$1.class
com\northglass\entity\PrintName.class
com\northglass\service\rawpackage\RawPackageService.class
com\northglass\web\device\DeviceController.class
com\northglass\entity\CountMachineTask.class
com\northglass\constants\StateConstants$GrindEdgeMachineState.class
com\northglass\constants\StateConstants$MeasureMachineState.class
com\northglass\entity\AbstractMachine.class
com\northglass\entity\IdentifyPattern.class
com\northglass\repository\ShelfStatuDao.class
com\northglass\listener\ShelfServerListener.class
com\northglass\repository\IdentifyWarnDao.class
com\northglass\repository\ReportTaskLoadDao.class
com\northglass\constants\ShelfTaskFlag.class
com\northglass\entity\User.class
com\northglass\rest\RestException.class
com\northglass\constants\StateConstants$GrindEdgeMachineTaskState.class
com\northglass\service\reportmanage\ReportManageService.class
com\northglass\repository\CuttingOptPatternDao.class
com\northglass\service\cutmachinemanage\GetTaskService.class
com\northglass\repository\BreakReportDao.class
com\northglass\listener\TidyMachineClientListener.class
com\northglass\service\machine\MachineService.class
com\northglass\entity\AbstractMachineClient.class
com\northglass\service\common\AbstractMachineService.class
com\northglass\repository\LoadMachineTaskDao.class
com\northglass\repository\ArrangeMachineTaskDao.class
com\northglass\repository\IdentifyMachineDao.class
com\northglass\service\optpattern\OptPatternService.class
com\northglass\service\missingpiece\MisssingManageService.class
com\northglass\service\cutmachinetask\CutMachineTaskService.class
com\northglass\web\cutmanage\CutManageController.class
com\northglass\web\manage\ManageController.class
com\northglass\entity\AbstractMessage.class
com\northglass\entity\Glass.class
com\northglass\service\identifymachine\IdentifyMachineService.class
com\northglass\listener\ServerListener.class
com\northglass\service\message\CountMachineMessageProcessor.class
com\northglass\constants\FunctionNumber$LoadMachineFunctionNumber.class
com\northglass\constants\StateConstants$IdentifyPatternState.class
com\northglass\entity\TougheningGroup.class
com\northglass\constants\FunctionNumber$MeasureMachineFunctionNumber.class
com\northglass\service\cutmachine\CutMachineService.class
com\northglass\service\message\WashMachineMessageProcessor.class
com\northglass\entity\RankFit.class
com\northglass\constants\MessageType.class
com\northglass\repository\ManufactureBatchMachineDao.class
com\northglass\repository\TougheningGroupDao.class
com\northglass\entity\ReportTaskLoad.class
com\northglass\repository\RawPackageTxtDao.class
com\northglass\entity\MachineError.class
com\northglass\service\shelf\ShelfMessageService.class
com\northglass\constants\FunctionNumber$ShelfFunctionNumber.class
com\northglass\service\loadmachinerack\LoadMachineRackService.class
com\northglass\constants\StateConstants$PreprocessingGlassState.class
com\northglass\service\common\AbstractMessageService.class
com\northglass\constants\WebColor.class
com\northglass\entity\IdentifyFloor.class
com\northglass\entity\LoadMachine.class
com\northglass\service\gaoliwei\GaoliweiMachineService.class
com\northglass\repository\CountMachineTaskDao.class
com\northglass\web\shelf\ShelfController.class
com\northglass\repository\RankFitDao.class
com\northglass\web\shelfmanager\ShelfManagerController.class
com\northglass\repository\GlassCommerDao.class
com\northglass\repository\LoadMachineRackDao.class
com\northglass\listener\ArrangeMachineClientListener.class
com\northglass\constants\StateConstants$ShelfHoistState.class
com\northglass\constants\StateConstants$CutMachineState.class
com\northglass\repository\ArrangeMachineRankDao.class
com\northglass\constants\StateConstants$TougheningGlassState.class
com\northglass\constants\StateConstants$CountMachineTaskState.class
com\northglass\repository\TougheningGlassDao.class
com\northglass\constants\ArrangeMachineTaskType.class
com\northglass\constants\StateConstants$EdgeMachineState.class
com\northglass\service\edgemachine\EdgeMachineService.class
com\northglass\repository\GlassDao.class
com\northglass\entity\LoadMachineStatu.class
com\northglass\service\shelfmanager\ShelfManagerService.class
com\northglass\web\identifymachine\IdentifyMachineController.class
com\northglass\constants\StateConstants$RawPackageTxtState.class
com\northglass\entity\ReportTask.class
com\northglass\constants\FunctionNumber$GrindFaceMachineFunctionNumber.class
com\northglass\entity\CountMachine.class
com\northglass\util\CRCUtil.class
com\northglass\constants\StateConstants$printStatu.class
com\northglass\constants\StateConstants$ShelfTaskState.class
com\northglass\constants\GlassColor.class
com\northglass\repository\IdentifyFloorDao.class
com\northglass\service\message\LoadMachineMessageProcessor.class
com\northglass\entity\FileMeta.class
com\northglass\entity\WashMachineStatu.class
com\northglass\repository\WashMachineDao.class
com\northglass\constants\StateConstants$PrintMachineState.class
com\northglass\entity\PreprocessingGlass.class
com\northglass\entity\GaoliweiStatu.class
com\northglass\service\account\ShiroDbRealm$ShiroUser.class
com\northglass\constants\StateConstants$GaoliweiMachineState.class
com\northglass\entity\ShelfMessage.class
com\northglass\service\tidy\TidyMachineService.class
com\northglass\constants\MachineType.class
com\northglass\entity\MachineStatu.class
com\northglass\listener\IdentifyMachineClientListener.class
com\northglass\web\standalone\StandAloneController.class
com\northglass\repository\LoadMachineDao.class
com\northglass\entity\MachineTask.class
com\northglass\repository\TaskDao.class
com\northglass\entity\ManufactureBatch.class
com\northglass\web\machine\MachineState.class
com\northglass\constants\StateConstants$GlassState.class
com\northglass\entity\Rank.class
com\northglass\service\common\AbstractMessageProcessor.class
com\northglass\entity\ShelfTask.class
com\northglass\entity\OptPattern.class
com\northglass\web\rawpackage\RawPackageController.class
com\northglass\constants\MachineState.class
com\northglass\entity\BreakReport.class
com\northglass\listener\ShelfClientListener.class
com\northglass\entity\ArrangePiecesStatu.class
com\northglass\web\missingmanage\MissingManageController.class
com\northglass\service\shelfrank\ShelfRankService.class
com\northglass\entity\ArrangeMachineStatu.class
com\northglass\entity\GrindEdgeMachineTwo.class
com\northglass\entity\WashMachine.class
com\northglass\entity\LoadMessage.class
com\northglass\repository\PrintSizeDao.class
com\northglass\repository\TidyMachineDao.class
com\northglass\repository\MeasureMachineDao.class
com\northglass\repository\UserDao.class
com\northglass\constants\StateConstants.class
com\northglass\listener\LoadMachineServerListener.class
com\northglass\entity\ShelfStatu.class
com\northglass\entity\Step.class
com\northglass\entity\TougheningGlass.class
com\northglass\repository\CardNumberDao.class
com\northglass\constants\StateConstants$sendGlassState.class
com\northglass\entity\GlassOrder.class
com\northglass\listener\ChamferMachineClientListener.class
com\northglass\web\account\LoginController.class
com\northglass\web\shelfrank\ShelfRankController.class
com\northglass\entity\Shape.class
com\northglass\entity\TestOut.class
com\northglass\repository\TestOutDao.class
com\northglass\service\arrangemachine\ArrangeMachineService.class
com\northglass\listener\GaoliweiMachineClientListener.class
com\northglass\constants\StateConstants$LoadMachineRackState.class
com\northglass\repository\PreprocessingGlassDao.class
com\northglass\entity\RawPackageTxt.class
com\northglass\web\arrangemachine\ArrangeMachineController.class
com\northglass\web\breakmanage\BreakController.class
com\northglass\entity\DummyGlass.class
com\northglass\entity\GlassTest.class
com\northglass\entity\TidyMachine.class
com\northglass\constants\FunctionNumber$IdentifyMachineFunctionNumber.class
com\northglass\entity\LoadMachineRack.class
com\northglass\service\orderglassinfo\OrderGlassInfoService.class
com\northglass\util\ExcelUtil.class
com\northglass\web\api\ApiListController.class
com\northglass\rest\RestExceptionHandler.class
com\northglass\repository\ShelfRankDao.class
com\northglass\service\machinetask\MachineTaskService.class
com\northglass\entity\IdentifyMachineStatu.class
com\northglass\service\message\ArrangeMachineMessageProcessor.class
com\northglass\entity\LoadMachineTask.class
com\northglass\log\GLoggerConstants.class
com\northglass\service\message\MeasureMachineMessageProcessor.class
com\northglass\repository\IdentifyPatternDao.class
com\northglass\service\test\updatesql.class
com\northglass\service\message\GaoliweiMessageProcessor.class
com\northglass\listener\CountMachineServerListener.class
com\northglass\repository\ProdLineStateDao.class
com\northglass\service\manage\ManageService.class
com\northglass\web\home\HomeController.class
com\northglass\repository\SingalGlassDao.class
com\northglass\entity\DummyTime.class
com\northglass\web\reportmanage\ReportManageController.class
com\northglass\constants\StateConstants$MachineState.class
com\northglass\constants\StateConstants$RawPackageState.class
com\northglass\service\message\EdgeMessageProcessor.class
com\northglass\applicationListener\InitializeSystemApplicationListener.class
com\northglass\constants\StateConstants$LightState.class
com\northglass\service\message\IdentifyMachineMessageProcessor.class
com\northglass\repository\GrindEdgeMachineTwoDao.class
com\northglass\constants\FunctionNumber$CallMachineFunctionNumber.class
com\northglass\entity\PrintMachine.class
com\northglass\service\measuremachine\MeasureMachineService.class
com\northglass\util\JbarcodeUtil.class
com\northglass\listener\WashMachineClientListener.class
com\northglass\entity\PrintSize.class
com\northglass\constants\StateConstants$CallMachineState.class
com\northglass\repository\FilmRemoveMachineDao.class
com\northglass\repository\GlassTestDao.class
com\northglass\repository\GrindEdgeMachineDao.class
com\northglass\constants\StateConstants$CountTaskState.class
com\northglass\service\cutmanage\CutManageService.class
com\northglass\constants\StateConstants$ArrangeMachineRankState.class
com\northglass\repository\OrderGlassInfoDao.class
com\northglass\web\loadmachine\LoadMachineController.class
com\northglass\util\HexUtil.class
com\northglass\repository\PrintNameDao.class
com\northglass\service\loadmachine\LoadMachineService.class
com\northglass\entity\OrderInfo.class
com\northglass\repository\EdgeMachineDao.class
com\northglass\repository\OptPatternDao.class
com\northglass\web\gaoliwei\GaoliweiController.class
com\northglass\repository\CountRankDao.class
com\northglass\entity\CutMachine.class
com\northglass\entity\CountRank.class
com\northglass\json\JsonTimeValueProcessor.class
com\northglass\listener\LoadMachineClientListener.class
com\northglass\web\account\ProfileController.class
com\northglass\constants\StateConstants$OptPatternState.class
com\northglass\constants\StateConstants$TaskState.class
com\northglass\service\washmachine\WashMachineService.class
com\northglass\service\arrangemachinerank\ArrangeMachineRankService.class
com\northglass\service\message\CutMachineMessageProcessor.class
com\northglass\util\SetupUtil.class
com\northglass\web\orderglassinfo\OrderGlassInfoController.class
com\northglass\repository\CutMachineTaskDao.class
com\northglass\listener\CutMachineServerListener.class
com\northglass\entity\Task.class
com\northglass\entity\ManufactureBatchMachine.class
com\northglass\listener\ServerConnection.class
com\northglass\entity\CutMachineMessage.class
com\northglass\entity\ShelfRank.class
com\northglass\service\account\ShiroDbRealm.class
com\northglass\entity\WashMachineTask.class
com\northglass\repository\GlassOrderDao.class
com\northglass\entity\ArrangeMachineTask.class
com\northglass\entity\IdentifyMachine.class
com\northglass\listener\GaoliweiMachineServerListener.class
com\northglass\repository\PrintMachineDao.class
com\northglass\constants\FunctionNumber$GrindEdgeMachineFunctionNumber.class
com\northglass\entity\CountMachineSort.class
com\northglass\constants\FunctionNumber$ArrangeMachineFunctionNumber.class
com\northglass\service\shelftask\ShelfTaskService.class
com\northglass\constants\StateConstants$ConnectState.class
com\northglass\entity\ShelfHoist.class
com\northglass\entity\CutMachineStatu.class
com\northglass\entity\FilmRemoveMachine.class
com\northglass\constants\StateConstants$ArrangeMachineTaskStatu.class
com\northglass\listener\MeasureMachineClientListener.class
com\northglass\constants\StateConstants$ShelfRankState.class
com\northglass\service\account\AccountService.class
com\northglass\constants\StateConstants$CutMachineTaskState.class
com\northglass\service\system\SystemService.class
com\northglass\entity\Info.class
com\northglass\listener\AbstractServerListener.class
com\northglass\repository\CountMachineDao.class
com\northglass\entity\ChamferMachine.class
com\northglass\repository\MachineStatuDao.class
com\northglass\entity\GrindEdgeMachine.class
com\northglass\entity\IdentifyWarn.class
com\northglass\service\chamfermachine\ChamferMachineService.class
com\northglass\entity\EdgeMachineStatu.class
com\northglass\constants\StateConstants$LoadMachineTaskState.class
com\northglass\entity\DummyRack.class
com\northglass\repository\CutMachineDao.class
com\northglass\entity\TidyMachineStatu.class
com\northglass\web\arrangemachinerank\ArrangeMachineRankController.class
com\northglass\service\breakmanage\BreakService.class
com\northglass\entity\CutMachineTask.class
com\northglass\entity\LoadMachineFixRack.class
com\northglass\rest\TaskRestController.class
com\northglass\service\standalone\StandAloneService.class
com\northglass\constants\StateConstants$FilmRemoveMachineState.class
com\northglass\entity\CuttingOptPattern.class
com\northglass\repository\ShelfDao.class
com\northglass\util\FolderUtil.class
com\northglass\listener\CountMachineClientListener.class
com\northglass\repository\RankDao.class
com\northglass\constants\ConnectState.class
com\northglass\entity\ProdLineState.class
com\northglass\entity\DummyCut.class
com\northglass\repository\CountMachineSortDao.class
com\northglass\service\device\DeviceService.class
com\northglass\entity\RawPackage.class

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,16 +1,16 @@
com\northglass\service\account\AccountServiceTest.class
com\northglass\functional\gui\UserAdminFT.class
com\northglass\functional\gui\TaskGuiFT.class
com\northglass\repository\TaskDaoTest.class
com\northglass\functional\BaseFunctionalTestCase.class
com\northglass\data\TaskData.class
com\northglass\functional\rest\TaskRestFT.class
com\northglass\QuickStartServer.class
com\northglass\functional\BaseSeleniumTestCase.class
com\northglass\repository\JpaMappingTest.class
com\northglass\data\JsonTest.class
com\northglass\functional\gui\UserAdminFT.class
com\northglass\service\account\AccountServiceTest.class
com\northglass\functional\gui\SecurityFT.class
com\northglass\functional\gui\RegisterFT.class
com\northglass\functional\rest\TaskRestFT$TaskList.class
com\northglass\functional\rest\TaskRestFT.class
com\northglass\functional\gui\TaskGuiFT.class
com\northglass\repository\JpaMappingTest.class
com\northglass\repository\TaskDaoTest.class
com\northglass\QuickStartServer.class
com\northglass\functional\BaseFunctionalTestCase.class
com\northglass\data\UserData.class
com\northglass\functional\gui\SecurityFT.class
com\northglass\functional\BaseSeleniumTestCase.class
com\northglass\functional\gui\ProfileFT.class
com\northglass\data\JsonTest.class

 ²£Á§¹«Ë¾ÏîÄ¿/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java

@@ -53,183 +53,183 @@
      _jspx_out = out;
      _jspx_resourceInjector = (org.glassfish.jsp.api.ResourceInjector) application.getAttribute("com.sun.appserv.jsp.resource.injector");

      out.write("\n");
      out.write("\n");
      out.write("\n");
      out.write("\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("\r\n");
      if (_jspx_meth_c_set_0(_jspx_page_context))
        return;
      out.write("\n");
      out.write("\n");
      out.write("<!DOCTYPE html>\n");
      out.write("<html>\n");
      out.write("<head>\n");
      out.write("  <meta charset=\"utf-8\">\n");
      out.write("  <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n");
      out.write("  <title>MES | ç™»å½•</title>\n");
      out.write("  <!-- Tell the browser to be responsive to screen width -->\n");
      out.write("  <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no\" name=\"viewport\">\n");
      out.write("  <!-- Bootstrap 3.3.7 -->\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("<!DOCTYPE html>\r\n");
      out.write("<html>\r\n");
      out.write("<head>\r\n");
      out.write("  <meta charset=\"utf-8\">\r\n");
      out.write("  <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\r\n");
      out.write("  <title>MES | ç™»å½•</title>\r\n");
      out.write("  <!-- Tell the browser to be responsive to screen width -->\r\n");
      out.write("  <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no\" name=\"viewport\">\r\n");
      out.write("  <!-- Bootstrap 3.3.7 -->\r\n");
      out.write("  <link rel=\"stylesheet\" href=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css\">\n");
      out.write("  <!-- Font Awesome -->\n");
      out.write("/static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css\">\r\n");
      out.write("  <!-- Font Awesome -->\r\n");
      out.write("  <link rel=\"stylesheet\" href=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css\">\n");
      out.write("  <!-- Ionicons -->\n");
      out.write("/static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css\">\r\n");
      out.write("  <!-- Ionicons -->\r\n");
      out.write("  <link rel=\"stylesheet\" href=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css\">\n");
      out.write("  <!-- Theme style -->\n");
      out.write("/static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css\">\r\n");
      out.write("  <!-- Theme style -->\r\n");
      out.write("  <link rel=\"stylesheet\" href=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/dist/css/AdminLTE.min.css\">\n");
      out.write("  <!-- iCheck -->\n");
      out.write("/static/AdminLTE/dist/css/AdminLTE.min.css\">\r\n");
      out.write("  <!-- iCheck -->\r\n");
      out.write("  <link rel=\"stylesheet\" href=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/plugins/iCheck/square/blue.css\">\n");
      out.write("\n");
      out.write("  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->\n");
      out.write("  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->\n");
      out.write("  <!--[if lt IE 9]>\n");
      out.write("  <script src=\"https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js\"></script>\n");
      out.write("  <script src=\"https://oss.maxcdn.com/respond/1.4.2/respond.min.js\"></script>\n");
      out.write("  <![endif]-->\n");
      out.write("\n");
      out.write("  <!-- Google Font -->\n");
      out.write("  <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic\">\n");
      out.write("\n");
      out.write("<!-- jQuery 3 -->\n");
      out.write("/static/AdminLTE/plugins/iCheck/square/blue.css\">\r\n");
      out.write("\r\n");
      out.write("  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->\r\n");
      out.write("  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->\r\n");
      out.write("  <!--[if lt IE 9]>\r\n");
      out.write("  <script src=\"https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js\"></script>\r\n");
      out.write("  <script src=\"https://oss.maxcdn.com/respond/1.4.2/respond.min.js\"></script>\r\n");
      out.write("  <![endif]-->\r\n");
      out.write("\r\n");
      out.write("  <!-- Google Font -->\r\n");
      out.write("  <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic\">\r\n");
      out.write("\r\n");
      out.write("<!-- jQuery 3 -->\r\n");
      out.write("<script src=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/bower_components/jquery/dist/jquery.min.js\"></script>\n");
      out.write("<!-- Bootstrap 3.3.7 -->\n");
      out.write("/static/AdminLTE/bower_components/jquery/dist/jquery.min.js\"></script>\r\n");
      out.write("<!-- Bootstrap 3.3.7 -->\r\n");
      out.write("<script src=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js\"></script>\n");
      out.write("<!-- iCheck -->\n");
      out.write("/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js\"></script>\r\n");
      out.write("<!-- iCheck -->\r\n");
      out.write("<script src=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/AdminLTE/plugins/iCheck/icheck.min.js\"></script>\n");
      out.write("<script>\n");
      out.write("  $(function () {\n");
      out.write("    $('input').iCheck({\n");
      out.write("      checkboxClass: 'icheckbox_square-blue',\n");
      out.write("      radioClass: 'iradio_square-blue',\n");
      out.write("      increaseArea: '20%' /* optional */\n");
      out.write("    });\n");
      out.write("  });\n");
      out.write("</script>\n");
      out.write("\n");
      out.write(" <style>\n");
      out.write("        div.background\n");
      out.write("        {\n");
      out.write("            width:400px;\n");
      out.write("            height:270px;\n");
      out.write("            margin-left:-5%;\n");
      out.write("            border:1px solid black;\n");
      out.write("            background:rgba(0,0,0,0.05);/*关键代码*/\n");
      out.write("            z-index:100;\n");
      out.write("        }\n");
      out.write("        \n");
      out.write("        div.transbox\n");
      out.write("        {\n");
      out.write("            width:300px;\n");
      out.write("            height:35px;\n");
      out.write("            margin-left:15%;\n");
      out.write("            margin-top:50px;\n");
      out.write("            border:0px solid rgba(255,0,0,0.3);\n");
      out.write("            z-index:101;\n");
      out.write("        }\n");
      out.write("        \n");
      out.write("        .thumbnaildiv {\n");
      out.write("        height: 150px;\n");
      out.write("        text-align: center;\n");
      out.write("        padding: 15px;\n");
      out.write("    }\n");
      out.write("    </style>\n");
      out.write("</head>\n");
      out.write("\n");
      out.write("\n");
      out.write("<body style=\"background-image: url('/gmms2/static/images/glass.jpg'); background-size: cover;\">\n");
      out.write("/static/AdminLTE/plugins/iCheck/icheck.min.js\"></script>\r\n");
      out.write("<script>\r\n");
      out.write("  $(function () {\r\n");
      out.write("    $('input').iCheck({\r\n");
      out.write("      checkboxClass: 'icheckbox_square-blue',\r\n");
      out.write("      radioClass: 'iradio_square-blue',\r\n");
      out.write("      increaseArea: '20%' /* optional */\r\n");
      out.write("    });\r\n");
      out.write("  });\r\n");
      out.write("</script>\r\n");
      out.write("\r\n");
      out.write(" <style>\r\n");
      out.write("        div.background\r\n");
      out.write("        {\r\n");
      out.write("            width:400px;\r\n");
      out.write("            height:270px;\r\n");
      out.write("            margin-left:-5%;\r\n");
      out.write("            border:1px solid black;\r\n");
      out.write("            background:rgba(0,0,0,0.05);/*关键代码*/\r\n");
      out.write("            z-index:100;\r\n");
      out.write("        }\r\n");
      out.write("        \r\n");
      out.write("        div.transbox\r\n");
      out.write("        {\r\n");
      out.write("            width:300px;\r\n");
      out.write("            height:35px;\r\n");
      out.write("            margin-left:15%;\r\n");
      out.write("            margin-top:50px;\r\n");
      out.write("            border:0px solid rgba(255,0,0,0.3);\r\n");
      out.write("            z-index:101;\r\n");
      out.write("        }\r\n");
      out.write("        \r\n");
      out.write("        .thumbnaildiv {\r\n");
      out.write("        height: 150px;\r\n");
      out.write("        text-align: center;\r\n");
      out.write("        padding: 15px;\r\n");
      out.write("    }\r\n");
      out.write("    </style>\r\n");
      out.write("</head>\r\n");
      out.write("\r\n");
      out.write("\r\n");
      out.write("<body style=\"background-image: url('/gmms2/static/images/glass.jpg'); background-size: cover;\">\r\n");
 if (SetupUtil.databaseExists()) { 
      out.write("\n");
      out.write("<div style=\"margin-top: 150px;\"> \n");
      out.write("\r\n");
      out.write("<div style=\"margin-top: 150px;\"> \r\n");
      out.write("<div align=\"center\"><img alt=\"logo\" src=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/static/images/blacklogo.png\" style=\"width: 450px;height: 100px; \"></div>\n");
      out.write("<div class=\"login-box\" style=\"margin-top: 10px;\">\n");
      out.write("  <!-- <div class=\"login-logo\">\n");
      out.write("    <img alt=\"logo\" src=\"/gmms2/static/images/logo.jpg\">\n");
      out.write("  </div> -->\n");
      out.write(" \n");
      out.write("  \n");
      out.write("  <!-- /.login-logo -->\n");
      out.write("  <div class=\"background\" style=\"border-radius:3px;\" id=\"mydiv\">\n");
      out.write("/static/images/blacklogo.png\" style=\"width: 450px;height: 100px; \"></div>\r\n");
      out.write("<div class=\"login-box\" style=\"margin-top: 10px;\">\r\n");
      out.write("  <!-- <div class=\"login-logo\">\r\n");
      out.write("    <img alt=\"logo\" src=\"/gmms2/static/images/logo.jpg\">\r\n");
      out.write("  </div> -->\r\n");
      out.write(" \r\n");
      out.write("  \r\n");
      out.write("  <!-- /.login-logo -->\r\n");
      out.write("  <div class=\"background\" style=\"border-radius:3px;\" id=\"mydiv\">\r\n");
      out.write("    <form action=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/login\" method=\"post\">\n");
      out.write("/login\" method=\"post\">\r\n");
      out.write("    ");

    String error = (String) request.getAttribute(FormAuthenticationFilter.DEFAULT_ERROR_KEY_ATTRIBUTE_NAME);
    if(error != null){
    
      out.write("\n");
      out.write("\t\t<div class=\"alert alert-error input-medium controls\">\n");
      out.write("\t\t\t<button class=\"close\" data-dismiss=\"alert\">×</button>登录失败，请重试.\n");
      out.write("\t\t</div>\n");
      out.write("\r\n");
      out.write("\t\t<div class=\"alert alert-error input-medium controls\">\r\n");
      out.write("\t\t\t<button class=\"close\" data-dismiss=\"alert\">×</button>登录失败，请重试.\r\n");
      out.write("\t\t</div>\r\n");
      out.write("\t");

    }
    
      out.write("\n");
      out.write("    <!-- <div style =\"font-size:25px;text-align:center \">玻璃生产管理系统</div><br><br> -->\n");
      out.write("      <div class=\"transbox\">\n");
      out.write("        <font size=\"4\">用户名:</font><input type=\"text\" name=\"username\" class=\"form-control\" placeholder=\"请输入账户\">\n");
      out.write("        <span class=\"glyphicon glyphicon-user form-control-feedback\"></span>\n");
      out.write("      </div>\n");
      out.write("      <div class=\"transbox\">\n");
      out.write("        <font size=\"4\">密码:</font><input type=\"password\" name=\"password\" class=\"form-control\" placeholder=\"请输入密码\">\n");
      out.write("        <span class=\"glyphicon glyphicon-lock form-control-feedback\"></span>\n");
      out.write("      </div>\n");
      out.write("      <div class=\"transbox\">\n");
      out.write("        <div class=\"col-xs-8\">\n");
      out.write("          <div class=\"checkbox icheck\">\n");
      out.write("          \t<label style=\"color: red;\">\n");
      out.write("              \t记住<input type=\"checkbox\">\n");
      out.write("            </label>\n");
      out.write("          </div>\n");
      out.write("        </div>\n");
      out.write("        <!-- /.col -->\n");
      out.write("        <div class=\"col-xs-4\">\n");
      out.write("          <button type=\"submit\" class=\"btn btn-primary btn-block btn-flat\">登 å½•</button>\n");
      out.write("        </div>\n");
      out.write("        <!-- /.col -->\n");
      out.write("      </div>\n");
      out.write("    </form>\n");
      out.write("  </div>\n");
      out.write("  <!-- /.login-box-body -->\n");
      out.write("</div>\n");
      out.write("<!-- /.login-box -->\n");
      out.write("\n");
      out.write("</div>\n");
      out.write("<div style=\"margin-left: 2%; margin-top: 19%;\"><strong>Copyright &copy; 2014-2018 <a href=\"#\">上海北玻自动化技术有限公司</a>.</strong> All rights reserved.</div>\n");
      out.write("\r\n");
      out.write("    <!-- <div style =\"font-size:25px;text-align:center \">玻璃生产管理系统</div><br><br> -->\r\n");
      out.write("      <div class=\"transbox\">\r\n");
      out.write("        <font size=\"4\">用户名:</font><input type=\"text\" name=\"username\" class=\"form-control\" placeholder=\"请输入账户\">\r\n");
      out.write("        <span class=\"glyphicon glyphicon-user form-control-feedback\"></span>\r\n");
      out.write("      </div>\r\n");
      out.write("      <div class=\"transbox\">\r\n");
      out.write("        <font size=\"4\">密码:</font><input type=\"password\" name=\"password\" class=\"form-control\" placeholder=\"请输入密码\">\r\n");
      out.write("        <span class=\"glyphicon glyphicon-lock form-control-feedback\"></span>\r\n");
      out.write("      </div>\r\n");
      out.write("      <div class=\"transbox\">\r\n");
      out.write("        <div class=\"col-xs-8\">\r\n");
      out.write("          <div class=\"checkbox icheck\">\r\n");
      out.write("          \t<label style=\"color: red;\">\r\n");
      out.write("              \t记住<input type=\"checkbox\">\r\n");
      out.write("            </label>\r\n");
      out.write("          </div>\r\n");
      out.write("        </div>\r\n");
      out.write("        <!-- /.col -->\r\n");
      out.write("        <div class=\"col-xs-4\">\r\n");
      out.write("          <button type=\"submit\" class=\"btn btn-primary btn-block btn-flat\">登 å½•</button>\r\n");
      out.write("        </div>\r\n");
      out.write("        <!-- /.col -->\r\n");
      out.write("      </div>\r\n");
      out.write("    </form>\r\n");
      out.write("  </div>\r\n");
      out.write("  <!-- /.login-box-body -->\r\n");
      out.write("</div>\r\n");
      out.write("<!-- /.login-box -->\r\n");
      out.write("\r\n");
      out.write("</div>\r\n");
      out.write("<div style=\"margin-left: 2%; margin-top: 19%;\"><strong>Copyright &copy; 2014-2018 <a href=\"#\">上海北玻自动化技术有限公司</a>.</strong> All rights reserved.</div>\r\n");
      out.write(" ");
 } else { 
      out.write("\n");
      out.write("\r\n");
      out.write("        \t\t\t\t\t<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("/systemmgmt/initializeDatabase\" class=\"btn btn-large btn-success\">创建数据库表</a>\n");
      out.write("        \t\t\t\t\t<br><br>\n");
      out.write("        \t\t\t\t\t<p align=\"left\">首次部署系统时，点击此按钮将创建数据库表，并导入货架、吊装位、切割机、上片位信息</p>\n");
      out.write("       \t\t\n");
      out.write("/systemmgmt/initializeDatabase\" class=\"btn btn-large btn-success\">创建数据库表</a>\r\n");
      out.write("        \t\t\t\t\t<br><br>\r\n");
      out.write("        \t\t\t\t\t<p align=\"left\">首次部署系统时，点击此按钮将创建数据库表，并导入货架、吊装位、切割机、上片位信息</p>\r\n");
      out.write("       \t\t\r\n");
      out.write("    ");
 } 
      out.write("\n");
      out.write(" \n");
      out.write("</body>\n");
      out.write("</html>\n");
      out.write("\r\n");
      out.write(" \r\n");
      out.write("</body>\r\n");
      out.write("</html>\r\n");
    } catch (Throwable t) {
      if (!(t instanceof SkipPageException)){
        out = _jspx_out;