1
Administrator
2026-04-16 cbc9760ec413b3ec05bba329115830db81b02f0d
1
3个文件已修改
18 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -231,7 +231,7 @@
        if (Cools.isEmpty(reportFaultUrl)) {
            return;
        }
        List<VehFaultRec> vehFaultRecList = vehFaultRecService.list((new LambdaQueryWrapper<VehFaultRec>().eq(VehFaultRec::getState, VehFaultRecStateType.PENDING).ge(VehFaultRec::getHappenTime, Instant.now().minusSeconds(3).atZone(ZoneId.systemDefault()).toLocalDateTime())));
        List<VehFaultRec> vehFaultRecList = vehFaultRecService.list((new LambdaQueryWrapper<VehFaultRec>().eq(VehFaultRec::getState, VehFaultRecStateType.PENDING).ge(VehFaultRec::getHappenTime, Instant.now().minusSeconds(180).atZone(ZoneId.systemDefault()).toLocalDateTime())));
        if (Cools.isEmpty(vehFaultRecList)) {
            return;
        }
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -90,31 +90,31 @@
                    }
                    if (staProtocol.isErr()){
                        if (staProtocol.isFrontErr()) {
                            log.error("{}:站点:{},前超限", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},前超限", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if (staProtocol.isBackErr()) {
                            log.error("{}:站点:{},后超限", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},后超限", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if ( staProtocol.isHighErr()) {
                            log.error("{}:站点:{},高超限", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},高超限", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if ( staProtocol.isLeftErr()) {
                            log.error("{}:站点:{},左超限", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},左超限", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if ( staProtocol.isRightErr()) {
                            log.error("{}:站点:{},右超限", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},右超限", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if (staProtocol.isWeightErr()) {
                            log.error("{}:站点:{},超重或", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},超重或", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if ( staProtocol.isBarcodeErr()) {
                            log.error("{}:站点:{},扫码失败", config.getMark(), staProtocol.getSiteId());
                            News.error("{}:站点:{},扫码失败", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                    }
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
@@ -58,7 +58,7 @@
                    .setJson(JSON.toJSONString(applyInDto))
                    .build()
                    .doPost();
            log.info("WMS返回数据:{}", response);
            log.info("请求数据:{},WMS返回数据:{}", applyInDto,response);
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.get(code) != null && jsonObject.getInteger(code).equals(codeValue)) {
                return JSONObject.parseObject(jsonObject.getString(dataCode), ApplyInRepsonseDto.class);