#

cl

1 天以前 97e704d52a980844af0268f41b09b177e4aa7268

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

@@ -316,7 +316,8 @@
                                // 未组托托盘退回 电视机显示请先组托
                                Integer back = 999;
                                if (ledThread != null) {
                                    String errorMsg = jsonObject.getString("msg");
//                                    String errorMsg = jsonObject.getString("msg");
                                    String errorMsg = "请先组托";
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                }
                                barcodeThread.setBarcode("");
@@ -579,6 +580,15 @@
        if (activeCount > 0) {
            return;
        }
        // 存在5秒内的15状态不下发出库
        Date modiTimeThreshold = new Date(System.currentTimeMillis() - 5000L);
        int recentStatus15Count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                .eq("wrk_sts", 15)
                .gt("modi_time", modiTimeThreshold)
                .ne("wrk_no", wrkMast.getWrkNo()));
        if (recentStatus15Count > 0) {
            return;
        }

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