结束任务新增弹窗，以及理片界面显示工程号

廖井涛

2025-06-16 6067c5e5e7e568caa915f5124c71f39fbd2dc1b9

结束任务新增弹窗，以及理片界面显示工程号

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

@@ -31,8 +31,8 @@
    @Query("select t from GalssTask t where t.workProcedure='下片' and t.workState=?1 and t.patternTask.groups=?2")
    public List<GalssTask> findByCounttask(String state,Long groups);
    
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.patternTask.groups=?1 order by t.patternTask.id,t.engineeringId")
    public List<GalssTask> findByidentify1(Long groups);
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.width>?2 and t.height>?2 and t.patternTask.groups=?1 order by t.patternTask.id,t.engineeringId")
    public List<GalssTask> findByidentify1(Long groups,double minwidths);
    
    @Query("select t from GalssTask t where t.workProcedure='测量' and t.workState='待识别' and t.patternTask.groups=?1 and (((t.width<=?3 and t.width>=?2) and (t.height<=?5 and t.height>=?4)) or ((t.width<=?5 and t.width>=?4) and (t.height<=?3 and t.height>=?2))) order by t.patternTask.id,t.engineeringId")
    public List<GalssTask> findByidentify2(Long groups,Double minwidth,Double maxwidth,Double minheigth,Double maxheigth);
@@ -55,8 +55,11 @@
    @Query("select t from GalssTask t where t.patternTask.id=?1")
    public List<GalssTask> findpattern(Long id);
    
    @Query("select t from GalssTask t where t.patternTask.id=?1 and t.workState='待识别' and t.workProcedure='测量'")
    public List<GalssTask> findpattern1(Long id);
    @Query("select t from GalssTask t where t.patternTask.id=?1 and t.width>?2 and t.height>?2 and t.workState='待识别' and t.workProcedure='测量'")
    public List<GalssTask> findpattern1(Long id,double minwidths);
	
    @Query("select t from GalssTask t where t.patternTask.groups=?1 and t.width>?2 and t.height>?2 and t.patternTask.flag=1 and t.workState='待识别' and t.workProcedure='测量'")
    public List<GalssTask> findpattern2(Long id,double minwidths);
    
    @Query("select t from GalssTask t where t.typeId=?1 ")
    public List<GalssTask> findbyTypeId1(Long id);

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

@@ -556,9 +556,7 @@
    //结束任务
    public String delecttask(Long id,Long line) {
        RawFile rawFile=rawFileDao.findAcceptedByGroup2(id);
        System.out.println(1111);
        int lipiancount =galssTaskDao.finlipian2(rawFile.getFileName());
        System.out.println(2222);
        int slicecount;
        if (line==1) {
             slicecount=horizontalDao.findfall3(rawFile.getFileName());
@@ -572,7 +570,7 @@
        System.out.println(slicecount);
        System.out.println(rawFile.getFileName());
        if(lipiancount>0||slicecount>0){
            return "redirect:cutmanage/gettasks";
            return "理片存在当前订单玻璃:任务存在"+lipiancount+","+slicecount;
        }else{
            Connection conn=DeviceService.getConnection();
            try{
@@ -601,10 +599,10 @@
                    }
                }
            
                return "redirect:cutmanage/gettasks";			
                return "结束成功";			
            } catch (SQLException e) {
                e.printStackTrace();
                return "redirect:cutmanage/gettasks";	
                return "服务器连接错误";
            }finally{
                messageProcessor.close(conn);
            }
@@ -628,7 +626,7 @@
            slicecount=slicecageDao.findfall3(rawFile.getFileName());
        }
        if(lipiancount>0||slicecount>0){
            return "redirect:cutmanage/gettasks";
            return "理片存在当前订单玻璃:任务存在"+lipiancount+","+slicecount;
        }else{
            Connection conn=DeviceService.getConnection();
            try {
@@ -657,10 +655,10 @@
                    }
                            
                }    
                return "redirect:cutmanage/gettasks";
                return "中断成功";
            } catch (SQLException e) {
                e.printStackTrace();
                return "redirect:cutmanage/gettasks";	
                return "服务器连接错误";	
            }finally{
                messageProcessor.close(conn);
            }

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

@@ -241,7 +241,7 @@
    }
    
    public static Connection getConnection() {
        //localhost 192.168.200.201 192.168.2.6   10.12.0.100
        //localhost:3307 192.168.200.201 192.168.2.6   10.12.0.100:3306
        try {
            return DriverManager.getConnection("jdbc:mariadb://localhost:3307/gmms","root","");                     
        } catch (SQLException e) {

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

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

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

@@ -65,7 +65,8 @@
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td></td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
                else{
@@ -82,7 +83,8 @@
                    html.append("<td>"+galssTask.getThickness()+"</td>");
                    html.append("<td>"+slicecages.getCount()+"</td>");
                    html.append("<td>"+slicecages.getProcesscardId()+"</td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td>"+galssTask.getEngineeringId()+"</td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
            }
@@ -108,7 +110,8 @@
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td></td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td></td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
                else{
@@ -125,7 +128,8 @@
                    html.append("<td>"+galssTask.getThickness()+"</td>");
                    html.append("<td>"+slicecages.getCount()+"</td>");
                    html.append("<td>"+slicecages.getProcesscardId()+"</td>");
                    html.append("<td>"+slicecages.getFlag() +"</td>");
                    html.append("<td>"+galssTask.getEngineeringId()+"</td>");
                    html.append("<td style='width:200px'>"+slicecages.getFlag() +"</td>");
                    html.append("</tr>");
                }
            }

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

@@ -104,6 +104,7 @@
    
    //结束任务
    @RequestMapping(method=RequestMethod.GET,value="/delecttask/{id}/{line}")
    @ResponseBody
    public String delecttask(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask(id,line);
    }
@@ -118,6 +119,7 @@
    //中断任务

    @RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}/{line}")
    @ResponseBody
    public String delecttask1(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
        return cutManageService.delecttask1(id,line);
    }    

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

@@ -13,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:3306/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/views/cutmanage/gotasks.jsp

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

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

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

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

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

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

                type : "GET",

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

                dataType : "text",

                success : function(data) {
                    alert(groups+"号线"+data);
                    if(data=="中断成功"){
                        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                    }
					
                }
            });
        }
		
    }
    //弹窗取消
    function delecttask4() {
        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
    }

    function delecttask1(groups,id) {
    /* function delecttask1(groups,id) {
        //disableAutoRefresh();disableAutoRefresh();
        $.ajax({
            async : false,
@@ -40,10 +93,14 @@
            dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                alert(groups+"号线"+data);
                if(data=="中断成功"){
                    window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                }
				
            }
        });
    }
    } */

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

                            <button type="button" onclick="delecttask4()" class="btn btn-default btn-lg"
                                    data-dismiss="modal">否</button>
                                <button type="button" onclick="delecttask3()" class="btn btn-primary btn-lg" id="addbtnsubmit">是</button>
                        </div>
                    </div>
                </div>
            </form>
        </div>
			
		
        </section>

        <%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>

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

@@ -384,8 +384,7 @@
                                </div>
                            </div>
                            <div class="modal-footer" >
                                <button type="button" class="btn btn-default btn-lg"
                                    data-dismiss="modal">关闭</button>
                                <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">关闭</button>
                                <button type="button" onclick="addrack1()" class="btn btn-primary btn-lg"
                                    id="addbtnsubmit">提交</button>
                            </div>

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

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

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

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

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

@@ -13,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:3306/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/views/cutmanage/gotasks.jsp

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

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

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

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

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

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

                type : "GET",

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

                dataType : "text",

                success : function(data) {
                    alert(groups+"号线"+data);
                    if(data=="中断成功"){
                        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                    }
					
                }
            });
        }
		
    }
    //弹窗取消
    function delecttask4() {
        window.location.href = "${ctx}/cutmanage/gettask/" + groups;
    }

    function delecttask1(groups,id) {
    /* function delecttask1(groups,id) {
        //disableAutoRefresh();disableAutoRefresh();
        $.ajax({
            async : false,
@@ -40,10 +93,14 @@
            dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                alert(groups+"号线"+data);
                if(data=="中断成功"){
                    window.location.href = "${ctx}/cutmanage/gettask/" + groups;
                }
				
            }
        });
    }
    } */

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

                            <button type="button" onclick="delecttask4()" class="btn btn-default btn-lg"
                                    data-dismiss="modal">否</button>
                                <button type="button" onclick="delecttask3()" class="btn btn-primary btn-lg" id="addbtnsubmit">是</button>
                        </div>
                    </div>
                </div>
            </form>
        </div>
			
		
        </section>

        <%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>

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

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

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

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

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

@@ -1,5 +1,5 @@
#Generated by Maven
#Wed Jun 11 19:52:31 CST 2025
#Fri Jun 13 11:06:57 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2