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

zjj

2025-06-09 80d97d40c44165674ee0168be5f08c8ca52d3c06

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java

@@ -984,6 +984,9 @@
        //穿梭车出提升机库位号
        String liftLocNoFrom = shuttleStandbyFrom.getDeviceLoc();

        //穿梭车换层时待机位置 使用表列 memo数据
        String standbyLocNoMemo = shuttleStandbyTo.getMemo();

        //穿梭车进提升机待机位库位号
        String standbyLocNoTo = shuttleStandbyTo.getDeviceStandbyLoc();

@@ -1018,7 +1021,7 @@
                    MotionDto.build((dto -> {
                        dto.setShuttleNo(shuttleDevice.getId().intValue());
                        dto.setShuttleDevice(shuttleDevice);
                        dto.setLocNo(standbyLocNoTo);
                        dto.setLocNo(standbyLocNoMemo);
                    })),
                    MotionCtgType.SHUTTLE_MOVE
            ));
@@ -1044,7 +1047,7 @@
            motionList.addAll(kernelService.shuttleMove(
                    MotionDto.build((dto -> {
                        dto.setShuttleNo(shuttleDevice.getId().intValue());
                        dto.setLocNo(standbyLocNoTo);
                        dto.setLocNo(standbyLocNoMemo);
                    })),
                    MotionDto.build((dto -> {
                        dto.setShuttleNo(shuttleDevice.getId().intValue());