#

LSH

2024-03-19 b4c66ec0717b21a56b317af0abd4fe2c9a3d3360

#

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

@@ -1152,6 +1152,9 @@
                if (basDevp.getAgvTargetPlace()!=0){
                    basDevp.setAgvTargetPlace(0);
                    basDevpService.updateById(basDevp);
                    staProtocol.setAgvTypeSign((short)3);//1
                    staProtocol.setStaNo(basDevp.getDevNo().shortValue());
                    MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
                }
            }else {
                if (basDevp.getAgvTargetPlace()!=0){
@@ -1162,6 +1165,9 @@
                if (basDevp.getAgvTargetPick()!=0){
                    basDevp.setAgvTargetPick(0);
                    basDevpService.updateById(basDevp);
                    staProtocol.setAgvTypeSign((short)2);//0
                    staProtocol.setStaNo(basDevp.getDevNo().shortValue());
                    MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
                }
            }
        }

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -363,7 +363,7 @@
        }
        ArrayList<Integer> staNos = getStaNo();
        int index = staNos.indexOf(staProtocol.getSiteId());
        if (staProtocol.getAgvTypeSign()==0){  //0取货
        if (staProtocol.getAgvTypeSign()==0 || staProtocol.getAgvTypeSign()==2 ){  //0取货
            switch (staProtocol.getSiteId()){
                case 100:
                    index=32;
@@ -415,7 +415,11 @@
        //任务下发次数
        int writeCount = 0;
        do {
            write = siemensS7Net.Write("DB102." + index, (short) 1);    // 任务完成
            short textWrite = 1;// 任务完成
            if (staProtocol.getAgvTypeSign()>1){
                textWrite = 0;// 任务复位
            }
            write = siemensS7Net.Write("DB102." + index, textWrite);
            if(write.IsSuccess){
                writeCount=6;
            }else {