3a975df5b368bc68ee7a81d34920b209f2ff607b..084f17d969edbcc1a7dcf536a5555025372bae9c
2025-05-27 廖井涛
提交
084f17 对比 | 目录
2025-05-27 廖井涛
Merge branch 'master' of http://bore.pub:10439/r/MES_Projects
d687ff 对比 | 目录
2025-05-27 严智鑫
测试更新
80f64d 对比 | 目录
19个文件已修改
2个文件已添加
1个文件已删除
2850 ■■■■■ 已修改文件
河北望美项目/MES_11/.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/.project 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/.settings/org.eclipse.wst.common.component 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks2.jsp 345 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/src/main/webapp/WEB-INF/web.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/src/main/resources/application.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/src/main/webapp/static/optFile1/CUTMACHINE1_300片优化 _2021-01-07-15-43-43.opt 1783 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/target/classes/application.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst 354 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
玻璃公司项目/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java 278 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/.gitignore
New file
@@ -0,0 +1 @@
/target/
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
    <name>MES_11</name>
    <name>WmMES</name>
    <comment></comment>
    <projects>
    </projects>
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
    <wb-module deploy-name="gmms2">
    <wb-module deploy-name="WmMES">
        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
        <property name="context-root" value="gmms2"/>
        <property name="java-output-path" value="/gmms2/target/classes"/>
        <property name="java-output-path" value="/WmMES/target/classes"/>
        <property name="context-root" value="WmMES"/>
    </wb-module>
</project-modules>
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java
@@ -30,11 +30,12 @@
    @Query("select t from PatternTask t where t.workState='已完成' and  t.groups=?1")
    public List<PatternTask> findbygroups(Long groups);
    
    @Query("select t from PatternTask t where t.workState='已完成' and  t.groups=?1 and t.rawFile.id=?2")
    public List<PatternTask> findbygroups2(Long groups,Long id);
    
    
    @Query("select t from PatternTask t where  t.groups=?1 order by t.id")
    @Query("select t from PatternTask t where  t.groups=?1")
    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/web/cutmanage/CutManageController.java
@@ -116,6 +116,7 @@
    }
    
    //中断任务
    @RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}/{line}")
    public String delecttask1(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask1(id,line);
@@ -163,7 +164,12 @@
     @RequestMapping(method=RequestMethod.POST, value="/updatepieces")
    @ResponseBody
    public boolean updatepieces(HttpServletRequest request, Model model) {
         cutManageService.updatepieces(Long.valueOf(request.getParameter("rankid")),request.getParameter("pieces"));
         cutManageService.updatepieces(Long.valueOf(request.getParameter("rankid"))
                 ,request.getParameter("width")
                 ,request.getParameter("height")
                 ,request.getParameter("thinkness")
                 ,request.getParameter("color")
                 ,request.getParameter("count"));
        return true;
    }
     
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks2.jsp
New file
@@ -0,0 +1,345 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<c:set var="ctx" value="${pageContext.request.contextPath}" />
<html>
<head>
<script type="text/javascript"
    src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
<script src="${ctx}/static/js/ng/tb-2.0.js" type="text/javascript"></script>
<script type="text/javascript">
    //停止页面自动刷新
    function delecttask(id) {
        //disableAutoRefresh();
        $.ajax({
            async : false,
            type : "GET",
            url : "${ctx}/cutmanage/delecttask/" + id,
            dataType : "text",
            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
            }
        });
        alert(id);
    }
    function delecttask1(id) {
        //disableAutoRefresh();disableAutoRefresh();
        $.ajax({
            async : false,
            type : "GET",
            url : "${ctx}/cutmanage/delecttask1/" + id,
            dataType : "text",
            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
            }
        });
    }
    function updatetask(id) {
        $("#add-info1").modal('show');
        rankId=id;
    }
    function updatetask1(id) {
        //disableAutoRefresh();
        var groups = document.getElementsByName('groups')[0].value;
        $.ajax({
            cache : false,
            type : "POST",
            dataType : "json",
            url : "${ctx}/cutmanage/updatetask1",
            data : {
                "id" : id,
            },
            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
    }
    function updatedengluname() {
        $("#updatedengluname").modal('show');
        //disableAutoRefresh();
    }
    function updatedengluname1() {
        //disableAutoRefresh();
        var groups = document.getElementsByName('groups')[0].value;
        var dengluname = document.getElementById('dengluname').innerHTML;
        $.ajax({
            cache : false,
            type : "POST",
            dataType : "json",
            url : "${ctx}/cutmanage/updatedengluname",
            data : {
                "groups" : groups,
                "username" : dengluname,
            },
            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
    }
    function able_entry() {
        var g = ${groups};
        $.ajax({
            url : "/gmms2/mesview/data/_service",
            type : "post",
            data : {
                m : "load_entery",
                p : g
            },
            success : function(data) {
                var d = JSON.parse(data);
                if (d.result != "ok")
                    alert(data);
                else
                    window.location.reload();
            },
            error : function(data) {
                alert(data);
            }
        });
    }
    //修改数量
    function addrack1(){
         var pieces=document.getElementById("pieces7").value;
         if(pieces==null||pieces==""){
             alert("请输入数量 ");
         }else{
            $.ajax({
                  cache:false,
                    type:"POST",
                    dataType : "json",
                     url:"${ctx}/cutmanage/updatepieces",
                     data:{
                         "rankid":rankId,
                         "pieces":pieces
                     },success:function(data){
                           window.location.href="${ctx}/cutmanage/gettask/4";
                      }
            });
         }
    }
    var gongyi = "磨边";
    var group = ${groups};
    var rTime = 5000;
    var rankId=0;
</script>
<style>
.box table tr th, .box table tr td {
    text-align: center;
}
.table>tbody>tr>td {
    vertical-align: middle;
    /* content:middle; */
    text-align: center;
    font-weight: bold;
    font-size: 16px;
    /* border: 1px solid green; */
}
.table>thead>tr>th {
    font-weight: bold;
    font-size: 20px;
    text-align: center;
}
h1 {
    display: inline;
}
.s-style {
    font-size: 18px;
    font-weight: bold;
}
.s-title {
    font-size: 18px;
    /*font-weight: bold;
     text-align :center; */
    vertical-align: middle;
    text-align: center
}
.sel-style {
    width: 200px;
    font-size: 20px;
}
</style>
<title>任务</title>
</head>
<body>
    <div class="content-wrapper">
        <!-- <div style='height:20px;width:300px;background-color:#3C8DBC;float:right;'><span style = 'color:#fff;' >故障情况:</span><span id='infos'></span></div> -->
        <section class="content-header">
            <h1>
                è®¢å•任务&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                <small>当前班组:</small> &nbsp; <span id="s_current_banzu"
                    style="font-weight: bold;"></span> &nbsp;
                <button id="btnBanZu" type='button' class='btn btn-primary '
                    onclick='onChangeBanZu()'>选择班组</button>
                &nbsp;
                <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='offWork()'>切割-产量</button>
                &nbsp;
                &nbsp;
                <%-- <small>当前上片工位模式:</small> &nbsp;
                <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
                <small style='color:red'>(单击按钮切换工位模式)</small> --%>
                &nbsp;
                <!-- <button id="btnOffWork" type='button' class='btn btn-primary '
                    onclick='offWork()'>下班-报工提交</button> -->
            </h1>
            <ol class="breadcrumb">
                <li><a href="#">设备<i class="fa fa-dashboard"></i>任务
                </a></li>
            </ol>
        </section>
        <div id="allstatu" allstatu="${allstatu}"></div>
        <div id="info" info="${info}"></div>
        <!-- Main content -->
        <input style="display: none" type="text" name="groups"
            value="${groups}" />
        <section class="content container-fluid">
            <div></div>
            <div>
                <!-- <span>状态:</span> <span id="st"></span> -->
                <!-- <button class="btn btn-large btn-success" style="margin-left: 20px"
                    onclick="able_entry();">确认</button> -->
                <%--  ${rawPackageslistname} --%>
            </div>
            <div class="box"
                style="height: 120px; overflow: auto; margin-top: 10px;">
                <table class="table table-striped table-hover"
                    style="overflow-x: auto">
                    <thead>
                        <tr>
                            <th>工程名称</th>
                            <th>完成数量</th>
                            <th>总数量</th>
                            <th>完成面积(mm)</th>
                            <th>操作</th>
                        </tr>
                    </thead>
                    <tbody>${pattertaskHtml}
                    </tbody>
                </table>
            </div>
            <div class="box"
                style="height: 600px; overflow: auto; margin-top: 10px;">
                <table class="table table-striped table-hover2"
                    style="overflow-x: auto">
                    <thead>
                        <tr>
                            <th>编号</th>
                            <th>宽度</th>
                            <th>高度</th>
                            <th>厚度</th>
                            <th>颜色</th>
                            <th>状态</th>
                            <th>操作</th>
                        </tr>
                    </thead>
                    <tbody>${pattertaskHtml2}
                    </tbody>
                </table>
            </div>
            <!--修改数量-->
            <div class="modal fade" id="add-info1" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content" style="height: 500px;">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true" data-backdrop="static">&times;</button>
                            <h3 class="modal-title" id="myModalLabel"
                                style="font-weight: bolder;">修改数量</h3>
                        </div>
                            <input type="hidden" id="addRawPackage" name="Ids">
                            <div class="modal-body">
                                <div id="linheight" class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">数量 </label>
                                    </h4>
                                    <div class="col-sm-9">
                                        <input type="number" required="required" max="9000" min="0" class=" sortNumber form-control"
                                            value="" name="pieces2" id="pieces7"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                            </div>
                            <div class="modal-footer" >
                                <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>
                    </div>
                </div>
            </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_tishi.jsp"%>
        <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%>
        <!-- /.content -->
    </div>
    <%@ include file="/WEB-INF/views/mes/view/modal_js_gongwei_mode.jsp" %>
    <script>
        var st = ${able};
        if (st == 0) {
            $("#st").text("未确认");
            $("#st").attr('class','label label-warning');
        }else if(st==1) {
            $("#st").text("已确认");
            $("#st").attr('class','label label-success');
        }
        else {
            $("#st").text("已确认");
            $("#st").attr('class','label label-danger');
        }
    </script>
    <!-- /.content-wrapper -->
</body>
</html>
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp
@@ -7,15 +7,11 @@
            <div class="modal-content" style="background-color: #d9d9d9;">
                <div class="modal-header">
                    <div class="form-group" style="margin: auto; text-align: center">
                        <button type="button" class="btn btn-primary close"
                            data-dismiss="modal" aria-hidden="true">【关闭】</button>
                    </div>
                </div>
                <div class="modal-body" style=" width:1200px;height: 600px; display: flex;">
                    <div id="cl_container2" style=" width: 400px;height: 600px; float:left;"></div>
                    <div id="cl_container3" style=" width: 1200px;height: 600px; float:left;"></div>
                    
@@ -25,7 +21,6 @@
        </div>
    </form>
</div>
<script>
function modalDPShow_chanliang() {
    $("#div_daping_chanliang").modal('toggle');
@@ -89,10 +84,10 @@
    zongzhi2=y2;
}
var chartDom11 = document.getElementById('cl_container2');
var myChart11 = echarts.init(chartDom11);
var option11;
option11 = {
  title: {
    text:'产量',//主标题文本
            left:'center',
@@ -167,7 +162,6 @@
    }
  ]
};
option11 && myChart11.setOption(option11);
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp
@@ -108,13 +108,11 @@
                if(data.length>0){
                    for(var i =0;i<data.length;i++)
                        current_gongxu_banzu.push(data[i][0]);
                    getFormat(0);//默认开始时间
                    $("#endtime").val(format);
                    getFormat(6);//默认结束时间
                    $("#starttime").val(format);
                    myChart.resize();
                    myCharts_.resize();
                    chat_query();
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
  <display-name>gmms2</display-name>
  <display-name>WmMES</display-name>
  <context-param>
    <param-name>contextConfigLocation</param-name>
    <param-value>
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.url=jdbc:mariadb://10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
  <display-name>gmms2</display-name>
  <display-name>WmMES</display-name>
  <context-param>
    <param-name>contextConfigLocation</param-name>
    <param-value>
²£Á§¹«Ë¾ÏîÄ¿/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;