#

ytfl

1 天以前 f4603a10d8519827608636c5e7980b2d6d0be8e3

#

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

@@ -1212,10 +1212,10 @@
                            News.error("" + mark + " - 2" + " - 检测存在1058站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
                            continue;
                        }
                    } else if (wrkMast.getStaNo() == 1062) {
                    } else if (wrkMast.getStaNo() == 1064) {
                        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                                .in("wrk_sts", 12, 14)
                                .eq("sta_no", 1062)
                                .eq("sta_no", 1064)
                        );
                        if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
                            News.error("" + mark + " - 2" + " - 检测存在1062站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -203,6 +203,7 @@
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short)1);
                        if (write(crnCommand)) {
                            log.info(crnProtocol.getCrnNo()+"号堆垛机任务等待wcs确认，当前状态"+crnProtocol.getStatusType());
                            resetFlag = false;
                        }
                    }

 src/main/webapp/views/console.html

@@ -664,6 +664,14 @@
                }
            }
        });

        //获取RGV数据
        $.ajax({
            url: baseUrl + "/console/latest/data/rgv",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {}
        })
    }

    // 扫码器实时数据获取