Merge remote-tracking branch 'origin/main'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/mapper/WcsSrgvQueueMapper.java
#	ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java
#	ruoyi-admin/src/main/resources/mapper/device/DeviceSrgvMapper.xml
#	ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
#	ruoyi-admin/src/main/resources/mapper/queue/WcsSrgvQueueMapper.xml

ruoyi-ui/src/api/algorithm/tidy.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getTidyStatus() {
+  return request({ url: '/algorithm/tidy/status', method: 'get' })
+}
+
+export function updateTidyMode(mode) {
+  return request({ url: '/algorithm/tidy/mode', method: 'put', data: { mode } })
+}

ruoyi-ui/src/views/algorithm/tidy/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class="app-container tidy-page">
+    <el-card>
+      <div slot="header"><span>理货控制</span></div>
+      <el-switch v-model="manual" active-text="手动理货" inactive-text="自动理货" :disabled="loading || !hasEdit" @change="changeMode" />
+      <span class="mode-status">当前模式：{{ modeLabel }}</span>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getTidyStatus, updateTidyMode } from '@/api/algorithm/tidy'
+
+export default {
+  name: 'TidyControl',
+  data() { return { manual: false, mode: 'AUTO', loading: false, timer: null, hasEdit: this.$auth.hasPermi('algorithm:tidy:edit') } },
+  computed: { modeLabel() { return this.mode === 'MANUAL' ? '手动' : '自动' } },
+  created() { this.refresh(); this.timer = setInterval(this.refresh, 5000) },
+  beforeDestroy() { if (this.timer) { clearInterval(this.timer); this.timer = null } },
+  methods: {
+    refresh() { getTidyStatus().then(res => { const data = res.data || {}; this.mode = data.mode || 'AUTO'; this.manual = this.mode === 'MANUAL' }).catch(() => {}) },
+    changeMode(value) {
+      const previous = this.mode
+      this.loading = true
+      updateTidyMode(value ? 'MANUAL' : 'AUTO').then(res => { const data = res.data || {}; this.mode = data.mode || (value ? 'MANUAL' : 'AUTO') }).catch(() => { this.manual = previous === 'MANUAL'; this.$message.error('理货模式切换失败') }).finally(() => { this.loading = false })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.mode-status { margin-left: 16px; color: #606266; }
+</style>