BUG修复

野心家

2023-05-31 d209d7621ff92670e5157ae7f19162d097114678

BUG修复

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

@@ -165,8 +165,11 @@
//                    }

                    try {
                        //String pack=barcode.substring(6);//pack码
                        String pack="MJY0136 0300";
                        String pack =null;//pack码
                        if(barcode.length()>6){
                            pack=barcode.substring(6);
                    }
                        //String pack="MJY0136 0400";
                        barcode=barcode.substring(0,6);//托盘码
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                        locTypeDto.setLocType1((short)1);
@@ -185,7 +188,6 @@
                        JSONObject jsonObject = JSON.parseObject(response);
                        if (jsonObject.getInteger("code").equals(200)) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);

                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
@@ -751,7 +753,7 @@
            crnCommand.setDestinationPosX(locMast.getRow1().shortValue());     // 目标库位排
            crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 目标库位列
            crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 目标库位层\
            crnCommand.setBarcode(wrkMast.getBarcode());
            crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
            if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
            } else {
@@ -1083,6 +1085,7 @@
        crnCommand.setDestinationPosX(sta.getRow1().shortValue());     // 目标库位排
        crnCommand.setDestinationPosY(sta.getBay1().shortValue());     // 目标库位列
        crnCommand.setDestinationPosZ(sta.getLev1().shortValue());     // 目标库位层
        crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
        if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
            log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
        } else {

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

@@ -176,15 +176,22 @@
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*6));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(26));
        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB100.216",(short)(6));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode =siemensS7Net.getByteTransform().TransString(result2.Content,i*6,6, "UTF-8");
                String barcode =siemensS7Net.getByteTransform().TransString(result2.Content,0,26, "UTF-8");
//                String barcode=new String(result2.Content,i*12,12);
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                }
        }
        if (result5.IsSuccess) {
            String barcode =siemensS7Net.getByteTransform().TransString(result5.Content,0,6, "UTF-8");
//                String barcode=new String(result2.Content,i*12,12);
            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode,  2);
            if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                barcodeThread.setBarcode(barcode);
            }
        }