Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs

Junjie

2024-06-29 054bee11a781af22a2e0d3b5015e03b023efeec2

Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs

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

@@ -898,6 +898,7 @@
                    if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                        log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
                    } else {
                        log.info("堆垛机命令下发成功，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
                        // 修改工作档状态 11.生成出库ID => 12.吊车出库中
                        Date now = new Date();
                        wrkMast.setWrkSts(12L);