大屏接口

cl

9 小时以前 13fbd2d9fdc7146cc5709b30b3f04e81c829f86f

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

@@ -313,8 +313,13 @@
                                wrkMastService.updateById(wrkMast);
                                Thread.sleep(3000); // 延时3S
                            }else {
                                // 未组托托盘退回 电视机显示请先组托
                                Integer back = 999;

                                if (ledThread != null) {
//                                    String errorMsg = jsonObject.getString("msg");
                                    String errorMsg = "请先组托";
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                }
                                barcodeThread.setBarcode("");
                                boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, back));
                                if (result) {
@@ -553,28 +558,29 @@
//        }
        // 组托档存在已组托未入库则等待，不下发出库
        int waitPakinNotIn = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>()
                .isNull("io_status").or().ne("io_status", "Y"));
                .eq("status", "Y"));
        if (waitPakinNotIn > 0) {
            return;
        }
        // 存在进行中/在途任务(2,3,12,13,14)则不下发出库，避免冲突
        // 2 待执行（入库）
        //3 设备执行中（入库）
        //12 设备执行中（出库）
        //13 出库到站点上
        //14 出库等待确认
        int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                .in("wrk_sts", 2, 3, 12, 13, 14));
        if (activeCount > 0) {
            return;
        }

        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).orderBy("create_time"));
        if (wrkMasts.isEmpty()) {
            return;
        }

        WrkMast wrkMast = wrkMasts.get(0);
        // 存在进行中/在途任务(2,3,12,13,14)则不下发出库，避免冲突（排除当前任务）
        // 2 待执行（入库）
        // 3 设备执行中（入库）
        // 12 设备执行中（出库）
        // 13 出库到站点上
        // 14 出库等待确认
        int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                .in("wrk_sts", 2, 3, 12, 13, 14)
                .ne("wrk_no", wrkMast.getWrkNo()));
        if (activeCount > 0) {
            return;
        }

        Integer sourceStaNo = Utils.getStaNoByLocNo(wrkMast.getSourceLocNo());

        LiftCommand command = new LiftCommand();