望美最新程序

严智鑫

2024-05-13 cedce4883f0d204f5bf7bf87c0bf4858dabb0c23

望美最新程序

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

@@ -591,7 +591,7 @@
            
            List<ShelfRack> ranks = shelfRackDao.findBystate();
            for (ShelfRack rank : ranks) {
                if (rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING)) {
                if (rank.getRawPackage()!=null&&(rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING))) {
                        
                        html.append("<tr>");
                        html.append("<td><input type='checkbox' name='id' value="+rank.getId() +" /></td>");

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

@@ -266,6 +266,8 @@
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_DT_dapingxianshi"  target="_blank">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</a></li>
                    <li class='item_divider'></li>
                </ul>
@@ -384,6 +386,8 @@
                    <li><a href="${ctx }/reportform/cutmanagerepoortform1">&nbsp;&nbsp;&nbsp;&nbsp;切割总报表</a></li>    
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>    
                </ul>
            </div>
@@ -1031,6 +1035,8 @@
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_DT_dapingxianshi"  target="_blank">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</a></li>
                    <li class='item_divider'></li>
                </ul>
@@ -1057,6 +1063,8 @@
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_ReportForm_merge">&nbsp;&nbsp;&nbsp;&nbsp;原片切裁率报表</a></li>
                    <li class='item_divider'></li>
                    <li><a href="${ctx }/mesview/_Edg_Statistics?group=1">&nbsp;&nbsp;&nbsp;&nbsp;磨边开合报表</a></li>
                    <li class='item_divider'></li>
                </ul>
            </div>
        </shiro:hasRole>

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

@@ -19,6 +19,48 @@
        sn = mes.getMesDBHelper().createSession(false);
        String strSQL = "";
        if ("查询".equals(caozuo)) {
            if ("磨边开合查询".equals(leixing)) {
                String stime = request.getParameter("stime");
                String etime = request.getParameter("etime");
                String trigger = request.getParameter("trigger");
                String Edg = request.getParameter("Edg");
                String banzu = request.getParameter("banzu");
                String gby="";
                //String isdb = request.getParameter("isdb");
                System.out.println(etime);
                /* if("".equals(etime)||etime==null){
                    etime="Now()";
                }else{
                    etime="'"+etime+"'";
                } */
                if("".equals(Edg)||Edg==null||"0".equals(Edg)){
                    Edg="width,height,SendTime,Line,count(*) as piece,ifnull(banzu,'')";
                    gby="Recordsid";
                }else if("1".equals(Edg)){
                    Edg="width,SendTime,Line,ifnull(banzu,''),count(*) as piece";
                    gby="RecordsidW";
                }else if("2".equals(Edg)){
                    Edg="height,SendTime,Line,ifnull(banzu,''),count(*) as piece";
                    gby="RecordsidH";
                }
				
                if("".equals(banzu)||banzu==null||"0".equals(banzu)){
                    banzu="";
                }else{
                    banzu=" banzu='"+banzu+"' and";
                }
                if("1".equals(trigger)){//查询
                    strSQL = "select "+Edg+" from Y_Edg_Statistics"+
                             " where Line="+line+" and "+banzu+" SendTime>='"+stime+"' and SendTime<='"+etime+"'"+
                             " GROUP BY "+gby;
                }else{//默认
                    strSQL ="select width,height,SendTime,Line,count(*) as piece,ifnull(banzu,'') from Y_Edg_Statistics"+
                             " where Line="+line+" and SendTime>=CONCAT(DATE_FORMAT(Now(),'%Y-%m-%d'),' 00:00:00') and SendTime<=CONCAT(DATE_FORMAT(Now(),'%Y-%m-%d'),' 23:59:59')"+
                             " GROUP BY Recordsid";
                }
                System.out.println(strSQL);
				
            }
            if ("次破类型".equals(leixing)) {
                strSQL = "select id,cipoleixing from cipoleixing";
            }

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

@@ -151,7 +151,10 @@
      ],
      yAxis: [
        {
          type: 'value'
            type: 'value',
            min: 0,
            max:80,
            interval:10
        }
      ],
      series: [

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

@@ -1021,7 +1021,10 @@
          ],
          yAxis: [
            {
              type: 'value'
                type: 'value',
                min: 0,
                max:80,
                interval:10
            }
          ],
          series: [

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

@@ -125,7 +125,7 @@
    }
    var gongyi = "磨边";
    var group = ${groups};
    var rTime = 20000;
    var rTime = 5000;
</script>
<style>
.box table tr th, .box table tr td {
@@ -275,16 +275,32 @@
        }

        //页面定时刷新 æš‚停 æ¢å¤
        var interval = setInterval('refreshStatus()', rTime);//定时刷新
        /* var interval = setInterval('refreshStatus()', rTime);//定时刷新
        function refresh() {
            interval = setInterval('refreshStatus()', rTime);//刷新恢复
        }

        function stopRefresh() {
            clearInterval(interval);//停止刷新
        } */
        var interval = setInterval('isStop()', rTime);//定时刷新
        function isStop(){  //2024-1-10  yzx ä¿®æ”¹  åŽŸå› ï¼šåŽŸåˆ·æ–°é¡µé¢æœ‰é—®é¢˜
            var str=['baogong_info','div_banzu'];
            var isInterval_=0;
            for(var i=0;i<str.length;i++){	
                var isdisplay=document.getElementById(str[i]).style.display;
                if(isdisplay=='block'){
                    //不刷新		
                    isInterval_=1;	
                    break;
        }

        $(function() {
            }
            if(isInterval_==0){
                //刷新
                refreshStatus();
            }
        }
        /* $(function() {

            $('#baogong_info').on('hide.bs.modal', function() {
                refresh();
@@ -301,7 +317,7 @@
            $('#div_banzu').on('show.bs.modal', function() {
                stopRefresh();
            })
        });
        }); */

        var st = ${able};
        if (st == 0) {

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

@@ -55,7 +55,7 @@
                    //qSQL = "update gmms_drop_frame_4 set rank = ?,sign=1  where Id = ?";
                    qSQL = "update gmms_drop_frame_5 as dr left join gmms_drop_frame_5 as dr2 on dr.id="+Id+" and dr2.id="+liaoJiaId
                            +" set dr.rank=dr2.rank,dr.sign=0,dr2.sign=10"
                            +" where dr.id="+Id+" and dr2.id="+liaoJiaId+" and dr.rank is null";
                            +" where dr.id="+Id+" and dr2.id="+liaoJiaId+" and dr.rank is null and dr.sign=0 and dr2.sign=0";
                    sn.createSql(qSQL);
                    int s = sn.update();                    
                    out.print(s);

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

@@ -19,7 +19,12 @@
            String qSQL = "";

            if ("获取列表".equals(caozuo)) {
                qSQL = "select id,galss_id,width,height,thickness,processcard_id,stop_rank,stop_position,work_procedure,work_state,gc_number,null from gmms_galss_task_shelf where work_procedure!='中空上片' and processcard_id=(select liuchengka from gmms_liuchengka where current_status='正在工作' and current_work_position='理片' limit 0,1) order by processcard_id asc,stop_rank desc";
                qSQL = "select id,galss_id,width,height,thickness,processcard_id,stop_rank,stop_position,work_procedure,work_state,gc_number,null from gmms_galss_task_shelf " 
                      + " where work_procedure!='中空上片' and processcard_id=(select lk.liuchengka from gmms_drop_frame_5 as dr5  " 
                      + "         left join gmms_shelf_rack_2 as sr on dr5.rank=sr.id  " 
                      + "         left join gmms_liuchengka as lk on sr.processcard_id=lk.liuchengka  " 
                      + "         where groups_=3 and drop_groups=1 and sr.id is not null and lk.liuchengka is not null and   " 
                      + "         lk.current_status='正在工作' and lk.current_work_position='理片' limit 0,1) order by processcard_id asc,stop_rank desc";
            }
            
            //System.out.println(qSQL);

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

@@ -31,7 +31,7 @@
            }
            if ("当前班组".equals(leixing)) {
                gongyi = gongyi.contains("钢化") ? "钢化" : gongyi;
                strSQL = "select banzu from gmms_user_current where gongyi= '" + gongyi + "' and chanxian = "
                strSQL = "select banzu,isPaused from gmms_user_current where gongyi= '" + gongyi + "' and chanxian = "
                        + line;
            }
            if ("流程卡详情".equals(leixing)) {
@@ -164,7 +164,7 @@
        if ("修改".equals(caozuo)) {
            if ("变更班组".equals(leixing)) {
                String bzinfo = request.getParameter("info");
                strSQL = "update gmms_user_current set banzu = '" + bzinfo + "' where gongyi = '" + gongyi
                strSQL = "update gmms_user_current set banzu = '" + bzinfo + "',isPaused=null where gongyi = '" + gongyi
                        + "' and chanxian = " + line;
            }
            if("次破".equals(leixing)){
@@ -329,6 +329,10 @@
            sn.createSql(strSQL);
            int s = sn.update();
            out.print(s);
			
            String bzSQL = "update gmms_user_current set isPaused='暂停' where gongyi = '磨边' and chanxian = " + line;
            sn.createSql(bzSQL);
            int ps = sn.update();
        }



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

@@ -147,6 +147,7 @@
                $("#cz_Zhuangtai").text("成功");
                //$("#cz_mingxi").text(data);
                $("#CZ_Msg").modal('toggle');
                onChangeBanZu();
            },
            error : function(data) {
                $("#CZ_Msg").modal('toggle');

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

@@ -71,7 +71,7 @@
            url : p_url,
            success : function(data) {
                var d = data[0][0];
				
                var isstop=data[0][1];
                
                if(d==null || d==""){
                //if(data.length==0){
@@ -87,6 +87,10 @@
                    $("#btnBanZu").attr('style',"display:none"); */
                    
                }
                if(isstop!=null &&isstop!=""){
                    onChangeBanZu();
                }
				
            },
            error : function(data) {


 ºÓ±±ÍûÃÀÏîÄ¿/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
#Thu Jan 25 16:45:03 CST 2024
#Tue May 07 16:23:17 CST 2024
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
#Fri Dec 08 12:08:51 CST 2023
#Mon Mar 18 11:50:57 CST 2024
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2

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

@@ -1,6 +0,0 @@
com\northglass\data\TaskData.class
com\northglass\repository\JpaMappingTest.class
com\northglass\repository\TaskDaoTest.class
com\northglass\QuickStartServer.class
com\northglass\service\account\AccountServiceTest.class
com\northglass\data\UserData.class

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

@@ -1009,6 +1009,8 @@
        out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
        out.write("/mesview/_ReportForm_merge\">&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");
        out.write("\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("/mesview/_DT_dapingxianshi\"  target=\"_blank\">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</a></li>\r\n");
@@ -1233,7 +1235,9 @@
        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("/mesview/_ReportForm_merge\">&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 class='item_divider'></li>\r\n");
        out.write("\t\t\t\t\t");
        out.write("\r\n");
        out.write("\t\t\t\t</ul>\r\n");
        out.write("\t\t\t</div>\r\n");
        out.write("\t\t");
@@ -2638,6 +2642,8 @@
        out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
        out.write("/mesview/_ReportForm_merge\">&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");
        out.write("\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("/mesview/_DT_dapingxianshi\"  target=\"_blank\">&nbsp;&nbsp;&nbsp;&nbsp;大屏显示</a></li>\r\n");
@@ -2700,6 +2706,8 @@
        out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx }", java.lang.String.class, (PageContext)_jspx_page_context, null));
        out.write("/mesview/_ReportForm_merge\">&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");
        out.write("\r\n");
        out.write("\t\t\t\t</ul>\r\n");
        out.write("\t\t\t</div>\r\n");
        out.write("\t\t");

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

@@ -65,6 +65,48 @@
        sn = mes.getMesDBHelper().createSession(false);
        String strSQL = "";
        if ("查询".equals(caozuo)) {
            if ("磨边开合查询".equals(leixing)) {
                String stime = request.getParameter("stime");
                String etime = request.getParameter("etime");
                String trigger = request.getParameter("trigger");
                String Edg = request.getParameter("Edg");
                String banzu = request.getParameter("banzu");
                String gby="";
                //String isdb = request.getParameter("isdb");
                System.out.println(etime);
                /* if("".equals(etime)||etime==null){
                    etime="Now()";
                }else{
                    etime="'"+etime+"'";
                } */
                if("".equals(Edg)||Edg==null||"0".equals(Edg)){
                    Edg="width,height,SendTime,Line,count(*) as piece,ifnull(banzu,'')";
                    gby="Recordsid";
                }else if("1".equals(Edg)){
                    Edg="width,SendTime,Line,ifnull(banzu,''),count(*) as piece";
                    gby="RecordsidW";
                }else if("2".equals(Edg)){
                    Edg="height,SendTime,Line,ifnull(banzu,''),count(*) as piece";
                    gby="RecordsidH";
                }
				
                if("".equals(banzu)||banzu==null||"0".equals(banzu)){
                    banzu="";
                }else{
                    banzu=" banzu='"+banzu+"' and";
                }
                if("1".equals(trigger)){//查询
                    strSQL = "select "+Edg+" from Y_Edg_Statistics"+
                             " where Line="+line+" and "+banzu+" SendTime>='"+stime+"' and SendTime<='"+etime+"'"+
                             " GROUP BY "+gby;
                }else{//默认
                    strSQL ="select width,height,SendTime,Line,count(*) as piece,ifnull(banzu,'') from Y_Edg_Statistics"+
                             " where Line="+line+" and SendTime>=CONCAT(DATE_FORMAT(Now(),'%Y-%m-%d'),' 00:00:00') and SendTime<=CONCAT(DATE_FORMAT(Now(),'%Y-%m-%d'),' 23:59:59')"+
                             " GROUP BY Recordsid";
                }
                System.out.println(strSQL);
				
            }
            if ("次破类型".equals(leixing)) {
                strSQL = "select id,cipoleixing from cipoleixing";
            }