Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

lsh

2026-04-21 720e0926fa1c94b952c26e111206c5d6e1ed5ba2

 src/main/java/com/zy/core/network/fake/ZyRgvFakeConnect.java

@@ -24,6 +24,10 @@
    private final DeviceConfig deviceConfig;
    private final ExecutorService executor = Executors.newSingleThreadExecutor();

    private long moveStepDurationMs() { return FakeConfigSupport.getLong(FakeConfigKeys.FAKE_RGV_MOVE_STEP_DURATION_MS); }
    private long loadDurationMs() { return FakeConfigSupport.getLong(FakeConfigKeys.FAKE_RGV_LOAD_DURATION_MS); }
    private long resetDurationMs() { return FakeConfigSupport.getLong(FakeConfigKeys.FAKE_RGV_RESET_DURATION_MS); }

    public ZyRgvFakeConnect(DeviceConfig deviceConfig) {
        this.deviceConfig = deviceConfig;
        ZyRgvStatusEntity init = JSON.parseObject(deviceConfig.getFakeInitStatus(), ZyRgvStatusEntity.class);
@@ -120,7 +124,7 @@
            Integer currentTrackSiteNo = valueObject.getInteger("trackSiteNo");

            status.setRgvPos(currentTrackSiteNo);
            sleep(1000);
            sleep(moveStepDurationMs());
            if (Thread.currentThread().isInterrupted()) {
                return;
            }
@@ -128,7 +132,7 @@

        status.setStatus(RgvStatusType.PUTTING.id);
        status.setLoaded(1);
        sleep(1000);
        sleep(loadDurationMs());
        if (Thread.currentThread().isInterrupted()) {
            return;
        }
@@ -139,13 +143,13 @@
            Integer currentTrackSiteNo = valueObject.getInteger("trackSiteNo");

            status.setRgvPos(currentTrackSiteNo);
            sleep(1000);
            sleep(moveStepDurationMs());
            if (Thread.currentThread().isInterrupted()) {
                return;
            }
        }

        sleep(1000);
        sleep(loadDurationMs());
        if (Thread.currentThread().isInterrupted()) {
            return;
        }
@@ -193,7 +197,7 @@
            Integer currentTrackSiteNo = valueObject.getInteger("trackSiteNo");

            status.setRgvPos(currentTrackSiteNo);
            sleep(1000);
            sleep(moveStepDurationMs());
            if (Thread.currentThread().isInterrupted()) {
                return;
            }
@@ -202,6 +206,7 @@
    }

    private void commandTaskComplete(RgvCommand command) {
        sleep(resetDurationMs());
        status.setTaskNo(0);
        status.setStatus(RgvStatusType.IDLE.id);
    }