cl
9 小时以前 ae1b1eefcfcaae12753466e6b8a77944cc96a688
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -313,8 +313,12 @@
                                wrkMastService.updateById(wrkMast);
                                Thread.sleep(3000); // 延时3S
                            }else {
                                // 未组托托盘退回 电视机显示请先组托
                                Integer back = 999;
                                if (ledThread != null) {
                                    String errorMsg = jsonObject.getString("msg");
                                    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,7 +557,7 @@
//        }
        // 组托档存在已组托未入库则等待,不下发出库
        int waitPakinNotIn = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>()
                .isNull("io_status").or().ne("io_status", "Y"));
                .eq("status", "Y"));
        if (waitPakinNotIn > 0) {
            return;
        }