添加日志

ZengTao

2024-05-10 73263f94cf46a409b0d6fd329b1caa645422379b

 springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java

@@ -24,6 +24,8 @@
        //有进片请求但是测量台没有玻璃
        return 400;
    }
    
    System.out.println(glassInfo+"初始");
    //定义初始字段
    StorageCage cage;
    String glassid=glassInfo.getGlassid();
@@ -44,20 +46,23 @@
         if(glassInfo.getThickness()>=15){
            cage=albaniaMapper.SelectNewCell(3,5);
        }else{
            cage=albaniaMapper.SelectNewCell(0,5);
            cage=albaniaMapper.SelectNewCell(0,4);
            
            System.out.println(cage+"理片笼判断");
        }
        //当返回的格子号为空时,返回400笼子已满
        if(cage!=null){
            albaniaMapper.AddCage(cage.getId(), glassid,width, height, cage.getGlassWidthMm(), cage.getGlassHeightMm(), 1, cage.getGlasstype(), 0);
            albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, glasstype, 0);
            Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
            albaniaMapper.UpdateStorage(width,height,cage.getId());
            albaniaMapper.UpdateQueueState(glassid);
            System.out.println(cage+"任务发送");
        }else{
            return(400);
        }
    }
    //增加任务记录
    albaniaMapper.Inserttask(0, 0, 1001, cage.getId(), glassid,glasstype, flowcard,0,0);
    albaniaMapper.UpdateQueueState(glassid);
    return(200);

}
@@ -67,6 +72,7 @@
        GlassInfo glassmate=new GlassInfo();
        GlassInfo method=new GlassInfo();
        StorageCage glass=new StorageCage();
        int glassend=0;
        method=albaniaMapper.SelectMethod(line);
        double width=0;
            for(int i=1;i<=7;i++){
@@ -76,6 +82,8 @@
                }else{
                    //直通模式时按顺序直出
                    glassmate= albaniaMapper.SelectOutGlass2(line);
                    //获取直通模式最后一块
                    glassend=albaniaMapper.SelectOutGlassend(line);
                }
                
                if(glassmate==null){ 
@@ -97,11 +105,12 @@
                    Mestast(glass.getGlassId(), glass.getId(),40, 0,"MESID"+i,i);
                    albaniaMapper.AddFinishNumber(glassmate.getFlowcard(), glassmate.getMateid(), glassmate.getTier());
                    albaniaMapper.Inserttask(1, 0, glass.getId(), 2002, glassmate.getGlassid(), glassmate.getGlasstype(),glass.getFlowcard(),glassmate.getMateid(),glassmate.getTier());
                      if(glassmate.getTier()==glassmate.getId()){//当配片数量等于成品小片总片数时
                      if(glassmate.getTier()==glassmate.getId()||glassmate.getTier()==glassend){//当配片数量等于成品小片总片数时
                        //本次配片完成发送启动命令
                        S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//出片任务启动
                        return (200);//结束
                      }
                     
                      
                    }else{
                        return (400);//结束