#

whycq

2023-02-27 bccfbafc78e9b06bd3c2ac48822ad7065f80b213

#

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

@@ -110,12 +110,12 @@


                //101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
                if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
                    if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
                    BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
                    if (barcodeThread1 != null) {
                        continue;
                        barcode = barcodeThread1.getBarcode();
                    }
                    barcode = barcodeThread1.getBarcode();

                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
                        BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
                        if (barcodeThread2 != null) {
@@ -123,17 +123,13 @@

                        }
                    }
//                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
//                        barcode = "";
//                        continue;
//                    }
                }

                if (!Cools.isEmpty(barcode) && !"NoRead".equals(barcode)) {
                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
//                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        continue;
//                    }
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
                    }
                } else {
                    continue;
                }
@@ -193,11 +189,15 @@
//                    }

                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    if (wrkMast != null) {
                        log.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        continue;
                    WrkMast wrkMast = new WrkMast();
                    if (barcode.length() == 8) {
                        wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                        if (wrkMast != null) {
                            log.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                            continue;
                        }
                    }

//                    // 获取入库通知档
//                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
//                    if (waitPakins.isEmpty()) {
@@ -397,15 +397,38 @@
            for (DevpSlave.Sta pickSta : devp.getPickSta()) {
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());

                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;


                //101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
                if((pickSta.getStaNo().equals(101) || pickSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
                    BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode1());
                    if (barcodeThread1 != null) {
                        barcode = barcodeThread1.getBarcode();
                    }

                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
                        BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode2());
                        if (barcodeThread2 != null) {
                            barcode = barcodeThread2.getBarcode();

                        }
                    }
//                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
//                        barcode = "";
//                        continue;
//                    }
                }

                if (!Cools.isEmpty(barcode) && "NoRead".equals(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
//                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        continue;
//                    }
                } else {
                    continue;
                }

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

@@ -234,8 +234,8 @@
        }
//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[10];
//        short[] array = new short[12];
//        short[] array = new short[10];
        short[] array = new short[12];
        array[0] = command.getAckFinish(); // 任务完成确认位
        array[1] = command.getTaskNo();  // 任务号
        array[2] = command.getTaskMode();  // 模式
@@ -246,14 +246,14 @@
        array[7] = command.getDestinationPosY(); // 目标位置列号
        array[8] = command.getDestinationPosZ(); // 目标位置层号
        array[9] = command.getCommand();
//        array[10] = command.getLocType1();   //新增货物类型下发
        array[10] = command.getLocType1();   //新增货物类型下发
        OperateResult result = siemensNet.Write("DB100.0", array);

        if (command.getAckFinish() == 0) {
            short commandFinish = 1;
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.18", commandFinish);
//            result = siemensNet.Write("DB100.22", commandFinish);
//            result = siemensNet.Write("DB100.18", commandFinish);
            result = siemensNet.Write("DB100.22", commandFinish);
        }

        try {

 src/main/resources/application.yml

@@ -348,7 +348,7 @@
    id: 7
    ip: 10.10.10.106
    port: 2002
  # 条码扫描仪8,104
  # 条码扫描仪8,101
  barcode[7]:
    id: 8
    ip: 10.10.10.107
@@ -358,7 +358,7 @@
    id: 9
    ip: 10.10.10.108
    port: 2002
  # 条码扫描仪10,101
  # 条码扫描仪10,104
  barcode[9]:
    id: 10
    ip: 10.10.10.109

 src/main/webapp/views/console.html

@@ -607,7 +607,7 @@
                        // crns[i].bay = 15;

                        var offSet = 0;
                        unit = 60;
                        unit = 11.5;
                        offSet = 350;