望美切换订单模式修改

廖井涛

2025-06-11 42154214c5698326710edf336b3148830b646bb2

望美切换订单模式修改

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

@@ -49,8 +49,8 @@
    @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);
@@ -61,10 +61,10 @@
    @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")
@@ -74,7 +74,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/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/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());


            
@@ -269,7 +273,7 @@
    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());
@@ -290,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";
        
        
@@ -756,7 +763,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>");

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

@@ -122,7 +122,7 @@
        MessageProcessor.generateReturnMessage(str,Machine);
    }
    public void connect() {
/*        List<Machines> shelf67=machineDao.findAll();		
        /*List<Machines> shelf67=machineDao.findAll();		
        for (Machines machines : shelf67) {
            machineService.connect(machines);
        }*/

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

@@ -69,7 +69,7 @@
                    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>");
@@ -112,7 +112,7 @@
                    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>");

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

@@ -13,7 +13,7 @@
#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/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true

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

@@ -80,13 +80,22 @@
    }
    
    function collectingTasks() {
        //disableAutoRefresh();
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        if(state=="0"){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        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"&&fileName.includes('P')){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
        if(state=="1"){
            alert("当前已存在两个任务")
        }
        if(!fileName.includes('P')){
            alert("补片/手动工程请结束任务再领取")
        }
    }
    
    function updatedengluname() {
@@ -298,9 +307,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/classes/application.properties

@@ -13,7 +13,7 @@
#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/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true

 ºÓ±±ÍûÃÀÏîÄ¿/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,7 @@
                <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="{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,37 +10,37 @@
<script type="text/javascript">
    //停止页面自动刷新

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

            type : "GET",

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

            dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
        alert(id);
        alert(groups);
    }

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

            type : "GET",

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

            dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
    }
@@ -78,6 +78,23 @@
            }
        });
    }
	
    function collectingTasks() {
        stopRefresh();
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        var fileName = document.getElementById("fileName").innerHTML;
        if(state=="0"&&fileName.includes('P')){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
        if(state=="1"){
            alert("当前已存在两个任务")
        }
        if(!fileName.includes('P')){
            alert("补片/手动工程请结束任务再领取")
        }
    }
	
    function updatedengluname() {
        $("#updatedengluname").modal('show');
        //disableAutoRefresh();
@@ -187,6 +204,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 +228,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 +240,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 +253,7 @@
                            <th>完成数量</th>
                            <th>总数量</th>
                            <th>完成面积(mm)</th>
                            <th>状态</th>
                            <th>操作</th>

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

                        </tr>
@@ -262,7 +286,7 @@
        </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 +304,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/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties

@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
#Wed Jun 04 08:28:46 CST 2025
#Wed Jun 11 08:19:29 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
m2e.projectName=MES_11

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

@@ -1,5 +1,5 @@
#Generated by Maven
#Thu Nov 14 09:03:53 CST 2024
#Tue Jun 10 16:39:13 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2

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

@@ -652,6 +652,10 @@
        out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
        out.write("\t\t\t\t\t<li><a href=\"");
        out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
        out.write("/cutmanage/gettask/2\">&nbsp;&nbsp;&nbsp;&nbsp;领取二#线任务</a></li>\r\n");
        out.write("\t\t\t\t\t<li class='item_divider'></li>\r\n");
        out.write("\t\t\t\t\t<li><a href=\"");
        out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
        out.write("/cutmanage/gettask/1\">&nbsp;&nbsp;&nbsp;&nbsp;领取一#线任务</a></li>\r\n");
        out.write("\t\t\t\t\t<li class='item_divider'></li>\t\r\n");
        out.write("\t\t\t\t\t<li><a href=\"");

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

@@ -148,6 +148,13 @@
      out.write("\t\t  \t\r\n");
      out.write("}\r\n");
      out.write("\t\r\n");
      out.write("\tfunction task(){\r\n");
      out.write("\t\twindow.location.href=\"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/cutmanage/task\";\r\n");
      out.write("\t\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("\tfunction updatedengluname(){\r\n");
      out.write("\t\t  $(\"#updatedengluname\").modal('show');\r\n");
      out.write("\t\r\n");
@@ -212,11 +219,9 @@
      out.write(")' >单工位</button>\r\n");
      out.write("\t\t\t\t<small style='color:red'>（单击按钮切换工位模式）</small>\r\n");
      out.write("\t\t\t\t&nbsp;\r\n");
      out.write("\t\t\t<button type=\"button\"\r\n");
      out.write("\t\t\t\tonclick=\"{location.href='");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/cutmanage/task'}\"\r\n");
      out.write("\t\t\t\tclass=\"btn btn-primary\" id=\"app\">手动任务</button>\r\n");
      out.write("\t\t\t");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${app}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("\r\n");
      out.write("\t\t\t<button type=\"button\"\r\n");
      out.write("\t\t\t\tonclick=\"{location.href='");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));

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

@@ -164,15 +164,24 @@
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("\tfunction collectingTasks() {\r\n");
      out.write("\t\t//disableAutoRefresh();\r\n");
      out.write("\t\tif(typeof stopRefresh === \"function\"){\r\n");
      out.write("\t\t\tstopRefresh();\r\n");
      out.write("\t\t}\r\n");
      out.write("\t\t\r\n");
      out.write("\t\tvar groups = document.getElementsByName('groups')[0].value;\r\n");
      out.write("\t\tvar state = document.getElementsByName('state')[0].value;\r\n");
      out.write("\t\tif(state==\"0\"){\r\n");
      out.write("\t\tvar fileName = document.getElementById(\"fileName\").innerHTML;\r\n");
      out.write("\t\tif(state==\"0\"&&fileName.includes('P')){\r\n");
      out.write("\t\t\twindow.location.href = \"");
      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
      out.write("/cutmanage/gettasks/\" + groups;\r\n");
      out.write("\t\t}\r\n");
      out.write("\t\t\r\n");
      out.write("\t\tif(state==\"1\"){\r\n");
      out.write("\t\t\talert(\"当前已存在两个任务\")\r\n");
      out.write("\t\t}\r\n");
      out.write("\t\tif(!fileName.includes('P')){\r\n");
      out.write("\t\t\talert(\"补片/手动工程请结束任务再领取\")\r\n");
      out.write("\t\t}\r\n");
      out.write("\t}\r\n");
      out.write("\t\r\n");
      out.write("\tfunction updatedengluname() {\r\n");
@@ -1119,9 +1128,12 @@
      out.write("\t\t\tinterval = setInterval('refreshStatus()', rTime);//刷新恢复\r\n");
      out.write("\t\t}\r\n");
      out.write("\r\n");
      out.write("\t\tfunction stopRefresh() {\r\n");
      out.write("\t\t\tclearInterval(interval);//停止刷新\r\n");
      out.write("\t\t} */\r\n");
      out.write("\t\t */\r\n");
      out.write("\t\t function stopRefresh() {\r\n");
      out.write("\t\t\t\tclearInterval(interval);//停止刷新\r\n");
      out.write("\t\t\t} \r\n");
      out.write("\t\t \r\n");
      out.write("\t\t \r\n");
      out.write("\t\tvar interval = setInterval('isStop()', rTime);//定时刷新\r\n");
      out.write("\t\tfunction isStop(){  //2024-1-10  yzx ä¿®æ”¹  åŽŸå› ï¼šåŽŸåˆ·æ–°é¡µé¢æœ‰é—®é¢˜\r\n");
      out.write("\t\t\tvar str=['baogong_info','div_banzu'];\r\n");

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