#

lsh

2024-05-16 223e7f20dcfbb3ac0b19051228b89565a8d5aa10

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -297,8 +297,10 @@
                    rgvThread.setPakMk(true);
                }
                WrkMastSta wrkMastSta = wrkMastStaMapper.selectById(rgvProtocol.getTaskNo1());
                wrkMastSta.setWrkSts(3);
                wrkMastStaMapper.updateById(wrkMastSta);
                if (!Cools.isEmpty(wrkMastSta)){
                    wrkMastSta.setWrkSts(3);
                    wrkMastStaMapper.updateById(wrkMastSta);
                }
            }

        }
@@ -396,7 +398,7 @@
//                    System.out.println(JSON.toJSONString(staProtocol));
                    if (staProtocol.isAutoing()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,1);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -404,7 +406,7 @@
                        }
                    }else if (staProtocol.isLoading()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,3);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -412,7 +414,7 @@
                        }
                    }else if (staProtocol.isInEnable()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,5);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -420,7 +422,7 @@
                        }
                    }else if (staProtocol.isOutEnable()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,7);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -429,7 +431,7 @@
                    }
                    if (staProtocol.isEmptyMk()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),1,10);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -438,7 +440,7 @@
                    }
                    if (staProtocol.isFullPlt()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),3,10);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -447,7 +449,7 @@
                    }
                    if (staProtocol.isCar()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),5,10);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -456,7 +458,7 @@
                    }
                    if (staProtocol.isLow()){
                        WrkMastSta wrkMastSta = new WrkMastSta(new Date(),7,10);
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
                        Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
                        if (count==0){
                            wrkMastSta.setType(1);
                            wrkMastSta.setWrkType(3);
@@ -523,7 +525,7 @@
            rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 工位1任务模式:  取放货
            rgvCommand.setSourceStaNo1(wrkMastSta.getStaStart().shortValue());   //工位1起点
            rgvCommand.setDestinationStaNo1(wrkMastSta.getStaEnd().shortValue());   //工位1目标站点
            rgvCommand.setCommand((short) 1);   //工位1任务确认
            rgvCommand.setCommand((short) 0);   //工位1任务确认
            if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
                //step=2,工位1、2写任务；   step=4，工位1写任务；     step=5，工位2写任务
                log.error("RGV命令下发失败，RGV号={}，任务数据={}", rgvId, JSON.toJSON(rgvCommand));