Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

pang.jiabao

2024-11-06 6548c75a24d8d0c23c8167980465831128abf579

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

@@ -643,7 +643,7 @@
                        }

                        // 更新工作档状态为14失败
                        wrkMast.setWrkSts(14L);
                        wrkMast.setWrkSts(13L);
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
@@ -2120,7 +2120,7 @@
                getAgvTaskParam(forwardAGVTaskParam,wrkMast,staProtocol.getSiteId());
                String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
                if ("SUCCESS".equals(request)) {
                    wrkMast.setWrkSts(101L);
                    wrkMast.setWrkSts(14L);
                    boolean update = wrkMastService.updateById(wrkMast);
                    if (update){
                        log.info("入库转发AGV任务完成,任务号:"+wrkMast.getWrkNo());