mes测试更改，增加调拨后自动再判断出片

wu

2023-09-16 73e45cf5411a9530418b87e3368289bb2a8b5042

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

@@ -57,10 +57,7 @@
               
            spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//清除格子玻璃信息
            spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//新增任务
           
            S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
            S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
            spianMapper.Inserttask(1, 0,cageout.getId(),1000,orderid);//新增任务         
            S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务
            return Result.success(datas);//结束
        } else {
@@ -73,11 +70,9 @@
                datas.add((short) 1000);
                datas.add((short) 1);
                datas.add((short) 1);
                spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//新增任务
                spianMapper.Inserttask(1, 0,cageout.getId(),1000,orderid);//新增任务
                spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//清除格子玻璃信息
                S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
                S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
                S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务
                //spianMapper.Updatetask(1, 1);//完成任务
                return Result.success(datas);//结束
@@ -106,11 +101,10 @@
                   // 更换玻璃的笼子
                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                   spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                   spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除被调拨格子数据
                   spianMapper.Inserttask(2, 0,cageout.getId(),ids );//新增调度任务
                   spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//新增调度任务
                    // 传输mes数据,坐标，数据
                        S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
                        S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
                        S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务          
                    return Result.success(cagecell); //结束

@@ -129,13 +123,12 @@
                    datas.add((short) prcid2);
                    datas.add((short) 2);
                    datas.add((short) 1);
                    spianMapper.Inserttask(2, 0,cageout.getId(),ids );//新增调度任务
                    spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//新增调度任务
                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除被调拨格子数据
                    // 传输mes数据,坐标，数据
                        S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
                        S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
                        S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务             
                     return Result.success(cagecell); //结束

@@ -158,9 +151,11 @@
        int tiers;
        int prctier;
        
        
        Glass glasslist = spianMapper.selectGlass(glassid);
        
        spianMapper.Updatetask(1, 0);//完成任务
            Glass glasslist = spianMapper.selectGlass(glassid);
        if(glasslist==null){
          return (300);
        }
        double widths = glasslist.getWidth();
        Short orderids = glasslist.getOrderId();

@@ -194,7 +189,7 @@
               if (glasslist == null) {
                    return (300);
                }
                spianMapper.Inserttask(0, 0, 1000, ids);//新增任务
                spianMapper.Inserttask(0, 0, 1000, ids,glassid.toString());//新增任务
                prctier = spianMapper.selectsum(cage1, cells);// 传给prc的格子内玻璃数
                // 有合适空格时进片
                if (cages > 1 && cages1.getTier() != null) {
@@ -206,9 +201,8 @@
                    // 数据库修改笼子表新增一条玻璃
                    spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
                    spianMapper.UpdataAddCage1(widths, cage1, cells);//减少格子宽度
                    spianMapper.Updatetask(1, 0);//完成任务
                      
                    S7control.getinstance().WriteWord(adddresslist, datas);

                    return (200);
                }
            }
@@ -220,6 +214,7 @@

    // @GetMapping("/all2")
    public Short selectout2(String glassid) {
        spianMapper.UpdatetaskOut(); //完成上一次出片或者调度任务
        // 定义PRC数据传送数组
        List<String> adddresslist = new ArrayList<>();
        adddresslist.add("DB105.6");// 出片车起始位置
@@ -229,7 +224,6 @@
        List<Short> datas = new ArrayList<>();
        // 获取优先出片的位置
        StorageCage cageout = spianMapper.selectOut2(glassid);

        if(cageout==null){
           return (300);
        }
@@ -244,7 +238,7 @@
        int prcid2;
        int ids;
        int cages;
        int cells;
        int cells; 
        double glasswidth = cageout.getGlassWidth();
        // 判断玻璃内外片
        if (tier == 2) {
@@ -257,11 +251,15 @@
               
            spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//清除格子玻璃信息
            spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//新增任务
           
            S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
            S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
            spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//新增任务
            int state = spianMapper.selectGlassState(cage, cell);//获取格子数量
            if(state==2){
                spianMapper.UpdateDBCage1(cage, cell);// 将内片数据更新到外片里
                spianMapper.UpdateDBCage2(cage, cell);// 清除内片数据
            }
            S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务
           
      
            return (200);//结束
        } else {
            // 获取格子的玻璃数量
@@ -273,11 +271,9 @@
                datas.add((short) 1000);
                datas.add((short) 1);
                datas.add((short) 1);
                spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//新增任务
                spianMapper.Inserttask(1, 0,cageout.getId(),1000 ,glassid);//新增任务
                spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//清除格子玻璃信息
                S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
                S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
                S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务
                //spianMapper.Updatetask(1, 1);//完成任务
                return (200);//结束
@@ -293,10 +289,7 @@
                    prcid2 = cagecell.getPrcId();// 调拨目标位PRCID
                    ids = cagecell.getId();// 调拨目标位ID
                    cages=cagecell.getCage();//调拨目标位笼子
                    cells=cagecell.getCell();//调拨目标位格子
                    
                       
                    
                    cells=cagecell.getCell();//调拨目标位格子   
                   
                 
                    // 填入调拨数据
@@ -307,11 +300,11 @@
                   // 更换玻璃的笼子
                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                   spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                   spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除被调拨格子数据
                   spianMapper.Inserttask(2, 0,cageout.getId(),ids );//新增调度任务
                   spianMapper.Inserttask(2, 0,cageout.getId(),ids,glassid);//新增调度任务
                   spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//新增出片任务
                    // 传输mes数据,坐标，数据
                        S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
                        S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
                        S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务          
                    return (200); //结束

@@ -330,13 +323,13 @@
                    datas.add((short) prcid2);
                    datas.add((short) 2);
                    datas.add((short) 1);
                    spianMapper.Inserttask(2, 0,cageout.getId(),ids );//新增调度任务
                    spianMapper.Inserttask(2, 0,cageout.getId()+1,ids,glassid);//新增调度任务
                    spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//新增出片任务
                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//减少新格子宽度
                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);//增加原格子宽度
                    spianMapper.UpdateDBCage(ids, cage, cell);// 将原格子数据更新到新格子里
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 清除被调拨格子数据
                    // 传输mes数据,坐标，数据
                        S7control.getinstance().WriteWord("DB106.22", (short)0); //出片任务完成改成0
                        S7control.getinstance().WriteWord("DB106.20", (short)1); //出片车状态改成忙碌
                        S7control.getinstance().WriteWord(adddresslist, datas);//派发出片车任务             
                     return (200);//结束