修改双任务模式

廖井涛

4 天以前 f631782d5fc99a07c59e9c5275e347a88fcc4b70

修改双任务模式

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

@@ -31,7 +31,7 @@
    @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")
    @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.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")

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

@@ -879,6 +879,32 @@
        }
    }
    
    public void updatepieces(Long id,String width,String height,String thinkness,String color,String count) {
//        PatternTask patternTask=patternTaskDao.findOne(id);
//        if(patternTask!=null){
//            patternTask.setContent(count);
//            patternTaskDao.save(patternTask);
//        }
        //添加手动报工任务
		
        Connection conn=DeviceService.getConnection();
        try {
            CallableStatement c=conn.prepareCall("{call GalssCutmanage4(?,?,?,?,?,?)}");
            c.setString(1,width);
            c.setString(2, height);
            c.setString(3, thinkness);
            c.setString(4, color);
            c.setString(5, count);
            c.registerOutParameter(5, java.sql.Types.INTEGER);
            c.execute(); 
            c.close();
        } catch (SQLException e) {
            e.printStackTrace();
        }finally{
            messageProcessor.close(conn);
        }
    }
	
    
    public void updatetask(Long id) {
        PatternTask patternTask=patternTaskDao.findOne(id);

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

@@ -143,7 +143,8 @@
        PreprocessingGlass preprocessingGlass=preprocessingGlassDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
        List<GalssTask> glass;
        if(patternTask!=null){
             glass=galssTaskDao.findpattern1(patternTask.getId());
             /*glass=galssTaskDao.findpattern1(patternTask.getId());*/
             glass=galssTaskDao.findByidentify1(groups);
        }else if(preprocessingGlass.getStatu().equals("多数据匹配")){
            IdentifyError identifyError=identifyErrorDao.findBygroup(Integer.parseInt(String.valueOf(groups)));
            double minwidth=preprocessingGlass.getActualWidth()-identifyError.getHeigtherror();

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

@@ -360,8 +360,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>
@@ -372,26 +372,30 @@
                    action="${ctx}/identifymachine/modify/${groups}">
                    <div class="modal-body">
                        <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>

 ºÓ±±ÍûÃÀÏîÄ¿/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
#Mon May 26 16:09:16 CST 2025
#Tue Jun 03 08:02:21 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
m2e.projectName=MES_11