Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

whycq

2023-02-14 d39480501976a24d3749048e728e80cb1d01145b

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

@@ -162,23 +162,23 @@
                }
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 工作号

                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));   // 目标站
//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));   // 目标站
            }
        }
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
//        if (result0.IsSuccess) {
//            for (int i = 0; i < 93; i++) {
//                Integer siteId = staNos.get(i); // 站点编号
//                StaProtocol staProtocol = station.get(siteId);
//                if (null == staProtocol) {
//                    staProtocol = new StaProtocol();
//                    staProtocol.setSiteId(siteId);
//                    station.put(siteId, staProtocol);
//                }
//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 目标站
//            }
//        }
        Thread.sleep(200);
        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
        if (result0.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 目标站
            }
        }
        Thread.sleep(200);
        OperateResultExOne<byte[]> result1 = null;
        result1 = siemensS7Net.Read("DB102.100", (short) (staNoSize * 2));
@@ -193,8 +193,9 @@
                staProtocol.setOutEnable(status[3]);// 可出
                staProtocol.setEmptyMk(status[4]);  // 空板信号
                staProtocol.setFullPlt(status[5]);  // 满托盘
                staProtocol.setHigh(status[6]);     // 高库位
                staProtocol.setLow(status[7]);      // 低库位
                staProtocol.setHigh(status[6]);     // 高库位  捷丰长托盘
                staProtocol.setLow(status[7]);      // 低库位  捷丰短
                // 托盘

                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                    staProtocol.setPakMk(true);
@@ -203,18 +204,18 @@
        }

        //条码扫描器
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = null;
        result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*16));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,8, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId() == 1 ? i + 1 : i + 3);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                }
            }
        }
        //Thread.sleep(200);
        //OperateResultExOne<byte[]> result2 = null;
        //result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*16));
        //if (result2.IsSuccess) {
        //    for (int i = 0; i < barcodeSize; i++) {
        //        String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,8, "UTF-8");
        //        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId() == 1 ? i + 1 : i + 3);
        //        if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
        //            barcodeThread.setBarcode(barcode);
        //        }
        //    }
        //}

//        //RGV小车
//        Thread.sleep(200);