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

zjj

2025-06-09 80d97d40c44165674ee0168be5f08c8ca52d3c06

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java

@@ -75,6 +75,7 @@
//        taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
//        taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
//        taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
        taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);

        Dict reportWms = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "reportWms"));

@@ -98,8 +99,10 @@
                }
                String wmsUrl = dict.getValue();

                if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts) || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)){
                    boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs//wrkMast/finish/v1");
                if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts)
                        || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)
                        || task.getTaskSts().equals(TaskStsType.COMPLETE_LADEN_MOVE.sts)){
                    boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs/wrkMast/finish/v1");
                    if (!httpRequest) {
                        continue;
                    }