#

zzgtfwq

昨天 146d0b4e6d10f1692f8f22c843fa831394810364

#

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

@@ -879,10 +879,10 @@
                            log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                        } else {
                            if (waitWrkMast.getWrkSts() == 11) {
                                if (waitWrkMast.getIoPri() + 100000D < 999999999D) {
                                    waitWrkMast.setIoPri(waitWrkMast.getIoPri()+100000D);
                                if (waitWrkMast.getIoPri() + 10D < 9999D) {
                                    waitWrkMast.setIoPri(waitWrkMast.getIoPri()+10D);
                                } else {
                                    waitWrkMast.setIoPri(999999999D);
                                    waitWrkMast.setIoPri(9999D);
                                }
                                waitWrkMast.setModiTime(new Date());
                                if (wrkMastMapper.updateById(waitWrkMast) == 0) {

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

@@ -174,7 +174,7 @@
                    delRgvTask = false;
                    continue;
                }
                Thread.sleep(200L);
                Thread.sleep(50L);

                // 构建设备状态对象
                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
@@ -209,6 +209,10 @@
                    }

                    OperateResult result0 = siemensNet.Write("DB100.0", (short) 1);

                    Thread.sleep(20L);

                    OperateResult result00 = siemensNet.Write("DB100.0", (short) 0);
                }
            } catch (Exception e) {
                log.error("RGV数据任务下发复位线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -310,6 +314,8 @@
                    continue;
                }

                Thread.sleep(50L);

                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                if (rgvProtocol == null || rgvTaskProtocol == null) {

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

@@ -351,7 +351,7 @@
                    station.put(siteId, staProtocol);
                }
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1+3*slave.getId());
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1+3*(slave.getId()-1));
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                    if (!Cools.isEmpty(barcode) && !barcode.equals("00000000")){