#

Junjie

2025-07-18 359a00f601f87497e4c9a3ef4295095980366d8c

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

@@ -676,7 +676,7 @@

                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                        .eq("crn_no", crn.getId())
                        .eq("wrk_sts", 2)
                        .notIn("wrk_sts", 5, 14, 15)
                );
                if (!wrkMasts.isEmpty()) {
                    continue;
@@ -737,7 +737,7 @@
                    continue;
                }

                if (System.currentTimeMillis() - crnProtocol.getLastCommandTime() < 1000 * 60 * 2) {
                if (System.currentTimeMillis() - crnProtocol.getLastCommandTime() < 1000 * 60) {
                    continue;
                }

@@ -748,15 +748,15 @@

                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                        .eq("crn_no", crn.getId())
                        .notIn("wrk_sts", 5, 14, 15)
                        .eq("wrk_sts", 2)
                );
                if (!wrkMasts.isEmpty()) {
                if (wrkMasts.isEmpty()) {
                    continue;
                }

                CrnSlave.CrnStn crnStn = crn.getCrnInStn().get(0);

                News.info("堆垛机无任务自动回入库口待机==>>" + crnProtocol.getCrnNo() + "号堆垛机");
                News.info("堆垛机有入库任务时，回入库口待机==>>" + crnProtocol.getCrnNo() + "号堆垛机");
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号