diff --git a/handoff.md b/handoff.md
new file mode 100644
index 0000000..93c0cf0
--- /dev/null
+++ b/handoff.md
@@ -0,0 +1,48 @@
+# FTC25009 会话交接文档
+
+## 当前状态
+
+### 仓库操作已完成
+
+1. **仓库名称已更新**：
+   - `01` → `托盘库1`
+   - `02` → `托盘库2`
+
+2. **货位已重建（按 proc_create_cargo_space 规则）**：
+   - `01` 仓库：4排 × 12列 × 5层 = **240个货位**，4条巷道(1-4)已存在
+   - `02` 仓库：2排 × 10列 × 5层 = **100个货位**，新增了2条巷道(1-2)
+
+3. **旧数据已清空**：01仓库的旧库存、作业、货位记录已删除
+
+4. **新货位编码格式**（proc_create_cargo_space 规则）：
+   - `cargo_space_id`：`010100101`（warehouse + platoon(2位) + column(3位) + floor(2位)）
+   - `cargo_space_name`：`01排001列01层`
+
+### 关键变更 - 编码格式不兼容
+
+旧货位格式：`CS001` / `A-1-1-1`  
+新货位格式：`010100101` / `01排001列01层`
+
+**系统中可能有代码依赖旧的 `cargo_space_id` 或 `cargo_space_name` 命名格式，需要排查。**
+
+### 数据库信息
+- 服务器：`172.16.4.12:1433`
+- 数据库：`FTC25009-WMS`
+- 用户：`sa`
+- MCP 已配置并正常工作
+
+### MCP 配置文件位置
+- `C:\Users\13623\.cursor\mcp.json`（Cursor 主要读取）
+- `C:\Users\13623\AppData\Roaming\Cursor\User\globalStorage\mcp-settings.json`
+- `D:\workSpace\PROJECT_SPACE\FTC25009\.cursorrules-mcp.json`
+
+### Git 仓库
+- 本地：`D:\workSpace\PROJECT_SPACE\FTC25009`
+- 远程：`http://106.13.86.63:10082/zgw/FTC25009.git`
+- 项目框架：若依(RuoYi) WMS 系统
+
+## 建议下一步
+
+1. 检查 Java 代码中是否有硬编码 `CS001` 或其他旧货位编码的地方
+2. 检查前端 ruoyi-ui 是否对货位编码格式有依赖
+3. 如果有入库流程测试，验证新货位编码能否正常使用
diff --git a/pda/api/warehouse/inbound.js b/pda/api/warehouse/inbound.js
index faabcac..36aea00 100644
--- a/pda/api/warehouse/inbound.js
+++ b/pda/api/warehouse/inbound.js
@@ -78,10 +78,10 @@ export function submitBindTrayAndAddInJob(data) {
   })
 }
 
-// 提交补料入库
-export function submitSupplyInbound(data) {
+// 空托入库并立即生成入库作业
+export function submitEmptyTrayInbound(data) {
   return request({
-    url: '/wms/inbound/supply',
+    url: '/pda/emptyTrayInbound',
     method: 'post',
     data: data
   })
diff --git a/pda/api/warehouse/outbound.js b/pda/api/warehouse/outbound.js
index 7b1c34f..dc0aa78 100644
--- a/pda/api/warehouse/outbound.js
+++ b/pda/api/warehouse/outbound.js
@@ -9,6 +9,27 @@ export function getOutboundTaskList(query) {
   })
 }
 
+// 查询仓库空托按条码头分组的数量
+export function getEmptyTrayOutboundTypes(warehouseId) {
+  return request({
+    url: '/pda/emptyTrayOutbound/count',
+    method: 'get',
+    params: { warehouseId }
+  })
+}
+
+// 兼容旧调用名
+export const getEmptyTrayOutboundCount = getEmptyTrayOutboundTypes
+
+// 生成空托出库作业并下发 WCS
+export function submitEmptyTrayOutbound(data) {
+  return request({
+    url: '/pda/emptyTrayOutbound',
+    method: 'post',
+    data: data
+  })
+}
+
 // 获取出库任务详情
 export function getOutboundDetail(query) {
   return request({
@@ -27,11 +48,3 @@ export function confirmOutbound(data) {
   })
 }
 
-// 提交出库异常确认
-export function submitOutboundException(data) {
-  return request({
-    url: '/pda/outboundException',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/pda/api/warehouse/stock.js b/pda/api/warehouse/stock.js
new file mode 100644
index 0000000..4f5a2b1
--- /dev/null
+++ b/pda/api/warehouse/stock.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 扫描托盘码查询托盘绑定的库存物料
+export function getTrayStock(trayCode) {
+  return request({
+    url: '/pda/trayStock',
+    method: 'get',
+    params: { trayCode }
+  })
+}
diff --git a/pda/pages.json b/pda/pages.json
index 4ff1d18..d1d8db5 100644
--- a/pda/pages.json
+++ b/pda/pages.json
@@ -71,9 +71,9 @@
       "navigationBarTitleText": "入库绑盘"
     }
   }, {
-    "path": "pages/warehouse/inbound/supply",
+    "path": "pages/warehouse/inbound/emptyTray",
     "style": {
-      "navigationBarTitleText": "补料入库"
+      "navigationBarTitleText": "空托盘入库"
     }
   }, {
     "path": "pages/warehouse/outbound/index",
@@ -86,9 +86,9 @@
       "navigationBarTitleText": "出库确认"
     }
   }, {
-    "path": "pages/warehouse/outbound/exception",
+    "path": "pages/warehouse/outbound/emptyTray",
     "style": {
-      "navigationBarTitleText": "出库异常确认"
+      "navigationBarTitleText": "空托盘出库"
     }
   }, {
     "path": "pages/warehouse/inventory/index",
@@ -121,11 +121,6 @@
         "iconPath": "static/images/tabbar/home.png",
         "selectedIconPath": "static/images/tabbar/home_.png",
         "text": "首页"
-      }, {
-        "pagePath": "pages/work/index",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "工作台"
       }, {
         "pagePath": "pages/mine/index",
         "iconPath": "static/images/tabbar/mine.png",
diff --git a/pda/pages/index.vue b/pda/pages/index.vue
index 7c15acc..fe07d0a 100644
--- a/pda/pages/index.vue
+++ b/pda/pages/index.vue
@@ -19,7 +19,7 @@
             <uni-icons type="download" size="28" color="#fff"></uni-icons>
           </view>
           <text class="menu-label">入库管理</text>
-          <text class="menu-desc">入库绑盘 / 补料入库</text>
+          <text class="menu-desc">入库绑盘 / 空托盘入库</text>
         </view>
 
         <view class="menu-item" @click="navigateTo('/pages/warehouse/outbound/index')">
@@ -27,7 +27,7 @@
             <uni-icons type="upload" size="28" color="#fff"></uni-icons>
           </view>
           <text class="menu-label">出库管理</text>
-          <text class="menu-desc">出库确认 / 异常确认</text>
+          <text class="menu-desc">出库确认 / 空托盘出库</text>
         </view>
 
         <view class="menu-item" @click="navigateTo('/pages/warehouse/inventory/index')">
@@ -56,17 +56,17 @@
           <uni-icons type="scan" size="22" color="#1890ff"></uni-icons>
           <text class="quick-label">入库绑盘</text>
         </view>
-        <view class="quick-item" @click="navigateTo('/pages/warehouse/inbound/supply')">
-          <uni-icons type="plus" size="22" color="#52c41a"></uni-icons>
-          <text class="quick-label">补料入库</text>
+        <view class="quick-item" @click="navigateTo('/pages/warehouse/inbound/emptyTray')">
+          <uni-icons type="paperplane" size="22" color="#13c2c2"></uni-icons>
+          <text class="quick-label">空托入库</text>
         </view>
         <view class="quick-item" @click="navigateTo('/pages/warehouse/outbound/confirm')">
           <uni-icons type="checkmarkempty" size="22" color="#fa8c16"></uni-icons>
           <text class="quick-label">出库确认</text>
         </view>
-        <view class="quick-item" @click="navigateTo('/pages/warehouse/outbound/exception')">
-          <uni-icons type="info" size="22" color="#f5222d"></uni-icons>
-          <text class="quick-label">出库异常</text>
+        <view class="quick-item" @click="navigateTo('/pages/warehouse/outbound/emptyTray')">
+          <uni-icons type="paperplane" size="22" color="#1890ff"></uni-icons>
+          <text class="quick-label">空托出库</text>
         </view>
       </view>
     </view>
@@ -97,10 +97,11 @@
   }
 
   .header {
-    background: linear-gradient(135deg, #1890ff, #096dd9);
+    background: #fff;
     border-radius: 20rpx;
     padding: 40rpx 36rpx;
     margin-bottom: 32rpx;
+    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
   }
 
   .header-info {
@@ -109,27 +110,28 @@
   }
 
   .logo {
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 16rpx;
+    flex-shrink: 0;
+    width: 220rpx;
+    height: 70rpx;
     margin-right: 24rpx;
   }
 
   .header-text {
     display: flex;
     flex-direction: column;
+    min-width: 0;
   }
 
   .app-name {
     font-size: 36rpx;
     font-weight: 500;
-    color: #fff;
+    color: #1f2933;
     margin-bottom: 8rpx;
   }
 
   .welcome-text {
     font-size: 24rpx;
-    color: rgba(255, 255, 255, 0.8);
+    color: #6b7280;
   }
 
   .menu-section {
diff --git a/pda/pages/login.vue b/pda/pages/login.vue
index 8794386..09660ee 100644
--- a/pda/pages/login.vue
+++ b/pda/pages/login.vue
@@ -1,9 +1,10 @@
 <template>
   <view class="normal-login-container">
     <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
-      </image>
-      <text class="title">若依移动端登录</text>
+      <view class="login-logo-box">
+        <image class="login-logo" :src="globalConfig.appInfo.logo" mode="aspectFit">
+        </image>
+      </view>
     </view>
     <view class="login-form-content">
       <view class="input-item flex align-center">
@@ -143,11 +144,21 @@
       padding-top: 15%;
 
       image {
-        border-radius: 4px;
+        border-radius: 12rpx;
       }
 
-      .title {
-        margin-left: 10px;
+      .login-logo-box {
+        width: 300rpx;
+        height: 96rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+      }
+
+      .login-logo {
+        width: 100%;
+        height: 100%;
       }
     }
 
diff --git a/pda/pages/mine/about/index.vue b/pda/pages/mine/about/index.vue
index 77bc093..cf920d3 100644
--- a/pda/pages/mine/about/index.vue
+++ b/pda/pages/mine/about/index.vue
@@ -1,8 +1,10 @@
 <template>
   <view class="about-container">
     <view class="header-section text-center">
-      <image style="width: 150rpx;height: 150rpx;" src="/static/logo200.png" mode="widthFix">
-      </image>
+      <view class="about-logo-box">
+        <image class="about-logo" src="/static/logo200.png" mode="aspectFit">
+        </image>
+      </view>
       <uni-title type="h2" title="若依移动端"></uni-title>
     </view>
 
@@ -72,4 +74,18 @@
     flex-direction: column;
     align-items: center;
   }
+
+  .about-logo-box {
+    width: 360rpx;
+    height: 114rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+  }
+
+  .about-logo {
+    width: 100%;
+    height: 100%;
+  }
 </style>
diff --git a/pda/pages/warehouse/inbound/bindTray.vue b/pda/pages/warehouse/inbound/bindTray.vue
index db06a1b..4da9fb1 100644
--- a/pda/pages/warehouse/inbound/bindTray.vue
+++ b/pda/pages/warehouse/inbound/bindTray.vue
@@ -18,19 +18,20 @@
           </view>
         </picker>
       </view>
-      <view class="form-item">
-        <text class="form-label">入库点位</text>
-        <picker class="form-picker" mode="selector" :range="stationPointOptions" range-key="pointName"
-          :value="stationPointIndex" :disabled="bindSuccess || !warehouseId || !trayCode" @change="handleStationPointChange">
-          <view class="picker-value" :class="{ placeholder: !stationPointId }">
-            {{ selectedStationPointName || '请选择入库点位' }}
-          </view>
-        </picker>
-      </view>
       <view class="form-item">
         <text class="form-label">托盘号</text>
         <input class="form-input" v-model="trayCode" placeholder="请扫描托盘号" />
       </view>
+      <view class="form-tip" v-if="!warehouseId || !trayCode">请先选择仓库和扫描托盘号</view>
+      <view class="form-item" v-else>
+        <text class="form-label">入库点位</text>
+        <picker class="form-picker" mode="selector" :range="stationPointOptions" range-key="pointName"
+          :value="stationPointIndex" :disabled="bindSuccess" @change="handleStationPointChange">
+          <view class="picker-value" :class="{ placeholder: !stationPointId }">
+            {{ selectedStationPointName || '请扫描入库点位' }}
+          </view>
+        </picker>
+      </view>
     </view>
 
     <!-- 绑盘状态提示 -->
@@ -551,18 +552,28 @@
           return submitBindTrayAndAddInJob(data)
         }).then(function(res) {
           that.$modal.msgSuccess(res.msg || '绑盘并生成入库作业成功')
-          that.bindSuccess = true
+          that.resetBindPayload()
           if (that.stockinId) {
             that.loadDetailList()
           }
-          that.barcode = ''
-          that.currentMaterial = null
-          that.currentRemainQty = 0
-          that.currentQty = ''
-          that.showQuantityPopup = false
         }).catch(function() {})
       },
 
+      resetBindPayload() {
+        this.stationPointId = ''
+        this.stationPointName = ''
+        this.stationPointIndex = 0
+        this.stationPointOptions = []
+        this.trayCode = ''
+        this.barcode = ''
+        this.currentMaterial = null
+        this.currentRemainQty = 0
+        this.currentQty = ''
+        this.showQuantityPopup = false
+        this.bindSuccess = false
+        this.items = []
+      },
+
       // 全部重置
       resetAll() {
         this.stockinId = ''
@@ -697,6 +708,13 @@
     padding: 16rpx 0;
   }
 
+  .form-tip {
+    padding: 8rpx 0 16rpx 160rpx;
+    font-size: 24rpx;
+    color: #909399;
+    line-height: 1.4;
+  }
+
   .form-label {
     font-size: 28rpx;
     color: #666;
diff --git a/pda/pages/warehouse/inbound/emptyTray.vue b/pda/pages/warehouse/inbound/emptyTray.vue
new file mode 100644
index 0000000..8ca5189
--- /dev/null
+++ b/pda/pages/warehouse/inbound/emptyTray.vue
@@ -0,0 +1,298 @@
+<template>
+  <view class="page-container">
+    <view class="form-section">
+      <text class="form-title">空托盘入库</text>
+
+      <view class="form-item">
+        <text class="form-label">仓库</text>
+        <picker class="form-picker" mode="selector" :range="warehouseOptions" range-key="warehouseName"
+          :value="warehouseIndex" @change="handleWarehouseChange">
+          <view class="picker-value" :class="{ placeholder: !warehouseId }">
+            {{ selectedWarehouseName || '请选择仓库' }}
+          </view>
+        </picker>
+      </view>
+
+      <view class="form-item">
+        <text class="form-label">托盘号</text>
+        <input class="form-input" v-model="trayCode" placeholder="请扫描托盘号" />
+      </view>
+
+      <view class="form-tip" v-if="!warehouseId || !trayCode">请先选择仓库和扫描托盘号</view>
+      <template v-else>
+        <view class="form-item">
+          <text class="form-label">入库点位</text>
+          <picker class="form-picker" mode="selector" :range="stationPointOptions" range-key="pointName"
+            :value="stationPointIndex" @change="handleStationPointChange">
+            <view class="picker-value" :class="{ placeholder: !stationPointId }">
+              {{ selectedStationPointName || '请选择入库点位' }}
+            </view>
+          </picker>
+        </view>
+      </template>
+    </view>
+
+    <view class="summary-section">
+      <view class="summary-row">
+        <text class="summary-label">作业类型</text>
+        <text class="summary-value">空容器入库</text>
+      </view>
+      <view class="summary-row">
+        <text class="summary-label">绑定物料</text>
+        <text class="summary-value muted">无需绑定</text>
+      </view>
+    </view>
+
+    <view class="btn-section">
+      <button class="btn btn-primary" :disabled="!canSubmit || submitting" @click="submitEmptyTray">
+        {{ submitting ? '提交中...' : '确认生成空托入库作业' }}
+      </button>
+      <button class="btn btn-default" @click="resetPayload">重置</button>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { getInboundStationPointOptions, getWarehouseOptions, submitEmptyTrayInbound } from '@/api/warehouse/inbound'
+
+  export default {
+    data() {
+      return {
+        warehouseOptions: [],
+        warehouseIndex: 0,
+        warehouseId: '',
+        warehouseName: '',
+        trayCode: '',
+        stationPointOptions: [],
+        stationPointIndex: 0,
+        stationPointId: '',
+        stationPointName: '',
+        submitting: false
+      }
+    },
+    computed: {
+      selectedWarehouseName() {
+        if (this.warehouseName) return this.warehouseName
+        var selected = this.warehouseOptions[this.warehouseIndex]
+        return selected && selected.warehouseId === this.warehouseId ? selected.warehouseName : ''
+      },
+      selectedStationPointName() {
+        if (this.stationPointName) return this.stationPointName
+        var selected = this.stationPointOptions[this.stationPointIndex]
+        return selected && selected.pointId === this.stationPointId ? (selected.pointName || selected.pointId) : ''
+      },
+      canSubmit() {
+        return !!(this.warehouseId && this.trayCode && this.stationPointId)
+      }
+    },
+    watch: {
+      trayCode: function() {
+        this.resetStationPoint()
+        this.loadStationPointOptions()
+      }
+    },
+    onLoad() {
+      this.loadWarehouseOptions()
+    },
+    methods: {
+      loadWarehouseOptions() {
+        var that = this
+        getWarehouseOptions().then(function(res) {
+          that.warehouseOptions = res.data || res.rows || []
+        }).catch(function() {
+          that.warehouseOptions = []
+        })
+      },
+      handleWarehouseChange(e) {
+        var index = Number(e.detail.value)
+        var selected = this.warehouseOptions[index]
+        if (!selected) return
+        this.warehouseIndex = index
+        this.warehouseId = selected.warehouseId
+        this.warehouseName = selected.warehouseName
+        this.resetStationPoint()
+        this.loadStationPointOptions()
+      },
+      loadStationPointOptions() {
+        var that = this
+        if (!this.warehouseId || !this.trayCode) {
+          this.stationPointOptions = []
+          return
+        }
+        getInboundStationPointOptions(this.warehouseId, this.trayCode).then(function(res) {
+          that.stationPointOptions = res.data || res.rows || []
+          if (that.stationPointOptions.length === 1) {
+            that.stationPointIndex = 0
+            that.stationPointId = that.stationPointOptions[0].pointId
+            that.stationPointName = that.stationPointOptions[0].pointName || that.stationPointOptions[0].pointId
+          }
+        }).catch(function() {
+          that.resetStationPoint()
+          that.stationPointOptions = []
+        })
+      },
+      handleStationPointChange(e) {
+        var index = Number(e.detail.value)
+        var selected = this.stationPointOptions[index]
+        if (!selected) return
+        this.stationPointIndex = index
+        this.stationPointId = selected.pointId
+        this.stationPointName = selected.pointName || selected.pointId
+      },
+      resetStationPoint() {
+        this.stationPointIndex = 0
+        this.stationPointId = ''
+        this.stationPointName = ''
+        this.stationPointOptions = []
+      },
+      submitEmptyTray() {
+        if (!this.canSubmit) {
+          this.$modal.msg('请补全仓库、托盘号和入库点位')
+          return
+        }
+        var data = {
+          warehouseId: this.warehouseId,
+          trayCode: this.trayCode,
+          stationPointId: this.stationPointId
+        }
+        var that = this
+        this.$modal.confirm('是否确认生成空托入库作业？').then(function() {
+          that.submitting = true
+          return submitEmptyTrayInbound(data)
+        }).then(function(res) {
+          that.$modal.msgSuccess(res.msg || '空托入库作业生成成功')
+          that.resetPayload()
+        }).catch(function() {}).finally(function() {
+          that.submitting = false
+        })
+      },
+      resetPayload() {
+        this.trayCode = ''
+        this.stationPointOptions = []
+        this.resetStationPoint()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f7fa;
+    min-height: 100%;
+  }
+
+  .page-container {
+    padding: 24rpx;
+    padding-bottom: 60rpx;
+  }
+
+  .form-section,
+  .summary-section {
+    background: #fff;
+    border-radius: 16rpx;
+    padding: 28rpx;
+    margin-bottom: 24rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+  }
+
+  .form-title {
+    display: block;
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 24rpx;
+    padding-bottom: 16rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+    padding: 16rpx 0;
+  }
+
+  .form-label {
+    width: 160rpx;
+    flex-shrink: 0;
+    font-size: 28rpx;
+    color: #666;
+  }
+
+  .form-input,
+  .form-picker {
+    flex: 1;
+    width: 0;
+    min-width: 0;
+    box-sizing: border-box;
+  }
+
+  .form-input,
+  .picker-value {
+    width: 100%;
+    min-height: 72rpx;
+    padding: 16rpx;
+    border: 1rpx solid #e8e8e8;
+    border-radius: 8rpx;
+    background: #fff;
+    font-size: 28rpx;
+    color: #333;
+    box-sizing: border-box;
+  }
+
+  .picker-value.placeholder {
+    color: #c0c4cc;
+  }
+
+  .form-tip {
+    padding: 8rpx 0 16rpx 160rpx;
+    font-size: 24rpx;
+    color: #909399;
+    line-height: 1.4;
+  }
+
+  .summary-row {
+    display: flex;
+    justify-content: space-between;
+    padding: 12rpx 0;
+  }
+
+  .summary-label {
+    font-size: 26rpx;
+    color: #999;
+  }
+
+  .summary-value {
+    font-size: 26rpx;
+    color: #333;
+  }
+
+  .summary-value.muted {
+    color: #52c41a;
+  }
+
+  .btn-section {
+    padding: 8rpx 0 24rpx;
+  }
+
+  .btn {
+    font-size: 30rpx;
+    border-radius: 12rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .btn-primary {
+    background: #1890ff;
+    color: #fff;
+  }
+
+  .btn-primary[disabled] {
+    background: #b0d4f5;
+    color: #fff;
+  }
+
+  .btn-default {
+    background: #fff;
+    color: #666;
+    border: 1rpx solid #d9d9d9;
+  }
+</style>
diff --git a/pda/pages/warehouse/inbound/index.vue b/pda/pages/warehouse/inbound/index.vue
index f6122ab..87f87bb 100644
--- a/pda/pages/warehouse/inbound/index.vue
+++ b/pda/pages/warehouse/inbound/index.vue
@@ -15,14 +15,14 @@
         <uni-icons type="right" size="18" color="#ccc"></uni-icons>
       </view>
 
-      <view class="menu-card" @click="navigateTo('/pages/warehouse/inbound/supply')">
+      <view class="menu-card" @click="navigateTo('/pages/warehouse/inbound/emptyTray')">
         <view class="card-left">
-          <view class="card-icon green">
-            <uni-icons type="plus" size="24" color="#fff"></uni-icons>
+          <view class="card-icon cyan">
+            <uni-icons type="paperplane" size="24" color="#fff"></uni-icons>
           </view>
           <view class="card-info">
-            <text class="card-title">补料入库</text>
-            <text class="card-desc">产线补料申请入库操作</text>
+            <text class="card-title">空托盘入库</text>
+            <text class="card-desc">选择仓库、扫描托盘并选择入库点位</text>
           </view>
         </view>
         <uni-icons type="right" size="18" color="#ccc"></uni-icons>
@@ -118,10 +118,6 @@
         return item.documentDat || item.createDate || item.createDat || '-'
       },
       handleTask(item) {
-        if (item.type === 'supply') {
-          this.$tab.navigateTo('/pages/warehouse/inbound/supply?taskNo=' + (item.taskNo || ''))
-          return
-        }
         var params = []
         if (item.stockinId) params.push('stockinId=' + encodeURIComponent(item.stockinId))
         if (item.warehouseId) params.push('warehouseId=' + encodeURIComponent(item.warehouseId))
@@ -178,8 +174,8 @@
     background: linear-gradient(135deg, #1890ff, #40a9ff);
   }
 
-  .card-icon.green {
-    background: linear-gradient(135deg, #52c41a, #73d13d);
+  .card-icon.cyan {
+    background: linear-gradient(135deg, #13c2c2, #36cfc9);
   }
 
   .card-info {
diff --git a/pda/pages/warehouse/inbound/supply.vue b/pda/pages/warehouse/inbound/supply.vue
deleted file mode 100644
index ad51add..0000000
--- a/pda/pages/warehouse/inbound/supply.vue
+++ /dev/null
@@ -1,318 +0,0 @@
-<template>
-  <view class="page-container">
-    <!-- 任务信息 -->
-    <view class="task-info" v-if="taskNo">
-      <text class="task-label">任务编号</text>
-      <text class="task-value">{{ taskNo }}</text>
-    </view>
-
-    <!-- 扫码区域 -->
-    <view class="scan-section">
-      <view class="scan-header">
-        <text class="scan-title">扫描物料条码</text>
-        <view class="scan-btn" @click="startScan">
-          <uni-icons type="scan" size="18" color="#52c41a"></uni-icons>
-          <text class="scan-btn-text green">扫码</text>
-        </view>
-      </view>
-      <view class="input-wrap">
-        <input class="scan-input" v-model="barcode" placeholder="请输入或扫描物料条码"
-          @confirm="handleBarcode" focus />
-      </view>
-    </view>
-
-    <!-- 补料信息 -->
-    <view class="form-section">
-      <text class="form-title">补料信息</text>
-      <view class="form-item">
-        <text class="form-label">产线</text>
-        <input class="form-input" v-model="form.lineCode" placeholder="请输入产线编码" />
-      </view>
-      <view class="form-item">
-        <text class="form-label">工位</text>
-        <input class="form-input" v-model="form.stationCode" placeholder="请输入工位编码" />
-      </view>
-      <view class="form-item">
-        <text class="form-label">补料数量</text>
-        <input class="form-input" v-model="form.quantity" type="number" placeholder="请输入补料数量" />
-      </view>
-      <view class="form-item">
-        <text class="form-label">补料原因</text>
-        <input class="form-input" v-model="form.reason" placeholder="请输入补料原因" />
-      </view>
-    </view>
-
-    <!-- 物料信息 -->
-    <view class="form-section" v-if="materialInfo">
-      <text class="form-title">物料信息</text>
-      <view class="info-row">
-        <text class="info-label">物料编码</text>
-        <text class="info-value">{{ materialInfo.materialCode }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">物料名称</text>
-        <text class="info-value">{{ materialInfo.materialName }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">规格型号</text>
-        <text class="info-value">{{ materialInfo.spec }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">当前库存</text>
-        <text class="info-value">{{ materialInfo.stock }}</text>
-      </view>
-    </view>
-
-    <!-- 操作按钮 -->
-    <view class="btn-section">
-      <button class="btn btn-success" @click="submitSupply">确认补料入库</button>
-      <button class="btn btn-default" @click="resetForm">重置</button>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { getMaterialByBarcode, submitSupplyInbound } from '@/api/warehouse/inbound'
-
-  export default {
-    data() {
-      return {
-        taskNo: '',
-        barcode: '',
-        materialInfo: null,
-        form: {
-          lineCode: '',
-          stationCode: '',
-          quantity: '',
-          reason: ''
-        }
-      }
-    },
-    onLoad(options) {
-      if (options.taskNo) {
-        this.taskNo = options.taskNo
-      }
-    },
-    methods: {
-      startScan() {
-        var that = this
-        uni.scanCode({
-          onlyFromCamera: false,
-          scanType: ['barCode', 'qrCode'],
-          success: function(res) {
-            that.barcode = res.result
-            that.handleBarcode()
-          }
-        })
-      },
-      handleBarcode() {
-        if (!this.barcode) {
-          this.$modal.msg('请输入物料条码')
-          return
-        }
-        var that = this
-        getMaterialByBarcode(this.barcode).then(function(res) {
-          that.materialInfo = res.data
-          that.$modal.msgSuccess('物料信息获取成功')
-        }).catch(function() {
-          that.materialInfo = null
-        })
-      },
-      submitSupply() {
-        if (!this.barcode) {
-          this.$modal.msg('请输入物料条码')
-          return
-        }
-        if (!this.form.lineCode) {
-          this.$modal.msg('请输入产线编码')
-          return
-        }
-        if (!this.form.quantity) {
-          this.$modal.msg('请输入补料数量')
-          return
-        }
-        var data = {
-          taskNo: this.taskNo,
-          barcode: this.barcode,
-          lineCode: this.form.lineCode,
-          stationCode: this.form.stationCode,
-          quantity: this.form.quantity,
-          reason: this.form.reason
-        }
-        var that = this
-        submitSupplyInbound(data).then(function() {
-          that.$modal.msgSuccess('补料入库成功')
-          that.resetForm()
-        })
-      },
-      resetForm() {
-        this.barcode = ''
-        this.materialInfo = null
-        this.form = {
-          lineCode: '',
-          stationCode: '',
-          quantity: '',
-          reason: ''
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #f5f7fa;
-    min-height: 100%;
-  }
-
-  .page-container {
-    padding: 24rpx;
-  }
-
-  .task-info {
-    background: #f6ffed;
-    border-radius: 12rpx;
-    padding: 20rpx 24rpx;
-    margin-bottom: 24rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .task-label {
-    font-size: 26rpx;
-    color: #52c41a;
-  }
-
-  .task-value {
-    font-size: 26rpx;
-    color: #333;
-    font-weight: 500;
-  }
-
-  .scan-section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 28rpx;
-    margin-bottom: 24rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-  }
-
-  .scan-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20rpx;
-  }
-
-  .scan-title {
-    font-size: 30rpx;
-    font-weight: 500;
-    color: #333;
-  }
-
-  .scan-btn {
-    display: flex;
-    align-items: center;
-    padding: 8rpx 20rpx;
-    border: 1rpx solid #52c41a;
-    border-radius: 8rpx;
-  }
-
-  .scan-btn-text {
-    font-size: 24rpx;
-    color: #1890ff;
-    margin-left: 8rpx;
-  }
-
-  .scan-btn-text.green {
-    color: #52c41a;
-  }
-
-  .input-wrap {
-    border: 1rpx solid #e8e8e8;
-    border-radius: 8rpx;
-    padding: 4rpx;
-  }
-
-  .scan-input {
-    font-size: 28rpx;
-    padding: 16rpx;
-  }
-
-  .form-section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 28rpx;
-    margin-bottom: 24rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-  }
-
-  .form-title {
-    font-size: 30rpx;
-    font-weight: 500;
-    color: #333;
-    margin-bottom: 24rpx;
-    padding-bottom: 16rpx;
-    border-bottom: 1rpx solid #f0f0f0;
-  }
-
-  .form-item {
-    display: flex;
-    align-items: center;
-    padding: 16rpx 0;
-  }
-
-  .form-label {
-    font-size: 28rpx;
-    color: #666;
-    width: 160rpx;
-    flex-shrink: 0;
-  }
-
-  .form-input {
-    flex: 1;
-    font-size: 28rpx;
-    border: 1rpx solid #e8e8e8;
-    border-radius: 8rpx;
-    padding: 16rpx;
-  }
-
-  .info-row {
-    display: flex;
-    justify-content: space-between;
-    padding: 16rpx 0;
-    border-bottom: 1rpx solid #f5f5f5;
-  }
-
-  .info-label {
-    font-size: 28rpx;
-    color: #999;
-  }
-
-  .info-value {
-    font-size: 28rpx;
-    color: #333;
-  }
-
-  .btn-section {
-    padding: 24rpx 0;
-  }
-
-  .btn {
-    font-size: 30rpx;
-    border-radius: 12rpx;
-    margin-bottom: 20rpx;
-  }
-
-  .btn-success {
-    background: #52c41a;
-    color: #fff;
-  }
-
-  .btn-default {
-    background: #fff;
-    color: #666;
-    border: 1rpx solid #d9d9d9;
-  }
-</style>
diff --git a/pda/pages/warehouse/inventory/index.vue b/pda/pages/warehouse/inventory/index.vue
index 1bf3427..7fc5440 100644
--- a/pda/pages/warehouse/inventory/index.vue
+++ b/pda/pages/warehouse/inventory/index.vue
@@ -1,46 +1,39 @@
 <template>
   <view class="page-container">
-    <view class="module-header">
-      <uni-icons type="search" size="22" color="#52c41a"></uni-icons>
-      <text class="header-title">盘点管理</text>
-    </view>
-
-    <view class="feature-list">
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="list" size="20" color="#1890ff"></uni-icons>
-          <text class="feature-name">盘点任务列表</text>
+    <view class="menu-section">
+      <view class="menu-card" @click="scanInventory">
+        <view class="card-left">
+          <view class="card-icon green">
+            <uni-icons type="scan" size="24" color="#fff"></uni-icons>
+          </view>
+          <view class="card-info">
+            <text class="card-title">扫码盘点</text>
+            <text class="card-desc">扫描托盘码进行库存盘点</text>
+          </view>
         </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
+        <uni-icons type="right" size="18" color="#ccc"></uni-icons>
       </view>
 
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="scan" size="20" color="#fa8c16"></uni-icons>
-          <text class="feature-name">扫码盘点</text>
+      <view class="menu-card reserve-card" @click="showReservedTip">
+        <view class="card-left">
+          <view class="card-icon gray">
+            <uni-icons type="compose" size="24" color="#fff"></uni-icons>
+          </view>
+          <view class="card-info">
+            <text class="card-title">预留界面</text>
+            <text class="card-desc">后续盘点流程启用时接入</text>
+          </view>
         </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
-      </view>
-
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="compose" size="20" color="#52c41a"></uni-icons>
-          <text class="feature-name">盘点差异记录</text>
-        </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
-      </view>
-
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="paperplane" size="20" color="#722ed1"></uni-icons>
-          <text class="feature-name">盘点报告</text>
-        </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
+        <uni-icons type="right" size="18" color="#ddd"></uni-icons>
       </view>
     </view>
 
-    <view class="empty-tip">
-      <text class="tip-text">盘点管理模块正在开发中，敬请期待</text>
+    <view v-if="scanCode" class="result-card">
+      <view class="result-header">
+        <text class="result-title">最近扫描</text>
+        <text class="result-code">{{ scanCode }}</text>
+      </view>
+      <text class="result-desc">扫码盘点明细待业务流程确认后接入。</text>
     </view>
   </view>
 </template>
@@ -48,7 +41,22 @@
 <script>
   export default {
     data() {
-      return {}
+      return {
+        scanCode: ''
+      }
+    },
+    methods: {
+      scanInventory() {
+        uni.scanCode({
+          success: res => {
+            this.scanCode = res.result || ''
+            this.$modal.showToast('扫码成功')
+          }
+        })
+      },
+      showReservedTip() {
+        this.$modal.showToast('功能预留')
+      }
     }
   }
 </script>
@@ -63,57 +71,93 @@
     padding: 24rpx;
   }
 
-  .module-header {
-    display: flex;
-    align-items: center;
-    padding: 24rpx 0;
-    margin-bottom: 20rpx;
+  .menu-section {
+    margin-bottom: 32rpx;
   }
 
-  .header-title {
-    font-size: 32rpx;
-    font-weight: 500;
-    color: #333;
-    margin-left: 12rpx;
-  }
-
-  .feature-list {
+  .menu-card {
     background: #fff;
     border-radius: 16rpx;
-    overflow: hidden;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-  }
-
-  .feature-card {
+    padding: 32rpx 28rpx;
+    margin-bottom: 20rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 32rpx 28rpx;
-    border-bottom: 1rpx solid #f5f5f5;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
   }
 
-  .feature-card:last-child {
-    border-bottom: none;
+  .reserve-card {
+    opacity: 0.88;
   }
 
-  .feature-left {
+  .card-left {
     display: flex;
     align-items: center;
+    flex: 1;
   }
 
-  .feature-name {
-    font-size: 28rpx;
+  .card-icon {
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 16rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 24rpx;
+  }
+
+  .card-icon.green {
+    background: linear-gradient(135deg, #52c41a, #73d13d);
+  }
+
+  .card-icon.gray {
+    background: linear-gradient(135deg, #8c8c8c, #bfbfbf);
+  }
+
+  .card-info {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .card-title {
+    font-size: 30rpx;
+    font-weight: 500;
     color: #333;
-    margin-left: 16rpx;
+    margin-bottom: 8rpx;
   }
 
-  .empty-tip {
-    padding: 60rpx 0;
-    text-align: center;
+  .card-desc {
+    font-size: 24rpx;
+    color: #999;
   }
 
-  .tip-text {
+  .result-card {
+    background: #fff;
+    border-radius: 16rpx;
+    padding: 28rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+  }
+
+  .result-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 14rpx;
+  }
+
+  .result-title {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333;
+  }
+
+  .result-code {
     font-size: 26rpx;
-    color: #ccc;
+    color: #52c41a;
+  }
+
+  .result-desc {
+    font-size: 24rpx;
+    color: #999;
   }
 </style>
diff --git a/pda/pages/warehouse/outbound/confirm.vue b/pda/pages/warehouse/outbound/confirm.vue
index a02d692..6b4449a 100644
--- a/pda/pages/warehouse/outbound/confirm.vue
+++ b/pda/pages/warehouse/outbound/confirm.vue
@@ -9,14 +9,14 @@
     <!-- 扫码区域 -->
     <view class="scan-section">
       <view class="scan-header">
-        <text class="scan-title">扫描出库物料条码</text>
+        <text class="scan-title">扫描托盘条码</text>
         <view class="scan-btn" @click="startScan">
-          <uni-icons type="scan" size="18" color="#fa8c16"></uni-icons>
-          <text class="scan-btn-text orange">扫码</text>
+          <uni-icons type="scan" size="18" color="#1890ff"></uni-icons>
+          <text class="scan-btn-text">扫码</text>
         </view>
       </view>
       <view class="input-wrap">
-        <input class="scan-input" v-model="barcode" placeholder="请输入或扫描物料条码"
+        <input class="scan-input" v-model="barcode" placeholder="请输入或扫描托盘条码"
           @confirm="handleBarcode" focus />
       </view>
     </view>
@@ -24,18 +24,6 @@
     <!-- 出库信息 -->
     <view class="form-section" v-if="outboundInfo">
       <text class="form-title">出库信息</text>
-      <view class="info-row">
-        <text class="info-label">物料编码</text>
-        <text class="info-value">{{ outboundInfo.materialCode }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">物料名称</text>
-        <text class="info-value">{{ outboundInfo.materialName }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">规格型号</text>
-        <text class="info-value">{{ outboundInfo.spec }}</text>
-      </view>
       <view class="info-row">
         <text class="info-label">托盘号</text>
         <text class="info-value">{{ outboundInfo.trayCode }}</text>
@@ -54,12 +42,34 @@
       </view>
     </view>
 
+    <!-- 托盘物料信息 -->
+    <view class="form-section" v-if="outboundInfo">
+      <text class="form-title">托盘物料信息</text>
+      <view class="material-card" v-for="(item, index) in outboundInfo.materials" :key="item.jobDetailId || index">
+        <view class="material-header">
+          <text class="material-code">{{ item.materialCode }}</text>
+          <text class="material-qty">出库 {{ item.quantity }}</text>
+        </view>
+        <view class="material-name">{{ item.materialName }}</view>
+        <view class="material-meta">
+          <text>批次：{{ item.lotNo || '-' }}</text>
+          <text>库存：{{ item.stockQuantity || 0 }}</text>
+          <text>剩余：{{ item.residualQuantity || 0 }}</text>
+        </view>
+        <view class="material-confirm">
+          <text class="material-confirm-label">实际出库</text>
+          <input class="material-input" v-model="item.actualQuantity" type="number"
+            :placeholder="'计划 ' + item.quantity" />
+        </view>
+      </view>
+    </view>
+
     <!-- 确认信息 -->
     <view class="form-section" v-if="outboundInfo">
       <text class="form-title">确认信息</text>
       <view class="form-item">
-        <text class="form-label">实际数量</text>
-        <input class="form-input" v-model="confirmQty" type="number" :placeholder="'出库数量: ' + outboundInfo.quantity" />
+        <text class="form-label">实际总数</text>
+        <text class="info-value highlight">{{ calculateConfirmQty() }}</text>
       </view>
       <view class="form-item">
         <text class="form-label">备注</text>
@@ -69,7 +79,7 @@
 
     <!-- 操作按钮 -->
     <view class="btn-section" v-if="outboundInfo">
-      <button class="btn btn-orange" @click="confirmOutbound">确认出库</button>
+      <button class="btn btn-primary" @click="confirmOutbound">确认出库</button>
       <button class="btn btn-default" @click="resetForm">重置</button>
     </view>
   </view>
@@ -109,28 +119,50 @@
       },
       handleBarcode() {
         if (!this.barcode) {
-          this.$modal.msg('请输入物料条码')
+          this.$modal.msg('请输入托盘条码')
           return
         }
         var that = this
         var params = { taskNo: this.taskNo, barcode: this.barcode }
         getOutboundDetail(params).then(function(res) {
-          that.outboundInfo = res.data
-          that.confirmQty = String(res.data.quantity)
+          var data = res.data || {}
+          var materials = (data.materials || []).map(function(item) {
+            return Object.assign({}, item, {
+              actualQuantity: String(item.quantity || '')
+            })
+          })
+          that.outboundInfo = Object.assign({}, data, { materials: materials })
+          that.confirmQty = that.calculateConfirmQty()
           that.$modal.msgSuccess('出库信息获取成功')
         }).catch(function() {
           that.outboundInfo = null
         })
       },
       confirmOutbound() {
-        if (!this.confirmQty) {
-          this.$modal.msg('请输入实际数量')
+        if (!this.outboundInfo || !this.outboundInfo.materials || this.outboundInfo.materials.length === 0) {
+          this.$modal.msg('未获取到出库物料明细')
           return
         }
+        var missing = this.outboundInfo.materials.find(function(item) {
+          return !item.actualQuantity || Number(item.actualQuantity) <= 0
+        })
+        if (missing) {
+          this.$modal.msg('请输入每个物料的实际出库数量')
+          return
+        }
+        this.confirmQty = this.calculateConfirmQty()
         var data = {
           taskNo: this.taskNo,
           barcode: this.barcode,
+          trayCode: this.barcode,
           quantity: this.confirmQty,
+          materials: this.outboundInfo.materials.map(function(item) {
+            return {
+              jobDetailId: item.jobDetailId,
+              stockDetailId: item.stockDetailId,
+              quantity: item.actualQuantity
+            }
+          }),
           remark: this.form.remark
         }
         var that = this
@@ -146,6 +178,15 @@
         this.form = {
           remark: ''
         }
+      },
+      calculateConfirmQty() {
+        if (!this.outboundInfo || !this.outboundInfo.materials) {
+          return ''
+        }
+        var total = this.outboundInfo.materials.reduce(function(sum, item) {
+          return sum + Number(item.actualQuantity || 0)
+        }, 0)
+        return String(total)
       }
     }
   }
@@ -159,10 +200,11 @@
 
   .page-container {
     padding: 24rpx;
+    padding-bottom: 60rpx;
   }
 
   .task-info {
-    background: #fff7e6;
+    background: #e6f7ff;
     border-radius: 12rpx;
     padding: 20rpx 24rpx;
     margin-bottom: 24rpx;
@@ -173,7 +215,7 @@
 
   .task-label {
     font-size: 26rpx;
-    color: #fa8c16;
+    color: #1890ff;
   }
 
   .task-value {
@@ -207,19 +249,16 @@
     display: flex;
     align-items: center;
     padding: 8rpx 20rpx;
-    border: 1rpx solid #fa8c16;
+    border: 1rpx solid #1890ff;
     border-radius: 8rpx;
   }
 
   .scan-btn-text {
     font-size: 24rpx;
+    color: #1890ff;
     margin-left: 8rpx;
   }
 
-  .scan-btn-text.orange {
-    color: #fa8c16;
-  }
-
   .input-wrap {
     border: 1rpx solid #e8e8e8;
     border-radius: 8rpx;
@@ -227,8 +266,14 @@
   }
 
   .scan-input {
+    width: 100%;
     font-size: 28rpx;
     padding: 16rpx;
+    word-break: break-all;
+    min-width: 0;
+    height: auto;
+    line-height: 1.4;
+    box-sizing: border-box;
   }
 
   .form-section {
@@ -240,6 +285,7 @@
   }
 
   .form-title {
+    display: block;
     font-size: 30rpx;
     font-weight: 500;
     color: #333;
@@ -263,10 +309,16 @@
 
   .form-input {
     flex: 1;
+    width: 0;
+    min-width: 0;
+    box-sizing: border-box;
     font-size: 28rpx;
     border: 1rpx solid #e8e8e8;
     border-radius: 8rpx;
     padding: 16rpx;
+    word-break: break-all;
+    height: auto;
+    line-height: 1.4;
   }
 
   .info-row {
@@ -287,12 +339,79 @@
   }
 
   .info-value.highlight {
-    color: #fa8c16;
+    color: #1890ff;
     font-weight: 500;
   }
 
+  .material-card {
+    padding: 18rpx 0;
+    border-bottom: 1rpx solid #f5f5f5;
+  }
+
+  .material-card:last-child {
+    border-bottom: 0;
+  }
+
+  .material-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10rpx;
+  }
+
+  .material-code {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 500;
+  }
+
+  .material-qty {
+    font-size: 26rpx;
+    color: #1890ff;
+    font-weight: 500;
+  }
+
+  .material-name {
+    font-size: 26rpx;
+    color: #666;
+    margin-bottom: 10rpx;
+  }
+
+  .material-meta {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    font-size: 24rpx;
+    color: #999;
+  }
+
+  .material-confirm {
+    display: flex;
+    align-items: center;
+    margin-top: 16rpx;
+  }
+
+  .material-confirm-label {
+    width: 140rpx;
+    font-size: 26rpx;
+    color: #666;
+  }
+
+  .material-input {
+    flex: 1;
+    width: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    font-size: 26rpx;
+    border: 1rpx solid #e8e8e8;
+    border-radius: 8rpx;
+    padding: 12rpx 16rpx;
+    height: auto;
+    line-height: 1.4;
+  }
+
   .btn-section {
-    padding: 24rpx 0;
+    padding: 8rpx 0 24rpx;
   }
 
   .btn {
@@ -301,8 +420,8 @@
     margin-bottom: 20rpx;
   }
 
-  .btn-orange {
-    background: #fa8c16;
+  .btn-primary {
+    background: #1890ff;
     color: #fff;
   }
 
diff --git a/pda/pages/warehouse/outbound/emptyTray.vue b/pda/pages/warehouse/outbound/emptyTray.vue
new file mode 100644
index 0000000..3762a14
--- /dev/null
+++ b/pda/pages/warehouse/outbound/emptyTray.vue
@@ -0,0 +1,416 @@
+<template>
+  <view class="page-container">
+    <view class="form-section">
+      <text class="form-title">空托盘出库</text>
+
+      <view class="form-item">
+        <text class="form-label">仓库</text>
+        <picker class="form-picker" mode="selector" :range="warehouseOptions" range-key="warehouseName"
+          :value="warehouseIndex" @change="handleWarehouseChange">
+          <view class="picker-value" :class="{ placeholder: !warehouseId }">
+            {{ selectedWarehouseName || '请选择仓库' }}
+          </view>
+        </picker>
+      </view>
+
+      <view class="type-section" v-if="warehouseId">
+        <view class="type-header">
+          <text class="type-title">库内空托盘类型</text>
+          <text class="type-total">合计 {{ totalEmptyTrayCount }}</text>
+        </view>
+        <view class="type-empty" v-if="emptyTrayTypes.length === 0">
+          <text class="empty-text">当前仓库暂无可出库空托盘</text>
+        </view>
+        <view
+          class="type-card"
+          :class="{ active: selectedTrayType && selectedTrayType.barcodePrefix === item.barcodePrefix }"
+          v-for="(item, index) in emptyTrayTypes"
+          :key="item.barcodePrefix || index"
+          @click="selectTrayType(index)"
+        >
+          <view class="type-main">
+            <text class="type-name">{{ item.formatName || '托盘条码' }}</text>
+            <text class="type-prefix">{{ item.barcodePrefix }}</text>
+          </view>
+          <view class="type-count">
+            <text class="type-count-value">{{ item.quantity }}</text>
+            <text class="type-count-unit">个</text>
+          </view>
+        </view>
+      </view>
+
+      <view class="form-item">
+        <text class="form-label">出库数量</text>
+        <input class="form-input" v-model="quantity" type="number" placeholder="请输入出库数量" />
+      </view>
+    </view>
+
+    <view class="summary-section">
+      <view class="summary-row">
+        <text class="summary-label">作业类型</text>
+        <text class="summary-value">空容器出库</text>
+      </view>
+      <view class="summary-row">
+        <text class="summary-label">托盘类型</text>
+        <text class="summary-value">{{ selectedTrayTypeName || '未选择' }}</text>
+      </view>
+      <view class="summary-row">
+        <text class="summary-label">下发方式</text>
+        <text class="summary-value muted">生成后自动下发 WCS</text>
+      </view>
+    </view>
+
+    <view class="btn-section">
+      <button class="btn btn-primary" :disabled="!canSubmit || submitting" @click="submitEmptyTray">
+        {{ submitting ? '提交中...' : '生成空托出库作业' }}
+      </button>
+      <button class="btn btn-default" @click="resetQuantity">重置数量</button>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { getWarehouseOptions } from '@/api/warehouse/inbound'
+  import { getEmptyTrayOutboundTypes, submitEmptyTrayOutbound } from '@/api/warehouse/outbound'
+
+  export default {
+    data() {
+      return {
+        warehouseOptions: [],
+        warehouseIndex: 0,
+        warehouseId: '',
+        warehouseName: '',
+        emptyTrayTypes: [],
+        trayTypeIndex: -1,
+        quantity: '',
+        submitting: false
+      }
+    },
+    computed: {
+      selectedWarehouseName() {
+        if (this.warehouseName) return this.warehouseName
+        var selected = this.warehouseOptions[this.warehouseIndex]
+        return selected && selected.warehouseId === this.warehouseId ? selected.warehouseName : ''
+      },
+      selectedTrayType() {
+        if (this.trayTypeIndex < 0) return null
+        return this.emptyTrayTypes[this.trayTypeIndex] || null
+      },
+      selectedTrayTypeName() {
+        var type = this.selectedTrayType
+        if (!type) return ''
+        return (type.formatName || '托盘条码') + '（' + type.barcodePrefix + '）'
+      },
+      selectedAvailableCount() {
+        var type = this.selectedTrayType
+        return type ? Number(type.quantity || 0) : 0
+      },
+      totalEmptyTrayCount() {
+        return this.emptyTrayTypes.reduce(function(total, item) {
+          return total + (Number(item.quantity) || 0)
+        }, 0)
+      },
+      canSubmit() {
+        var qty = Number(this.quantity)
+        return !!this.warehouseId && !!this.selectedTrayType && qty > 0 && qty <= this.selectedAvailableCount
+      }
+    },
+    onLoad() {
+      this.loadWarehouseOptions()
+    },
+    methods: {
+      loadWarehouseOptions() {
+        var that = this
+        getWarehouseOptions().then(function(res) {
+          that.warehouseOptions = res.data || res.rows || []
+        }).catch(function() {
+          that.warehouseOptions = []
+        })
+      },
+      handleWarehouseChange(e) {
+        var index = Number(e.detail.value)
+        var selected = this.warehouseOptions[index]
+        if (!selected) return
+        this.warehouseIndex = index
+        this.warehouseId = selected.warehouseId
+        this.warehouseName = selected.warehouseName
+        this.quantity = ''
+        this.resetTrayType()
+        this.loadEmptyTrayCount()
+      },
+      loadEmptyTrayCount() {
+        var that = this
+        if (!this.warehouseId) {
+          this.emptyTrayTypes = []
+          this.resetTrayType()
+          return
+        }
+        getEmptyTrayOutboundTypes(this.warehouseId).then(function(res) {
+          var list = Array.isArray(res.data) ? res.data : []
+          that.emptyTrayTypes = list.map(function(item) {
+            return {
+              formatId: item.formatId,
+              formatName: item.formatName,
+              barcodePrefix: item.barcodePrefix,
+              quantity: Number(item.quantity || 0)
+            }
+          })
+          that.resetTrayType()
+          if (that.emptyTrayTypes.length === 1) {
+            that.selectTrayType(0)
+          }
+        }).catch(function() {
+          that.emptyTrayTypes = []
+          that.resetTrayType()
+        })
+      },
+      selectTrayType(index) {
+        var selected = this.emptyTrayTypes[index]
+        if (!selected) return
+        this.trayTypeIndex = index
+        this.quantity = ''
+      },
+      resetTrayType() {
+        this.trayTypeIndex = -1
+      },
+      submitEmptyTray() {
+        var qty = Number(this.quantity)
+        if (!this.warehouseId) {
+          this.$modal.msg('请选择仓库')
+          return
+        }
+        if (!this.selectedTrayType) {
+          this.$modal.msg('请选择空托盘类型')
+          return
+        }
+        if (!qty || qty <= 0) {
+          this.$modal.msg('请输入有效的出库数量')
+          return
+        }
+        if (qty > this.selectedAvailableCount) {
+          this.$modal.msg('出库数量不能大于当前类型空托盘数量')
+          return
+        }
+        var that = this
+        var data = {
+          warehouseId: this.warehouseId,
+          barcodePrefix: this.selectedTrayType.barcodePrefix,
+          quantity: qty
+        }
+        this.$modal.confirm('是否确认生成空托出库作业并下发 WCS？').then(function() {
+          that.submitting = true
+          return submitEmptyTrayOutbound(data)
+        }).then(function(res) {
+          that.$modal.msgSuccess(res.msg || '空托出库作业生成成功')
+          that.quantity = ''
+          that.loadEmptyTrayCount()
+        }).catch(function() {}).finally(function() {
+          that.submitting = false
+        })
+      },
+      resetQuantity() {
+        this.quantity = ''
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f7fa;
+    min-height: 100%;
+  }
+
+  .page-container {
+    padding: 24rpx;
+    padding-bottom: 60rpx;
+  }
+
+  .form-section,
+  .summary-section {
+    background: #fff;
+    border-radius: 16rpx;
+    padding: 28rpx;
+    margin-bottom: 24rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+  }
+
+  .form-title {
+    display: block;
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 24rpx;
+    padding-bottom: 16rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+    padding: 16rpx 0;
+  }
+
+  .form-label {
+    width: 160rpx;
+    flex-shrink: 0;
+    font-size: 28rpx;
+    color: #666;
+  }
+
+  .form-input,
+  .form-picker {
+    flex: 1;
+    width: 0;
+    min-width: 0;
+    box-sizing: border-box;
+  }
+
+  .form-input,
+  .picker-value {
+    width: 100%;
+    min-height: 72rpx;
+    padding: 16rpx;
+    border: 1rpx solid #e8e8e8;
+    border-radius: 8rpx;
+    background: #fff;
+    font-size: 28rpx;
+    color: #333;
+    box-sizing: border-box;
+  }
+
+  .picker-value.placeholder {
+    color: #c0c4cc;
+  }
+
+  .type-section {
+    margin: 18rpx 0;
+  }
+
+  .type-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 14rpx;
+  }
+
+  .type-title {
+    font-size: 26rpx;
+    color: #666;
+  }
+
+  .type-total {
+    font-size: 26rpx;
+    color: #1890ff;
+  }
+
+  .type-empty {
+    padding: 30rpx 0;
+    border: 1rpx dashed #d9d9d9;
+    border-radius: 12rpx;
+    display: flex;
+    justify-content: center;
+  }
+
+  .empty-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+
+  .type-card {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20rpx 22rpx;
+    margin-bottom: 16rpx;
+    border: 1rpx solid #e8e8e8;
+    border-radius: 12rpx;
+    background: #fff;
+  }
+
+  .type-card.active {
+    border-color: #1890ff;
+    background: #e6f7ff;
+  }
+
+  .type-main {
+    flex: 1;
+    min-width: 0;
+  }
+
+  .type-name {
+    display: block;
+    font-size: 28rpx;
+    color: #333;
+    margin-bottom: 8rpx;
+  }
+
+  .type-prefix {
+    font-size: 24rpx;
+    color: #1890ff;
+  }
+
+  .type-count {
+    display: flex;
+    align-items: baseline;
+    margin-left: 20rpx;
+  }
+
+  .type-count-value {
+    font-size: 40rpx;
+    font-weight: 600;
+    color: #096dd9;
+  }
+
+  .type-count-unit {
+    margin-left: 4rpx;
+    font-size: 24rpx;
+    color: #666;
+  }
+
+  .summary-row {
+    display: flex;
+    justify-content: space-between;
+    padding: 12rpx 0;
+  }
+
+  .summary-label {
+    font-size: 26rpx;
+    color: #999;
+  }
+
+  .summary-value {
+    font-size: 26rpx;
+    color: #333;
+  }
+
+  .summary-value.muted {
+    color: #52c41a;
+  }
+
+  .btn-section {
+    padding: 8rpx 0 24rpx;
+  }
+
+  .btn {
+    font-size: 30rpx;
+    border-radius: 12rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .btn-primary {
+    background: #1890ff;
+    color: #fff;
+  }
+
+  .btn-primary[disabled] {
+    background: #b0d4f5;
+    color: #fff;
+  }
+
+  .btn-default {
+    background: #fff;
+    color: #666;
+    border: 1rpx solid #d9d9d9;
+  }
+</style>
diff --git a/pda/pages/warehouse/outbound/exception.vue b/pda/pages/warehouse/outbound/exception.vue
deleted file mode 100644
index 0d35679..0000000
--- a/pda/pages/warehouse/outbound/exception.vue
+++ /dev/null
@@ -1,411 +0,0 @@
-<template>
-  <view class="page-container">
-    <!-- 任务信息 -->
-    <view class="task-info" v-if="taskNo">
-      <text class="task-label">异常任务编号</text>
-      <text class="task-value">{{ taskNo }}</text>
-    </view>
-
-    <!-- 扫码区域 -->
-    <view class="scan-section">
-      <view class="scan-header">
-        <text class="scan-title">扫描异常物料条码</text>
-        <view class="scan-btn" @click="startScan">
-          <uni-icons type="scan" size="18" color="#f5222d"></uni-icons>
-          <text class="scan-btn-text red">扫码</text>
-        </view>
-      </view>
-      <view class="input-wrap">
-        <input class="scan-input" v-model="barcode" placeholder="请输入或扫描物料条码"
-          @confirm="handleBarcode" focus />
-      </view>
-    </view>
-
-    <!-- 异常信息填写 -->
-    <view class="form-section">
-      <text class="form-title">异常信息</text>
-      <view class="form-item">
-        <text class="form-label">异常类型</text>
-        <picker mode="selector" :range="exceptionTypes" range-key="label" @change="onTypeChange">
-          <view class="picker-value">{{ selectedType ? selectedType.label : '请选择异常类型' }}</view>
-        </picker>
-        <uni-icons type="bottom" size="16" color="#ccc"></uni-icons>
-      </view>
-      <view class="form-item">
-        <text class="form-label">处理方式</text>
-        <picker mode="selector" :range="handleMethods" range-key="label" @change="onMethodChange">
-          <view class="picker-value">{{ selectedMethod ? selectedMethod.label : '请选择处理方式' }}</view>
-        </picker>
-        <uni-icons type="bottom" size="16" color="#ccc"></uni-icons>
-      </view>
-      <view class="form-item">
-        <text class="form-label">异常描述</text>
-        <input class="form-input" v-model="form.description" placeholder="请描述异常情况" />
-      </view>
-      <view class="form-item column">
-        <text class="form-label">拍照留证</text>
-        <view class="photo-list">
-          <view class="photo-item" v-for="(photo, index) in photos" :key="index"
-            @click="previewPhoto(index)">
-            <image :src="photo" mode="aspectFill" class="photo-img"></image>
-          </view>
-          <view class="photo-add" @click="takePhoto" v-if="photos.length < 3">
-            <uni-icons type="plusempty" size="28" color="#ccc"></uni-icons>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 出库信息（扫码后显示） -->
-    <view class="form-section" v-if="outboundInfo">
-      <text class="form-title">出库任务信息</text>
-      <view class="info-row">
-        <text class="info-label">物料编码</text>
-        <text class="info-value">{{ outboundInfo.materialCode }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">物料名称</text>
-        <text class="info-value">{{ outboundInfo.materialName }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">出库数量</text>
-        <text class="info-value">{{ outboundInfo.quantity }}</text>
-      </view>
-      <view class="info-row">
-        <text class="info-label">出库口</text>
-        <text class="info-value">{{ outboundInfo.portName }}</text>
-      </view>
-    </view>
-
-    <!-- 操作按钮 -->
-    <view class="btn-section">
-      <button class="btn btn-danger" @click="submitException">提交异常确认</button>
-      <button class="btn btn-default" @click="resetForm">重置</button>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { getOutboundDetail, submitOutboundException } from '@/api/warehouse/outbound'
-
-  export default {
-    data() {
-      return {
-        taskNo: '',
-        barcode: '',
-        outboundInfo: null,
-        photos: [],
-        exceptionTypes: [
-          { value: 'damage', label: '物料损坏' },
-          { value: 'missing', label: '物料缺失' },
-          { value: 'wrong', label: '物料错误' },
-          { value: 'qty_mismatch', label: '数量不符' },
-          { value: 'other', label: '其他异常' }
-        ],
-        handleMethods: [
-          { value: 'return', label: '退回入库' },
-          { value: 'replace', label: '更换物料' },
-          { value: 'skip', label: '跳过本次' },
-          { value: 'manual', label: '人工处理' }
-        ],
-        selectedType: null,
-        selectedMethod: null,
-        form: {
-          description: ''
-        }
-      }
-    },
-    onLoad(options) {
-      if (options.taskNo) {
-        this.taskNo = options.taskNo
-      }
-    },
-    methods: {
-      startScan() {
-        var that = this
-        uni.scanCode({
-          onlyFromCamera: false,
-          scanType: ['barCode', 'qrCode'],
-          success: function(res) {
-            that.barcode = res.result
-            that.handleBarcode()
-          }
-        })
-      },
-      handleBarcode() {
-        if (!this.barcode) {
-          this.$modal.msg('请输入物料条码')
-          return
-        }
-        var that = this
-        var params = { taskNo: this.taskNo, barcode: this.barcode }
-        getOutboundDetail(params).then(function(res) {
-          that.outboundInfo = res.data
-          that.$modal.msgSuccess('出库信息获取成功')
-        }).catch(function() {
-          that.outboundInfo = null
-        })
-      },
-      onTypeChange(e) {
-        this.selectedType = this.exceptionTypes[e.detail.value]
-      },
-      onMethodChange(e) {
-        this.selectedMethod = this.handleMethods[e.detail.value]
-      },
-      takePhoto() {
-        var that = this
-        uni.chooseImage({
-          count: 1,
-          sourceType: ['camera', 'album'],
-          success: function(res) {
-            that.photos = that.photos.concat(res.tempFilePaths)
-          }
-        })
-      },
-      previewPhoto(index) {
-        uni.previewImage({
-          current: this.photos[index],
-          urls: this.photos
-        })
-      },
-      submitException() {
-        if (!this.barcode) {
-          this.$modal.msg('请输入物料条码')
-          return
-        }
-        if (!this.selectedType) {
-          this.$modal.msg('请选择异常类型')
-          return
-        }
-        if (!this.selectedMethod) {
-          this.$modal.msg('请选择处理方式')
-          return
-        }
-        var data = {
-          taskNo: this.taskNo,
-          barcode: this.barcode,
-          exceptionType: this.selectedType.value,
-          handleMethod: this.selectedMethod.value,
-          description: this.form.description
-        }
-        var that = this
-        submitOutboundException(data).then(function() {
-          that.$modal.msgSuccess('异常确认提交成功')
-          that.resetForm()
-        })
-      },
-      resetForm() {
-        this.barcode = ''
-        this.outboundInfo = null
-        this.photos = []
-        this.selectedType = null
-        this.selectedMethod = null
-        this.form = {
-          description: ''
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #f5f7fa;
-    min-height: 100%;
-  }
-
-  .page-container {
-    padding: 24rpx;
-  }
-
-  .task-info {
-    background: #fff1f0;
-    border-radius: 12rpx;
-    padding: 20rpx 24rpx;
-    margin-bottom: 24rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .task-label {
-    font-size: 26rpx;
-    color: #f5222d;
-  }
-
-  .task-value {
-    font-size: 26rpx;
-    color: #333;
-    font-weight: 500;
-  }
-
-  .scan-section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 28rpx;
-    margin-bottom: 24rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-  }
-
-  .scan-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20rpx;
-  }
-
-  .scan-title {
-    font-size: 30rpx;
-    font-weight: 500;
-    color: #333;
-  }
-
-  .scan-btn {
-    display: flex;
-    align-items: center;
-    padding: 8rpx 20rpx;
-    border: 1rpx solid #f5222d;
-    border-radius: 8rpx;
-  }
-
-  .scan-btn-text {
-    font-size: 24rpx;
-    margin-left: 8rpx;
-  }
-
-  .scan-btn-text.red {
-    color: #f5222d;
-  }
-
-  .input-wrap {
-    border: 1rpx solid #e8e8e8;
-    border-radius: 8rpx;
-    padding: 4rpx;
-  }
-
-  .scan-input {
-    font-size: 28rpx;
-    padding: 16rpx;
-  }
-
-  .form-section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 28rpx;
-    margin-bottom: 24rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-  }
-
-  .form-title {
-    font-size: 30rpx;
-    font-weight: 500;
-    color: #333;
-    margin-bottom: 24rpx;
-    padding-bottom: 16rpx;
-    border-bottom: 1rpx solid #f0f0f0;
-  }
-
-  .form-item {
-    display: flex;
-    align-items: center;
-    padding: 16rpx 0;
-  }
-
-  .form-item.column {
-    flex-direction: column;
-    align-items: flex-start;
-  }
-
-  .form-label {
-    font-size: 28rpx;
-    color: #666;
-    width: 160rpx;
-    flex-shrink: 0;
-  }
-
-  .form-item.column .form-label {
-    width: auto;
-    margin-bottom: 16rpx;
-  }
-
-  .form-input {
-    flex: 1;
-    font-size: 28rpx;
-    border: 1rpx solid #e8e8e8;
-    border-radius: 8rpx;
-    padding: 16rpx;
-  }
-
-  .picker-value {
-    flex: 1;
-    font-size: 28rpx;
-    color: #333;
-    padding: 16rpx;
-  }
-
-  .photo-list {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 16rpx;
-  }
-
-  .photo-item {
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 12rpx;
-    overflow: hidden;
-  }
-
-  .photo-img {
-    width: 100%;
-    height: 100%;
-  }
-
-  .photo-add {
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 12rpx;
-    border: 1rpx dashed #d9d9d9;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .info-row {
-    display: flex;
-    justify-content: space-between;
-    padding: 16rpx 0;
-    border-bottom: 1rpx solid #f5f5f5;
-  }
-
-  .info-label {
-    font-size: 28rpx;
-    color: #999;
-  }
-
-  .info-value {
-    font-size: 28rpx;
-    color: #333;
-  }
-
-  .btn-section {
-    padding: 24rpx 0;
-  }
-
-  .btn {
-    font-size: 30rpx;
-    border-radius: 12rpx;
-    margin-bottom: 20rpx;
-  }
-
-  .btn-danger {
-    background: #f5222d;
-    color: #fff;
-  }
-
-  .btn-default {
-    background: #fff;
-    color: #666;
-    border: 1rpx solid #d9d9d9;
-  }
-</style>
diff --git a/pda/pages/warehouse/outbound/index.vue b/pda/pages/warehouse/outbound/index.vue
index 8c7aadc..cdea959 100644
--- a/pda/pages/warehouse/outbound/index.vue
+++ b/pda/pages/warehouse/outbound/index.vue
@@ -9,20 +9,20 @@
           </view>
           <view class="card-info">
             <text class="card-title">出库确认</text>
-            <text class="card-desc">扫描出库物料条码进行出库确认</text>
+            <text class="card-desc">扫描托盘条码进行出库确认</text>
           </view>
         </view>
         <uni-icons type="right" size="18" color="#ccc"></uni-icons>
       </view>
 
-      <view class="menu-card" @click="navigateTo('/pages/warehouse/outbound/exception')">
+      <view class="menu-card" @click="navigateTo('/pages/warehouse/outbound/emptyTray')">
         <view class="card-left">
-          <view class="card-icon red">
-            <uni-icons type="info" size="24" color="#fff"></uni-icons>
+          <view class="card-icon blue">
+            <uni-icons type="paperplane" size="24" color="#fff"></uni-icons>
           </view>
           <view class="card-info">
-            <text class="card-title">出库异常确认</text>
-            <text class="card-desc">处理出库过程中的异常情况</text>
+            <text class="card-title">空托盘出库</text>
+            <text class="card-desc">选择仓库和数量后生成出库作业</text>
           </view>
         </view>
         <uni-icons type="right" size="18" color="#ccc"></uni-icons>
@@ -106,8 +106,6 @@
       handleTask(item) {
         if (item.type === 'confirm') {
           this.$tab.navigateTo('/pages/warehouse/outbound/confirm?taskNo=' + item.taskNo)
-        } else if (item.type === 'exception') {
-          this.$tab.navigateTo('/pages/warehouse/outbound/exception?taskNo=' + item.taskNo)
         }
       }
     }
@@ -159,8 +157,8 @@
     background: linear-gradient(135deg, #fa8c16, #ffa940);
   }
 
-  .card-icon.red {
-    background: linear-gradient(135deg, #f5222d, #ff4d4f);
+  .card-icon.blue {
+    background: linear-gradient(135deg, #1890ff, #40a9ff);
   }
 
   .card-info {
@@ -242,10 +240,6 @@
     color: #fa8c16;
   }
 
-  .task-type.exception {
-    color: #f5222d;
-  }
-
   .task-no {
     font-size: 24rpx;
     color: #999;
@@ -305,8 +299,4 @@
     background: #f6ffed;
   }
 
-  .task-status.exception {
-    color: #f5222d;
-    background: #fff1f0;
-  }
 </style>
diff --git a/pda/pages/warehouse/stock/index.vue b/pda/pages/warehouse/stock/index.vue
index eb2341c..93e01a2 100644
--- a/pda/pages/warehouse/stock/index.vue
+++ b/pda/pages/warehouse/stock/index.vue
@@ -1,82 +1,170 @@
 <template>
   <view class="page-container">
-    <view class="module-header">
-      <uni-icons type="bars" size="22" color="#722ed1"></uni-icons>
-      <text class="header-title">库存统计</text>
+    <view class="query-card">
+      <view class="section-header">
+        <text class="section-title">库存查询</text>
+        <text class="section-subtitle">托盘码</text>
+      </view>
+
+      <view class="input-row">
+        <input
+          class="tray-input"
+          v-model="trayCode"
+          placeholder="请扫描或输入托盘码"
+          confirm-type="search"
+          @confirm="queryStock"
+        />
+        <button class="icon-button" @click="scanTray">
+          <uni-icons type="scan" size="22" color="#1890ff"></uni-icons>
+        </button>
+      </view>
+
+      <button class="primary-button" :disabled="loading" @click="queryStock">
+        {{ loading ? '查询中...' : '查询库存' }}
+      </button>
     </view>
 
-    <!-- 库存概览卡片 -->
-    <view class="summary-section">
-      <view class="summary-card">
-        <view class="summary-row">
-          <view class="summary-item">
-            <text class="summary-value">--</text>
-            <text class="summary-label">库存总量</text>
+    <view v-if="searched" class="result-section">
+      <view v-if="materialList.length > 0">
+        <view class="summary-card">
+          <view class="summary-main">
+            <text class="summary-tray">{{ currentTrayCode }}</text>
+            <text class="summary-location">{{ warehouseName }} / {{ cargoSpaceName }}</text>
           </view>
-          <view class="summary-divider"></view>
-          <view class="summary-item">
-            <text class="summary-value">--</text>
-            <text class="summary-label">物料种类</text>
+          <view class="summary-grid">
+            <view class="summary-item">
+              <text class="summary-value">{{ materialCount }}</text>
+              <text class="summary-label">物料种类</text>
+            </view>
+            <view class="summary-divider"></view>
+            <view class="summary-item">
+              <text class="summary-value">{{ totalQuantity }}</text>
+              <text class="summary-label">库存总量</text>
+            </view>
+            <view class="summary-divider"></view>
+            <view class="summary-item">
+              <text class="summary-value">{{ availableQuantity }}</text>
+              <text class="summary-label">可用库存</text>
+            </view>
           </view>
         </view>
-        <view class="summary-row">
-          <view class="summary-item">
-            <text class="summary-value">--</text>
-            <text class="summary-label">今日入库</text>
-          </view>
-          <view class="summary-divider"></view>
-          <view class="summary-item">
-            <text class="summary-value">--</text>
-            <text class="summary-label">今日出库</text>
+
+        <view class="material-list">
+          <view class="material-card" v-for="(item, index) in materialList" :key="item.stockDetailId || index">
+            <view class="material-header">
+              <text class="material-name">{{ formatValue(item.materialName || item.productName) }}</text>
+              <text class="material-code">{{ formatValue(item.materialCode || item.productId) }}</text>
+            </view>
+            <view class="material-body">
+              <view class="info-item">
+                <text class="info-label">批次</text>
+                <text class="info-value">{{ formatValue(item.lotNo) }}</text>
+              </view>
+              <view class="info-item">
+                <text class="info-label">库存数量</text>
+                <text class="info-value">{{ formatNumber(item.quantity) }}</text>
+              </view>
+              <view class="info-item">
+                <text class="info-label">占用数量</text>
+                <text class="info-value">{{ formatNumber(item.outQuantity) }}</text>
+              </view>
+              <view class="info-item">
+                <text class="info-label">可用数量</text>
+                <text class="info-value strong">{{ formatNumber(item.availableQuantity) }}</text>
+              </view>
+            </view>
           </view>
         </view>
       </view>
-    </view>
 
-    <view class="feature-list">
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="search" size="20" color="#1890ff"></uni-icons>
-          <text class="feature-name">库存查询</text>
-        </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
+      <view v-else class="empty-state">
+        <uni-icons type="info" size="30" color="#bfbfbf"></uni-icons>
+        <text class="empty-text">未查询到托盘库存</text>
       </view>
-
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="location" size="20" color="#fa8c16"></uni-icons>
-          <text class="feature-name">库位分布</text>
-        </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
-      </view>
-
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="pie-chart" size="20" color="#52c41a"></uni-icons>
-          <text class="feature-name">库存报表</text>
-        </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
-      </view>
-
-      <view class="feature-card" @click="$modal.showToast('功能开发中')">
-        <view class="feature-left">
-          <uni-icons type="alert" size="20" color="#f5222d"></uni-icons>
-          <text class="feature-name">库存预警</text>
-        </view>
-        <uni-icons type="right" size="16" color="#ccc"></uni-icons>
-      </view>
-    </view>
-
-    <view class="empty-tip">
-      <text class="tip-text">库存统计模块正在开发中，敬请期待</text>
     </view>
   </view>
 </template>
 
 <script>
+  import { getTrayStock } from '@/api/warehouse/stock'
+
   export default {
     data() {
-      return {}
+      return {
+        trayCode: '',
+        currentTrayCode: '',
+        loading: false,
+        searched: false,
+        materialList: []
+      }
+    },
+    computed: {
+      materialCount() {
+        var map = {}
+        this.materialList.forEach(item => {
+          var key = item.materialCode || item.productId || item.stockDetailId
+          if (key) map[key] = true
+        })
+        return Object.keys(map).length
+      },
+      totalQuantity() {
+        return this.sumBy('quantity')
+      },
+      availableQuantity() {
+        return this.sumBy('availableQuantity')
+      },
+      warehouseName() {
+        return this.formatValue(this.materialList[0] && this.materialList[0].warehouseName)
+      },
+      cargoSpaceName() {
+        return this.formatValue(this.materialList[0] && this.materialList[0].cargoSpaceName)
+      }
+    },
+    methods: {
+      scanTray() {
+        uni.scanCode({
+          success: res => {
+            this.trayCode = res.result || ''
+            this.queryStock()
+          }
+        })
+      },
+      queryStock() {
+        var code = (this.trayCode || '').trim()
+        if (!code) {
+          this.$modal.msg('请扫描或输入托盘码')
+          return
+        }
+        this.loading = true
+        getTrayStock(code).then(res => {
+          this.currentTrayCode = code
+          this.materialList = res.data || []
+          this.searched = true
+        }).catch(() => {
+          this.materialList = []
+          this.searched = true
+        }).then(() => {
+          this.loading = false
+        })
+      },
+      sumBy(field) {
+        var total = 0
+        this.materialList.forEach(item => {
+          total += this.toNumber(item[field])
+        })
+        return this.formatNumber(total)
+      },
+      toNumber(value) {
+        var number = Number(value)
+        return isNaN(number) ? 0 : number
+      },
+      formatNumber(value) {
+        var number = this.toNumber(value)
+        return Number.isInteger(number) ? String(number) : String(Number(number.toFixed(3)))
+      },
+      formatValue(value) {
+        return value === undefined || value === null || value === '' ? '-' : value
+      }
     }
   }
 </script>
@@ -91,101 +179,210 @@
     padding: 24rpx;
   }
 
-  .module-header {
-    display: flex;
-    align-items: center;
-    padding: 24rpx 0;
-    margin-bottom: 20rpx;
+  .query-card,
+  .summary-card,
+  .material-card,
+  .empty-state {
+    background: #fff;
+    border-radius: 16rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
   }
 
-  .header-title {
+  .query-card {
+    padding: 28rpx;
+    margin-bottom: 28rpx;
+  }
+
+  .section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 22rpx;
+  }
+
+  .section-title {
     font-size: 32rpx;
     font-weight: 500;
     color: #333;
-    margin-left: 12rpx;
   }
 
-  .summary-section {
-    margin-bottom: 32rpx;
+  .section-subtitle {
+    font-size: 24rpx;
+    color: #999;
+  }
+
+  .input-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+  }
+
+  .tray-input {
+    flex: 1;
+    height: 82rpx;
+    padding: 0 24rpx;
+    border: 1rpx solid #e5e6eb;
+    border-radius: 12rpx;
+    background: #fafafa;
+    font-size: 28rpx;
+    color: #333;
+  }
+
+  .icon-button {
+    width: 82rpx;
+    height: 82rpx;
+    padding: 0;
+    margin-left: 18rpx;
+    border-radius: 12rpx;
+    background: #e6f7ff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .icon-button::after,
+  .primary-button::after {
+    border: none;
+  }
+
+  .primary-button {
+    height: 84rpx;
+    line-height: 84rpx;
+    border-radius: 12rpx;
+    background: #1890ff;
+    color: #fff;
+    font-size: 30rpx;
+  }
+
+  .primary-button[disabled] {
+    background: #91caff;
+    color: #fff;
+  }
+
+  .result-section {
+    margin-bottom: 28rpx;
   }
 
   .summary-card {
-    background: linear-gradient(135deg, #1890ff, #096dd9);
-    border-radius: 16rpx;
-    padding: 40rpx 28rpx;
+    padding: 30rpx 28rpx;
+    margin-bottom: 24rpx;
   }
 
-  .summary-row {
+  .summary-main {
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 24rpx;
+    margin-bottom: 24rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+  }
+
+  .summary-tray {
+    font-size: 34rpx;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 8rpx;
+  }
+
+  .summary-location {
+    font-size: 24rpx;
+    color: #999;
+  }
+
+  .summary-grid {
     display: flex;
     align-items: center;
-    justify-content: space-around;
-  }
-
-  .summary-row:first-child {
-    margin-bottom: 32rpx;
-  }
-
-  .summary-divider {
-    width: 1rpx;
-    height: 60rpx;
-    background: rgba(255, 255, 255, 0.3);
+    justify-content: space-between;
   }
 
   .summary-item {
+    flex: 1;
     display: flex;
     flex-direction: column;
     align-items: center;
   }
 
+  .summary-divider {
+    width: 1rpx;
+    height: 54rpx;
+    background: #f0f0f0;
+  }
+
   .summary-value {
-    font-size: 40rpx;
-    font-weight: 500;
-    color: #fff;
-    margin-bottom: 8rpx;
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #1890ff;
+    margin-bottom: 6rpx;
   }
 
   .summary-label {
-    font-size: 24rpx;
-    color: rgba(255, 255, 255, 0.8);
+    font-size: 22rpx;
+    color: #999;
   }
 
-  .feature-list {
-    background: #fff;
-    border-radius: 16rpx;
-    overflow: hidden;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+  .material-card {
+    padding: 28rpx;
+    margin-bottom: 20rpx;
   }
 
-  .feature-card {
+  .material-header {
     display: flex;
-    align-items: center;
     justify-content: space-between;
-    padding: 32rpx 28rpx;
-    border-bottom: 1rpx solid #f5f5f5;
+    align-items: flex-start;
+    padding-bottom: 18rpx;
+    margin-bottom: 16rpx;
+    border-bottom: 1rpx solid #f0f0f0;
   }
 
-  .feature-card:last-child {
-    border-bottom: none;
-  }
-
-  .feature-left {
-    display: flex;
-    align-items: center;
-  }
-
-  .feature-name {
-    font-size: 28rpx;
+  .material-name {
+    flex: 1;
+    font-size: 30rpx;
+    font-weight: 500;
     color: #333;
-    margin-left: 16rpx;
+    margin-right: 20rpx;
   }
 
-  .empty-tip {
-    padding: 60rpx 0;
-    text-align: center;
+  .material-code {
+    font-size: 24rpx;
+    color: #999;
   }
 
-  .tip-text {
+  .material-body {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .info-item {
+    display: flex;
+    justify-content: space-between;
+    padding: 9rpx 0;
+  }
+
+  .info-label {
     font-size: 26rpx;
-    color: #ccc;
+    color: #999;
+  }
+
+  .info-value {
+    font-size: 26rpx;
+    color: #333;
+  }
+
+  .info-value.strong {
+    color: #1890ff;
+    font-weight: 600;
+  }
+
+  .empty-state {
+    padding: 86rpx 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .empty-text {
+    font-size: 28rpx;
+    color: #999;
+    margin-top: 16rpx;
   }
 </style>
diff --git a/pda/static/logo.png b/pda/static/logo.png
index d4ebbf0..49c42ea 100644
Binary files a/pda/static/logo.png and b/pda/static/logo.png differ
diff --git a/pda/static/logo200.png b/pda/static/logo200.png
index ffa9988..49c42ea 100644
Binary files a/pda/static/logo200.png and b/pda/static/logo200.png differ
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/aspect/ApiLogAspect.java b/ruoyi-admin/src/main/java/com/ruoyi/api/aspect/ApiLogAspect.java
index da62908..3108ea4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/aspect/ApiLogAspect.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/aspect/ApiLogAspect.java
@@ -26,6 +26,8 @@ import com.ruoyi.common.utils.ExceptionUtil;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
 
 /**
  * 外部接口入站调用日志切面。
@@ -71,7 +73,8 @@ public class ApiLogAspect
             logEntity.setSysCode(apiLog.sysCode());
             logEntity.setInterfaceName(apiLog.interfaceName());
             logEntity.setMsgType("JSON");
-            logEntity.setStatus(e == null ? "SUCCESS" : "FAIL");
+            boolean businessFailed = e == null && isBusinessFailed(jsonResult);
+            logEntity.setStatus(e == null && !businessFailed ? "SUCCESS" : "FAIL");
             logEntity.setHttpStatus(e == null ? 200 : 500);
             logEntity.setCostMs(costMs());
 
@@ -91,6 +94,8 @@ public class ApiLogAspect
             }
             if (e != null) {
                 logEntity.setErrorMsg(StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, PARAM_MAX_LENGTH));
+            } else if (businessFailed) {
+                logEntity.setErrorMsg(StringUtils.substring(extractBusinessErrorMessage(jsonResult), 0, PARAM_MAX_LENGTH));
             }
             apiLogService.record(logEntity);
         } catch (Exception ex) {
@@ -172,4 +177,38 @@ public class ApiLogAspect
     {
         return StringUtils.isNotEmpty(first) ? first : second;
     }
+
+    private boolean isBusinessFailed(Object jsonResult)
+    {
+        Object code = extractResultCode(jsonResult);
+        if (code == null) {
+            return false;
+        }
+        String codeText = String.valueOf(code);
+        return !String.valueOf(HttpStatus.SUCCESS).equals(codeText) && !"0".equals(codeText);
+    }
+
+    private Object extractResultCode(Object jsonResult)
+    {
+        if (jsonResult instanceof AjaxResult) {
+            return ((AjaxResult) jsonResult).get(AjaxResult.CODE_TAG);
+        }
+        if (jsonResult instanceof Map) {
+            return ((Map<?, ?>) jsonResult).get(AjaxResult.CODE_TAG);
+        }
+        return null;
+    }
+
+    private String extractBusinessErrorMessage(Object jsonResult)
+    {
+        if (jsonResult instanceof AjaxResult) {
+            Object msg = ((AjaxResult) jsonResult).get(AjaxResult.MSG_TAG);
+            return msg == null ? "" : String.valueOf(msg);
+        }
+        if (jsonResult instanceof Map) {
+            Object msg = ((Map<?, ?>) jsonResult).get(AjaxResult.MSG_TAG);
+            return msg == null ? "" : String.valueOf(msg);
+        }
+        return "";
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/client/WcsClient.java b/ruoyi-admin/src/main/java/com/ruoyi/api/client/WcsClient.java
index 68125d8..80ec8cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/client/WcsClient.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/client/WcsClient.java
@@ -36,6 +36,9 @@ public class WcsClient extends BaseExternalClient {
 
     public ApiResponse<String> sendPutawayTask(String stockinNo, String locationCode,
                                                 String trayNo, String priority) {
+        if (mockEnabled()) {
+            return ApiResponse.ok("MOCK_WCS_PUTAWAY_OK");
+        }
         String body = String.join("|", "PUTAWAY", String.valueOf(nextSeq()),
                 stockinNo, locationCode, trayNo, priority);
         return post(url("sendPutawayTask"), body, "WCS-下发入库任务", this::parseOkNg);
@@ -48,6 +51,9 @@ public class WcsClient extends BaseExternalClient {
         if (job == null) {
             return ApiResponse.fail("PARAM_ERROR", "入库作业不能为空");
         }
+        if (mockEnabled()) {
+            return ApiResponse.ok("MOCK_WCS_PUTAWAY_OK");
+        }
         try {
             String body = objectMapper.writeValueAsString(job);
             return post(url("sendPutawayTask"), body, "WCS-下发入库任务", this::parseWcsAck, MsgTypeEnum.JSON);
@@ -60,6 +66,9 @@ public class WcsClient extends BaseExternalClient {
 
     public ApiResponse<String> sendRetrieveTask(String stockoutNo, String locationCode,
                                                  String materialCode, String qty) {
+        if (mockEnabled()) {
+            return ApiResponse.ok("MOCK_WCS_RETRIEVE_OK");
+        }
         String body = String.join("|", "RETRIEVE", String.valueOf(nextSeq()),
                 stockoutNo, locationCode, materialCode, qty);
         return post(url("sendRetrieveTask"), body, "WCS-下发出库任务", this::parseOkNg);
@@ -72,6 +81,9 @@ public class WcsClient extends BaseExternalClient {
         if (job == null) {
             return ApiResponse.fail("PARAM_ERROR", "出库作业不能为空");
         }
+        if (mockEnabled()) {
+            return ApiResponse.ok("MOCK_WCS_RETRIEVE_OK");
+        }
         try {
             String body = objectMapper.writeValueAsString(job);
             return post(url("sendPutawayTask"), body, "WCS-下发出库任务", this::parseWcsAck, MsgTypeEnum.JSON);
@@ -83,6 +95,14 @@ public class WcsClient extends BaseExternalClient {
     // ── 接口3：查询设备状态 ───────────────────────────────────
 
     public ApiResponse<List<Map<String, String>>> queryDeviceStatus(String deviceType) {
+        if (mockEnabled()) {
+            Map<String, String> device = new LinkedHashMap<>();
+            device.put("deviceId", deviceType == null || deviceType.isEmpty() ? "MOCK_DEVICE" : "MOCK_" + deviceType);
+            device.put("status", "MOCK_ONLINE");
+            device.put("running", "Y");
+            device.put("error", "");
+            return ApiResponse.ok(Collections.singletonList(device));
+        }
         String body = "STATUS|" + nextSeq() + "|" + deviceType;
         return post(url("queryDeviceStatus"), body, "WCS-查询设备状态", rawBody -> {
             String[] lines = rawBody.trim().split("\\n");
@@ -107,6 +127,9 @@ public class WcsClient extends BaseExternalClient {
 
     public ApiResponse<String> sendCraneMove(String craneNo, String fromLocation,
                                               String toLocation, String taskType) {
+        if (mockEnabled()) {
+            return ApiResponse.ok("MOCK_WCS_CRANE_MOVE_OK");
+        }
         String body = String.join("|", "MOVE", String.valueOf(nextSeq()),
                 craneNo, fromLocation, toLocation, taskType);
         return post(url("sendCraneMove"), body, "WCS-堆垛机移动指令", this::parseOkNg);
@@ -115,12 +138,24 @@ public class WcsClient extends BaseExternalClient {
     // ── 接口5：取消任务 ──────────────────────────────────────
 
     public ApiResponse<String> cancelTask(String taskId) {
+        if (mockEnabled()) {
+            return ApiResponse.ok("MOCK_WCS_CANCEL_OK");
+        }
         String body = "CANCEL|" + nextSeq() + "|" + taskId;
         return post(url("cancelTask"), body, "WCS-取消任务", this::parseOkNg);
     }
 
     // ── 辅助 ─────────────────────────────────────────────────
 
+    private boolean mockEnabled() {
+        ExternalProp prop = externalProp();
+        if (prop == null) {
+            return true;
+        }
+        ExternalProp.SystemConfig wcsConfig = prop.getSystem(sysEnum().getCode());
+        return wcsConfig == null || wcsConfig.isMockEnabled();
+    }
+
     private String parseOkNg(String rawBody) {
         String[] parts = rawBody.trim().split("\\|", 2);
         if ("OK".equals(parts[0])) {
@@ -141,11 +176,9 @@ public class WcsClient extends BaseExternalClient {
             Object success = result.get("success");
             Object code = result.get("code");
             Object message = result.get("message");
-            boolean ok = Boolean.TRUE.equals(success)
-                    || "true".equalsIgnoreCase(String.valueOf(success))
-                    || "00000".equals(String.valueOf(code))
-                    || "200".equals(String.valueOf(code))
-                    || "OK".equalsIgnoreCase(String.valueOf(code));
+            boolean ok = "0".equals(String.valueOf(code))
+                    || (code == null && (Boolean.TRUE.equals(success)
+                    || "true".equalsIgnoreCase(String.valueOf(success))));
             if (ok) {
                 Object data = result.get("data");
                 return data == null ? (message == null ? "OK" : String.valueOf(message)) : String.valueOf(data);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/config/ExternalProp.java b/ruoyi-admin/src/main/java/com/ruoyi/api/config/ExternalProp.java
index 3219ed4..532ebd2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/config/ExternalProp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/config/ExternalProp.java
@@ -29,6 +29,8 @@ public class ExternalProp {
         private String token;
         private int connectTimeout = 5000;
         private int readTimeout = 10000;
+        /** 是否启用本地模拟返回。当前仅 WCS 客户端使用，默认开启便于本地测试。 */
+        private boolean mockEnabled = true;
 
         /** 该系统的接口路径配置，key=接口名，value=路径 */
         private Map<String, String> apis;
@@ -41,6 +43,8 @@ public class ExternalProp {
         public void setConnectTimeout(int connectTimeout) { this.connectTimeout = connectTimeout; }
         public int getReadTimeout() { return readTimeout; }
         public void setReadTimeout(int readTimeout) { this.readTimeout = readTimeout; }
+        public boolean isMockEnabled() { return mockEnabled; }
+        public void setMockEnabled(boolean mockEnabled) { this.mockEnabled = mockEnabled; }
         public Map<String, String> getApis() { return apis; }
         public void setApis(Map<String, String> apis) { this.apis = apis; }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ExternalApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ExternalApiController.java
index 476ab8e..6f99168 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ExternalApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ExternalApiController.java
@@ -5,6 +5,7 @@ import com.ruoyi.api.client.MesClient;
 import com.ruoyi.api.client.WcsClient;
 import com.ruoyi.api.domain.WcsInboundCompleteRequest;
 import com.ruoyi.api.domain.WcsInboundLocationRequest;
+import com.ruoyi.api.domain.WcsJobExceptionRequest;
 import com.ruoyi.api.domain.WcsOutboundCompleteRequest;
 import com.ruoyi.api.domain.ApiResponse;
 import com.ruoyi.common.annotation.ApiLog;
@@ -91,7 +92,7 @@ public class ExternalApiController extends BaseController {
                                        @RequestParam String trayNo,
                                        @RequestParam(defaultValue = "NORMAL") String priority) {
         ApiResponse<String> resp = wcsClient.sendPutawayTask(stockinNo, locationCode, trayNo, priority);
-        return resp.isSuccess() ? success(resp.getData()) : error(resp.getMessage());
+        return wcsResult(resp);
     }
 
     @PostMapping("/wcs/sendRetrieveTask")
@@ -100,13 +101,13 @@ public class ExternalApiController extends BaseController {
                                         @RequestParam String materialCode,
                                         @RequestParam String qty) {
         ApiResponse<String> resp = wcsClient.sendRetrieveTask(stockoutNo, locationCode, materialCode, qty);
-        return resp.isSuccess() ? success(resp.getData()) : error(resp.getMessage());
+        return wcsResult(resp);
     }
 
     @PostMapping("/wcs/queryDeviceStatus")
     public AjaxResult queryDeviceStatus(@RequestParam(defaultValue = "ALL") String deviceType) {
         ApiResponse<List<Map<String, String>>> resp = wcsClient.queryDeviceStatus(deviceType);
-        return resp.isSuccess() ? success(resp.getData()) : error(resp.getMessage());
+        return wcsResult(resp);
     }
 
     @PostMapping("/wcs/sendCraneMove")
@@ -115,13 +116,35 @@ public class ExternalApiController extends BaseController {
                                      @RequestParam String toLocation,
                                      @RequestParam(defaultValue = "NORMAL") String taskType) {
         ApiResponse<String> resp = wcsClient.sendCraneMove(craneNo, fromLocation, toLocation, taskType);
-        return resp.isSuccess() ? success(resp.getData()) : error(resp.getMessage());
+        return wcsResult(resp);
     }
 
     @PostMapping("/wcs/cancelTask")
     public AjaxResult cancelWcsTask(@RequestParam String taskId) {
         ApiResponse<String> resp = wcsClient.cancelTask(taskId);
-        return resp.isSuccess() ? success(resp.getData()) : error(resp.getMessage());
+        return wcsResult(resp);
+    }
+
+    /**
+     * WCS 识别现场异常后回调 WMS。
+     */
+    @ApiLog(interfaceName = "WCS-作业异常处理", sysCode = "WCS", direction = "INBOUND")
+    @PostMapping("/wcs/exception")
+    public AjaxResult handleWcsException(@RequestBody WcsJobExceptionRequest request) {
+        String exceptionType = normalizeExceptionType(request);
+        if (exceptionType == null) {
+            return wcsError("异常类型不能为空，支持PICK_EMPTY/取货无货、PUT_OCCUPIED/放货有货");
+        }
+
+        MydoJob job = resolveExceptionJob(request, exceptionType);
+        if (job == null) {
+            return wcsError("未找到对应作业");
+        }
+
+        if ("PICK_EMPTY".equals(exceptionType)) {
+            return wcsResult(mydoJobService.handleWcsPickEmptyException(job.getJobId()));
+        }
+        return wcsResult(mydoJobService.handleWcsPutOccupiedException(job.getJobId()));
     }
 
     /**
@@ -149,14 +172,14 @@ public class ExternalApiController extends BaseController {
             job = mydoJobService.selectLatestInMydoJobByTrayCode(request.getTrayCode().trim());
         }
         if (job == null) {
-            return error("未找到对应入库作业");
+            return wcsError("未找到对应入库作业");
         }
         if (job.getCargoSpaceId() == null || job.getCargoSpaceId().trim().isEmpty()) {
             Map<String, Object> cargoSpace;
             try {
                 cargoSpace = pdaService.lockInboundCargoSpace(job.getTrayCode(), job.getWarehouseId(), job.getRoadwayId());
             } catch (RuntimeException e) {
-                return error(e.getMessage());
+                return wcsError(e.getMessage());
             }
             job.setRoadwayId(String.valueOf(cargoSpace.get("roadway_id")));
             job.setCargoSpaceId(String.valueOf(cargoSpace.get("cargo_space_id")));
@@ -164,11 +187,11 @@ public class ExternalApiController extends BaseController {
             int updateRows = mydoJobService.updateMydoJob(job);
             if (updateRows <= 0) {
                 pdaService.releaseInboundCargoSpace(job.getTrayCode(), job.getWarehouseId());
-                return error("入库货位回写作业失败");
+                return wcsError("入库货位回写作业失败");
             }
         }
 
-        return success(job);
+        return wcsSuccess(job);
     }
 
     /**
@@ -196,15 +219,19 @@ public class ExternalApiController extends BaseController {
             job = mydoJobService.selectLatestInMydoJobByTrayCode(request.getTrayCode().trim());
         }
         if (job == null) {
-            return error("未找到对应入库作业");
+            return wcsError("未找到对应入库作业");
         }
-        return mydoJobService.completeInJobFromWcs(job.getJobId());
+        if (!isExpectedJobType(job, true)) {
+            return wcsError("非法入库作业");
+        }
+        return wcsResult(mydoJobService.completeInJobFromWcs(job.getJobId()));
     }
 
     /**
      * WCS 完成出库后回调 WMS。
      * <p>
-     * 出库完成仍然复用当前出库作业完成过程，统一完成库存扣减、作业归档和出库单完成联动。
+     * WCS 确认托盘已离开库位并到达出库口后，立即释放原货位为空货位；
+     * PDA 扫码确认只负责后续库存扣减、作业归档、出库单完成和回流入库联动。
      */
     @ApiLog(interfaceName = "WCS-完成出库作业", sysCode = "WCS", direction = "OUTBOUND")
     @PostMapping("/wcs/outbound/complete")
@@ -212,9 +239,6 @@ public class ExternalApiController extends BaseController {
         MydoJob job = null;
         if (request != null && request.getJobId() != null && !request.getJobId().trim().isEmpty()) {
             job = mydoJobService.selectMydoJobByJobId(request.getJobId().trim());
-            if (job != null && (job.getInOrOut() == null || job.getInOrOut() < 20)) {
-                job = null;
-            }
         }
         if (job == null && request != null && request.getTaskNo() != null && !request.getTaskNo().trim().isEmpty()) {
             job = mydoJobService.selectOutMydoJobByTaskNo(request.getTaskNo().trim());
@@ -225,8 +249,112 @@ public class ExternalApiController extends BaseController {
             job = mydoJobService.selectLatestOutMydoJobByTrayCodeAndWarehouseId(request.getTrayCode().trim(), request.getWarehouseId().trim());
         }
         if (job == null) {
-            return error("未找到对应出库作业");
+            return wcsError("未找到对应出库作业");
         }
-        return mydoJobService.completeOutJobFromWcs(job.getJobId());
+        if (!isExpectedJobType(job, false)) {
+            return wcsError("非法出库作业");
+        }
+        return wcsResult(mydoJobService.completeOutJobFromWcs(job.getJobId()));
+    }
+
+    private <T> AjaxResult wcsResult(ApiResponse<T> response) {
+        if (response != null && response.isSuccess()) {
+            return wcsSuccess(response.getData());
+        }
+        return wcsError(response == null ? "WCS接口无返回" : response.getMessage());
+    }
+
+    private AjaxResult wcsResult(AjaxResult result) {
+        if (result != null && result.isSuccess()) {
+            return wcsResponse(0, String.valueOf(result.getOrDefault(AjaxResult.MSG_TAG, "操作成功")),
+                    result.get(AjaxResult.DATA_TAG));
+        }
+        String message = result == null ? "操作失败" : String.valueOf(result.getOrDefault(AjaxResult.MSG_TAG, "操作失败"));
+        return wcsError(message);
+    }
+
+    private AjaxResult wcsSuccess(Object data) {
+        return wcsResponse(0, "操作成功", data);
+    }
+
+    private AjaxResult wcsError(String message) {
+        return wcsResponse(1, message, null);
+    }
+
+    private AjaxResult wcsResponse(int code, String message, Object data) {
+        return new AjaxResult(code, message, data);
+    }
+
+    private String normalizeExceptionType(WcsJobExceptionRequest request) {
+        if (request == null) {
+            return null;
+        }
+        String type = trimToNull(request.getExceptionType());
+        if (type == null) {
+            type = trimToNull(request.getType());
+        }
+        if (type == null) {
+            return null;
+        }
+        if ("PICK_EMPTY".equalsIgnoreCase(type)
+                || "PICK_NO_GOODS".equalsIgnoreCase(type)
+                || "取货无货".equals(type)
+                || "1".equals(type)) {
+            return "PICK_EMPTY";
+        }
+        if ("PUT_OCCUPIED".equalsIgnoreCase(type)
+                || "PUT_HAS_GOODS".equalsIgnoreCase(type)
+                || "放货有货".equals(type)
+                || "2".equals(type)) {
+            return "PUT_OCCUPIED";
+        }
+        return null;
+    }
+
+    private MydoJob resolveExceptionJob(WcsJobExceptionRequest request, String exceptionType) {
+        if (request == null) {
+            return null;
+        }
+        boolean inbound = "PUT_OCCUPIED".equals(exceptionType);
+        MydoJob job = null;
+        String jobId = trimToNull(request.getJobId());
+        if (jobId != null) {
+            job = mydoJobService.selectMydoJobByJobId(jobId);
+            if (!isExpectedJobType(job, inbound)) {
+                job = null;
+            }
+        }
+        String taskNo = trimToNull(request.getTaskNo());
+        if (job == null && taskNo != null) {
+            job = inbound
+                    ? mydoJobService.selectInMydoJobByTaskNo(taskNo)
+                    : mydoJobService.selectOutMydoJobByTaskNo(taskNo);
+        }
+        String trayCode = trimToNull(request.getTrayCode());
+        String warehouseId = trimToNull(request.getWarehouseId());
+        if (job == null && trayCode != null && warehouseId != null) {
+            job = inbound
+                    ? mydoJobService.selectLatestInMydoJobByTrayCodeAndWarehouseId(trayCode, warehouseId)
+                    : mydoJobService.selectLatestOutMydoJobByTrayCodeAndWarehouseId(trayCode, warehouseId);
+        }
+        if (job == null && inbound && trayCode != null) {
+            job = mydoJobService.selectLatestInMydoJobByTrayCode(trayCode);
+        }
+        return isExpectedJobType(job, inbound) ? job : null;
+    }
+
+    private boolean isExpectedJobType(MydoJob job, boolean inbound) {
+        if (job == null || job.getInOrOut() == null) {
+            return false;
+        }
+        return inbound ? job.getInOrOut() < 20 : job.getInOrOut() >= 20;
+    }
+
+    private String trimToNull(String value) {
+        if (value == null) {
+            return null;
+        }
+        String trimmed = value.trim();
+        return trimmed.isEmpty() ? null : trimmed;
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WcsJobExceptionRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WcsJobExceptionRequest.java
new file mode 100644
index 0000000..173940a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WcsJobExceptionRequest.java
@@ -0,0 +1,84 @@
+package com.ruoyi.api.domain;
+
+/**
+ * WCS 作业异常回调参数。
+ */
+public class WcsJobExceptionRequest {
+
+    /** 异常类型：PICK_EMPTY/取货无货，PUT_OCCUPIED/放货有货 */
+    private String exceptionType;
+
+    /** 兼容字段：异常类型 */
+    private String type;
+
+    /** WMS 作业ID */
+    private String jobId;
+
+    /** WMS/WCS 协同任务号 */
+    private String taskNo;
+
+    /** 托盘号 */
+    private String trayCode;
+
+    /** 仓库编码 */
+    private String warehouseId;
+
+    /** 备注 */
+    private String remark;
+
+    public String getExceptionType() {
+        return exceptionType;
+    }
+
+    public void setExceptionType(String exceptionType) {
+        this.exceptionType = exceptionType;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
+    public String getTaskNo() {
+        return taskNo;
+    }
+
+    public void setTaskNo(String taskNo) {
+        this.taskNo = taskNo;
+    }
+
+    public String getTrayCode() {
+        return trayCode;
+    }
+
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java
index eb47b0e..cd47c3e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.bas.cargospace.mapper;
 
 import java.util.List;
 import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
+import com.ruoyi.in.job.domain.MydoJob;
 import com.ruoyi.kpi.domain.BasCargoSpaceStatus;
 
 /**
@@ -78,4 +79,68 @@ public interface BasCargoSpaceMapper
      * @return
      */
     BasCargoSpace selectByCoordinates(BasCargoSpace basCargoSpace);
+
+    /**
+     * 按库存主表ID将货位标记为出库已分配。
+     *
+     * @param stockId 库存ID
+     * @return 结果
+     */
+    int markOutboundAssignedByStockId(String stockId);
+
+    /**
+     * 按库存ID或库存明细ID将货位标记为出库已分配。
+     *
+     * @param stockRef 库存ID或库存明细ID
+     * @return 结果
+     */
+    int markOutboundAssignedByStockRef(String stockRef);
+
+    /**
+     * 按出库子单已生成的作业明细将货位标记为出库已分配。
+     *
+     * @param stockoutDetailId 出库子单ID
+     * @return 结果
+     */
+    int markOutboundAssignedByStockoutDetailId(String stockoutDetailId);
+
+    /**
+     * 按货位ID将无库存货位标记为出库已分配。
+     *
+     * @param cargoSpaceId 货位ID
+     * @return 结果
+     */
+    int markOutboundAssignedByCargoSpaceId(String cargoSpaceId);
+
+    /**
+     * 将出库作业对应货位释放为空货位。
+     *
+     * @param cargoSpaceId 货位ID
+     * @return 结果
+     */
+    int releaseOutboundCargoSpace(String cargoSpaceId);
+
+    /**
+     * 将取货无货作业货位标记为出库需盘点。
+     *
+     * @param cargoSpaceId 货位ID
+     * @return 结果
+     */
+    int markOutboundNeedCheck(String cargoSpaceId);
+
+    /**
+     * 将放货有货作业原货位标记为入库需盘点。
+     *
+     * @param cargoSpaceId 货位ID
+     * @return 结果
+     */
+    int markInboundNeedCheck(String cargoSpaceId);
+
+    /**
+     * 查询同仓库同巷道的可用入库空货位。
+     *
+     * @param job 当前入库作业
+     * @return 可用货位
+     */
+    BasCargoSpace selectAvailableInboundCargoSpaceInRoadway(MydoJob job);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stationpoint/domain/BasStationPoint.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stationpoint/domain/BasStationPoint.java
index 30adf08..914ff71 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stationpoint/domain/BasStationPoint.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stationpoint/domain/BasStationPoint.java
@@ -38,8 +38,8 @@ public class BasStationPoint extends BaseEntity
     @Excel(name = "点位类型", readConverterExp = "1=入库,2=出库,3=入出库")
     private String pointType;
 
-    /** 点位大小：1-大点位，2-小点位 */
-    @Excel(name = "点位大小", readConverterExp = "1=大点位,2=小点位")
+    /** 点位大小：1-大点位，2-小点位，3-通用点位 */
+    @Excel(name = "点位大小", readConverterExp = "1=大点位,2=小点位,3=通用点位")
     private String pointSize;
 
     /** 托盘类型，多个类型使用英文逗号分隔 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/controller/BasStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/controller/BasStockController.java
index 0fd054a..6981ed9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/controller/BasStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/controller/BasStockController.java
@@ -115,6 +115,19 @@ public class BasStockController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 导出库存物料明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('bas:stock:export')")
+    @Log(title = "库存物料明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/detail/export")
+    public void detailExport(HttpServletResponse response, BasStockDetail basStockDetail)
+    {
+        List<BasStockDetail> list = basStockService.selectBasStockDetailList(basStockDetail);
+        ExcelUtil<BasStockDetail> util = new ExcelUtil<BasStockDetail>(BasStockDetail.class);
+        util.exportExcel(response, list, "库存物料明细数据");
+    }
+
     /**
      * 获取库存物料明细
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockDetail.java
index 37d32f6..5c4c859 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockDetail.java
@@ -85,6 +85,10 @@ public class BasStockDetail extends BaseEntity
     @Excel(name = "仓库名称")
     private String warehouseName;
 
+    /** 托盘类型 */
+    @Excel(name = "托盘类型")
+    private String trayType;
+
     /** 可用库存数量 */
     @Excel(name = "可用库存数量")
     private BigDecimal availableQuantity;
@@ -269,6 +273,16 @@ public class BasStockDetail extends BaseEntity
         this.warehouseName = warehouseName;
     }
 
+    public String getTrayType()
+    {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType)
+    {
+        this.trayType = trayType;
+    }
+
     public BigDecimal getAvailableQuantity()
     {
         return availableQuantity;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockDetailMapper.java
index 78d1051..8490bfe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockDetailMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.bas.stock.mapper;
 
 import java.util.List;
 import com.ruoyi.bas.stock.domain.BasStockDetail;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 库存物料明细Mapper接口
@@ -12,10 +13,14 @@ public interface BasStockDetailMapper
 
     public List<BasStockDetail> selectBasStockDetailList(BasStockDetail basStockDetail);
 
+    public int countBasStockDetailByStockId(@Param("stockId") String stockId);
+
     public int insertBasStockDetail(BasStockDetail basStockDetail);
 
     public int updateBasStockDetail(BasStockDetail basStockDetail);
 
+    public int rollbackOutboundQuantityByJobId(String jobId);
+
     public List<String> selectStockIdsByDetailIds(String[] detailIds);
 
     public int deleteBasStockDetailByDetailId(String detailId);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java
index 563555f..21bc78d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/mapper/BasStockMapper.java
@@ -51,6 +51,14 @@ public interface BasStockMapper
      */
     public int refreshBasStockSummary(String stockId);
 
+    /**
+     * 将取货无货作业关联库存标记为异常。
+     *
+     * @param jobId 作业ID
+     * @return 结果
+     */
+    public int markExceptionByJobId(String jobId);
+
     /**
      * 删除库存信息
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java
index 1417132..85dc40e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java
@@ -1,9 +1,13 @@
 package com.ruoyi.bas.stock.service.impl;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 
 import com.ruoyi.bas.stock.domain.BasStockDetail;
 import com.ruoyi.bas.stock.mapper.BasStockDetailMapper;
@@ -31,6 +35,9 @@ import com.ruoyi.bas.stock.service.IBasStockService;
 @Service
 public class BasStockServiceImpl implements IBasStockService 
 {
+    private static final DateTimeFormatter STOCK_ID_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
+    private static final AtomicLong LAST_STOCK_ID_MILLIS = new AtomicLong();
+
     @Autowired
     private BasStockMapper basStockMapper;
     @Autowired
@@ -77,7 +84,7 @@ public class BasStockServiceImpl implements IBasStockService
     {
         if (basStock.getStockId() == null || basStock.getStockId().isEmpty())
         {
-            basStock.setStockId(UUID.randomUUID().toString().replace("-", ""));
+            basStock.setStockId(generateStockId());
         }
         BasStockDetail initialDetail = buildInitialDetail(basStock);
         clearMasterMaterialFields(basStock);
@@ -190,7 +197,7 @@ public class BasStockServiceImpl implements IBasStockService
     {
         if (basStockDetail.getDetailId() == null || basStockDetail.getDetailId().isEmpty())
         {
-            basStockDetail.setDetailId(UUID.randomUUID().toString().replace("-", ""));
+            basStockDetail.setDetailId(generateStockDetailId(basStockDetail.getStockId()));
         }
         basStockDetail.setCreateTime(DateUtils.getNowDate());
         int rows = basStockDetailMapper.insertBasStockDetail(basStockDetail);
@@ -247,7 +254,7 @@ public class BasStockServiceImpl implements IBasStockService
             return null;
         }
         BasStockDetail detail = new BasStockDetail();
-        detail.setDetailId(UUID.randomUUID().toString().replace("-", ""));
+        detail.setDetailId(generateStockDetailId(basStock.getStockId()));
         detail.setStockId(basStock.getStockId());
         detail.setProductStatus(basStock.getProductStatus());
         detail.setLotNo(basStock.getLotNo());
@@ -288,6 +295,23 @@ public class BasStockServiceImpl implements IBasStockService
         return value != null && !value.isEmpty();
     }
 
+    private String generateStockId()
+    {
+        long now = System.currentTimeMillis();
+        long stockMillis = LAST_STOCK_ID_MILLIS.updateAndGet(last -> Math.max(now, last + 1));
+        LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(stockMillis), ZoneId.systemDefault());
+        return "KC" + STOCK_ID_FORMATTER.format(dateTime);
+    }
+
+    private String generateStockDetailId(String stockId)
+    {
+        if (!hasText(stockId))
+        {
+            throw new RuntimeException("库存ID不能为空");
+        }
+        return stockId + "-" + (basStockDetailMapper.countBasStockDetailByStockId(stockId) + 1);
+    }
+
     private void refreshStockSummary(List<String> stockIds)
     {
         if (stockIds == null || stockIds.isEmpty())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/controller/InMydoJobController.java
index 11ce25d..9e7a718 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/controller/InMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/job/controller/InMydoJobController.java
@@ -4,8 +4,10 @@ import java.util.List;
 
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.in.job.domain.MydoJob;
 import com.ruoyi.in.job.service.IMydoJobService;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,14 +48,39 @@ public class InMydoJobController extends BaseController
     {
         startPage();
         List<MydoJob> list;
-        if(StringUtils.isEmpty(mydoJob.getStatus()) || Convert.toInt(mydoJob.getStatus())<4){
-            list = mydoJobService.selectInMydoJobList(mydoJob);
-        }else {
+        if (isHistoryQuery(mydoJob) || (StringUtils.isNotEmpty(mydoJob.getStatus()) && Convert.toInt(mydoJob.getStatus()) >= 4)){
             list = mydoJobService.selectInMydoJobFinishList(mydoJob);
+        }else {
+            list = mydoJobService.selectInMydoJobList(mydoJob);
         }
         return getDataTable(list);
     }
 
+    /**
+     * 导出入库作业信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:job:export')")
+    @Log(title = "入库作业信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MydoJob mydoJob)
+    {
+        List<MydoJob> list;
+        if (isHistoryQuery(mydoJob) || (StringUtils.isNotEmpty(mydoJob.getStatus()) && Convert.toInt(mydoJob.getStatus()) >= 4)) {
+            list = mydoJobService.selectInMydoJobFinishList(mydoJob);
+        } else {
+            list = mydoJobService.selectInMydoJobList(mydoJob);
+        }
+        ExcelUtil<MydoJob> util = new ExcelUtil<MydoJob>(MydoJob.class);
+        util.exportExcel(response, list, "入库作业信息数据");
+    }
+
+    private boolean isHistoryQuery(MydoJob mydoJob)
+    {
+        return mydoJob != null
+                && mydoJob.getParams() != null
+                && "true".equalsIgnoreCase(Convert.toStr(mydoJob.getParams().get("history")));
+    }
+
     /**
      * 获取作业信息详细信息
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/mapper/MydoJobMapper.java
index e5589b8..55d3fde 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/mapper/MydoJobMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/job/mapper/MydoJobMapper.java
@@ -78,6 +78,22 @@ public interface MydoJobMapper
      */
     List<String> selectStockinIdsByJobId(String jobId);
 
+    /**
+     * 查询出库作业关联的库存主表ID。
+     *
+     * @param jobId 作业ID
+     * @return 库存ID集合
+     */
+    List<String> selectStockIdsByJobId(String jobId);
+
+    /**
+     * 查询出库作业关联的出库子单ID。
+     *
+     * @param jobId 作业ID
+     * @return 出库子单ID集合
+     */
+    List<String> selectStockoutDetailIdsByJobId(String jobId);
+
     /**
      * 查询作业信息列表
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java
index b6538ed..7375c7b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java
@@ -141,12 +141,31 @@ public interface IMydoJobService
 
     /**
      * WCS 回调完成出库作业。
+     * <p>
+     * 标记作业已到达出库口并释放原货位；不执行出库完成存储过程，
+     * 库存扣减和作业归档仍由 PDA 扫码确认触发。
      *
      * @param jobId 作业ID
      * @return 处理结果
      */
     AjaxResult completeOutJobFromWcs(String jobId);
 
+    /**
+     * WCS 回调取货无货异常。
+     *
+     * @param jobId 出库作业ID
+     * @return 处理结果
+     */
+    AjaxResult handleWcsPickEmptyException(String jobId);
+
+    /**
+     * WCS 回调放货有货异常。
+     *
+     * @param jobId 入库作业ID
+     * @return 处理结果，data 为重新分配货位后的作业对象
+     */
+    AjaxResult handleWcsPutOccupiedException(String jobId);
+
     /**
      * 将未下发的出库作业推送到 WCS。
      *
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java
index 0dbe680..6c7cb77 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java
@@ -5,6 +5,10 @@ import java.util.List;
 
 import com.ruoyi.api.client.WcsClient;
 import com.ruoyi.api.domain.ApiResponse;
+import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
+import com.ruoyi.bas.stock.mapper.BasStockDetailMapper;
+import com.ruoyi.bas.stock.mapper.BasStockMapper;
 import com.ruoyi.bas.stationpoint.service.IBasStationPointService;
 import com.ruoyi.common.annotation.WarehouseScope;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,12 +16,17 @@ import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.in.jobdetail.mapper.MydoJobDetailMapper;
 import com.ruoyi.in.stockin.mapper.InStockinMapper;
+import com.ruoyi.out.stockout.mapper.OutStockoutMapper;
+import com.ruoyi.out.stockoutdetail.mapper.OutStockoutDetailMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.in.job.mapper.MydoJobMapper;
 import com.ruoyi.in.job.domain.MydoJob;
 import com.ruoyi.in.job.service.IMydoJobService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 /**
  * 作业信息Service业务层处理
@@ -37,6 +46,24 @@ public class MydoJobServiceImpl implements IMydoJobService
     @Autowired
     private IBasStationPointService basStationPointService;
 
+    @Autowired
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
+    @Autowired
+    private BasStockMapper basStockMapper;
+
+    @Autowired
+    private BasStockDetailMapper basStockDetailMapper;
+
+    @Autowired
+    private OutStockoutDetailMapper outStockoutDetailMapper;
+
+    @Autowired
+    private OutStockoutMapper outStockoutMapper;
+
+    @Autowired
+    private MydoJobDetailMapper mydoJobDetailMapper;
+
     @Autowired
     private WcsClient wcsClient;
 
@@ -146,7 +173,8 @@ public class MydoJobServiceImpl implements IMydoJobService
 
         MydoJob updateJob = new MydoJob();
         updateJob.setJobId(job.getJobId());
-        updateJob.setStatus("2");
+        updateJob.setStatus("3");
+        updateJob.setExecutionPhase("1");
         updateJob.setStartTime(DateUtils.getTime());
         if (mydoJobMapper.updateMydoJob(updateJob) <= 0) {
             return AjaxResult.error("出库作业状态更新失败");
@@ -227,6 +255,10 @@ public class MydoJobServiceImpl implements IMydoJobService
     public AjaxResult cancelJob(String jobId,String type)
     {
         MydoJob job = mydoJobMapper.selectMydoJobByJobId(jobId);
+        AjaxResult wcsCancelResult = requestWcsCancelBeforeManualCancel(job);
+        if (wcsCancelResult.isError()) {
+            return wcsCancelResult;
+        }
         if ("1".equals(type)){
             HashMap<String, Object> map = new HashMap<>();
             map.put("v_job_id", jobId);
@@ -251,6 +283,27 @@ public class MydoJobServiceImpl implements IMydoJobService
         return AjaxResult.error();
     }
 
+    private AjaxResult requestWcsCancelBeforeManualCancel(MydoJob job)
+    {
+        if (job == null) {
+            return AjaxResult.error("作业不存在");
+        }
+        if (!"2".equals(job.getStatus()) && !"3".equals(job.getStatus())) {
+            return AjaxResult.success();
+        }
+        String taskId = StringUtils.isEmpty(job.getTaskNo()) ? job.getJobId() : job.getTaskNo();
+        try {
+            ApiResponse<String> response = wcsClient.cancelTask(taskId);
+            if (response == null || !response.isSuccess()) {
+                String message = response == null ? "WCS接口无返回" : response.getMessage();
+                return AjaxResult.error("WCS拒绝作废：" + message);
+            }
+        } catch (RuntimeException e) {
+            return AjaxResult.error("WCS拒绝作废：" + e.getMessage());
+        }
+        return AjaxResult.success();
+    }
+
     /**
      * 手动完成作业
      *
@@ -306,6 +359,12 @@ public class MydoJobServiceImpl implements IMydoJobService
     public AjaxResult completeInJobFromWcs(String jobId)
     {
         MydoJob job = mydoJobMapper.selectMydoJobByJobId(jobId);
+        if (job == null) {
+            return AjaxResult.error("入库作业不存在");
+        }
+        if (!isInboundJob(job)) {
+            return AjaxResult.error("非法入库作业");
+        }
         List<String> stockinIds = mydoJobMapper.selectStockinIdsByJobId(jobId);
         HashMap<String, Object> map = new HashMap<>();
         map.put("job_id", jobId);
@@ -325,21 +384,163 @@ public class MydoJobServiceImpl implements IMydoJobService
 
     /**
      * WCS 回调完成出库作业。
+     * <p>
+     * 此时托盘已离开库位，货位状态在 WCS 完成回调中释放；PDA 确认不再负责释放货位。
      */
     @Override
     public AjaxResult completeOutJobFromWcs(String jobId)
     {
         MydoJob job = mydoJobMapper.selectMydoJobByJobId(jobId);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("v_job_id", jobId);
-        map.put("v_dept_id", 0);
-        map.put("v_user_id", 0);
-        mydoJobMapper.makeSure(map);
-        if (isProcedureSuccess(map.get("v_result"))){
-            releaseJobStationPoint(job);
+        if (job == null) {
+            return AjaxResult.error("出库作业不存在");
+        }
+        if (!isOutboundJob(job)) {
+            return AjaxResult.error("非法出库作业");
+        }
+
+        MydoJob updateJob = new MydoJob();
+        updateJob.setJobId(job.getJobId());
+        updateJob.setExecutionPhase("5");
+        if (mydoJobMapper.updateMydoJob(updateJob) <= 0) {
+            return AjaxResult.error("出库作业等待扫码确认状态更新失败");
+        }
+        AjaxResult releaseResult = releaseOutboundCargoSpace(job);
+        if (releaseResult.isError()) {
+            return releaseResult;
+        }
+        return AjaxResult.success("出库作业已到达出口，货位已释放，等待PDA扫码确认");
+    }
+
+    private boolean isInboundJob(MydoJob job)
+    {
+        return job != null && job.getInOrOut() != null && job.getInOrOut() < 20;
+    }
+
+    private boolean isOutboundJob(MydoJob job)
+    {
+        return job != null && job.getInOrOut() != null && job.getInOrOut() >= 20;
+    }
+
+    /**
+     * WCS 回调取货无货异常。
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult handleWcsPickEmptyException(String jobId)
+    {
+        if (StringUtils.isEmpty(jobId)) {
+            return AjaxResult.error("作业ID不能为空");
+        }
+        MydoJob job = mydoJobMapper.selectMydoJobByJobId(jobId);
+        if (job == null) {
+            return AjaxResult.error("出库作业不存在");
+        }
+        if (job.getInOrOut() == null || job.getInOrOut() < 20) {
+            return AjaxResult.error("请选择出库作业");
+        }
+        if (StringUtils.isEmpty(job.getCargoSpaceId())) {
+            return AjaxResult.error("出库作业货位不能为空");
+        }
+
+        List<String> stockIds = mydoJobMapper.selectStockIdsByJobId(jobId);
+        List<String> stockoutDetailIds = mydoJobMapper.selectStockoutDetailIdsByJobId(jobId);
+        if (basCargoSpaceMapper.markOutboundNeedCheck(job.getCargoSpaceId()) <= 0) {
+            return rollbackError("出库作业货位异常状态更新失败");
+        }
+        boolean hasStockDetails = stockIds != null && !stockIds.isEmpty();
+        boolean hasStockoutDetails = stockoutDetailIds != null && !stockoutDetailIds.isEmpty();
+        if (hasStockoutDetails) {
+            if (outStockoutDetailMapper.rollbackAllotByJobId(jobId) <= 0) {
+                return rollbackError("出库单据分配数量回滚失败");
+            }
+            outStockoutMapper.reopenOutStockoutByExceptionJobId(jobId);
+        }
+        if (hasStockDetails) {
+            String[] stockIdArray = stockIds.toArray(new String[0]);
+            basStockDetailMapper.deleteBasStockDetailByStockIds(stockIdArray);
+            if (basStockMapper.deleteBasStockByStockIds(stockIdArray) <= 0) {
+                return rollbackError("库存删除失败");
+            }
+        }
+        mydoJobDetailMapper.deleteMydoJobDetailByJobId(jobId);
+        if (mydoJobMapper.deleteMydoJobByJobId(jobId) <= 0) {
+            return rollbackError("作业作废失败");
+        }
+        releaseJobStationPoint(job);
+        return AjaxResult.success("取货无货异常处理完成");
+    }
+
+    /**
+     * WCS 回调放货有货异常。
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult handleWcsPutOccupiedException(String jobId)
+    {
+        if (StringUtils.isEmpty(jobId)) {
+            return AjaxResult.error("作业ID不能为空");
+        }
+        MydoJob job = mydoJobMapper.selectMydoJobByJobId(jobId);
+        if (job == null) {
+            return AjaxResult.error("入库作业不存在");
+        }
+        if (job.getInOrOut() == null || job.getInOrOut() >= 20) {
+            return AjaxResult.error("请选择入库作业");
+        }
+        if (StringUtils.isEmpty(job.getCargoSpaceId())) {
+            return AjaxResult.error("入库作业货位不能为空");
+        }
+        if (StringUtils.isEmpty(job.getWarehouseId()) || StringUtils.isEmpty(job.getRoadwayId())) {
+            return AjaxResult.error("入库作业仓库或巷道不能为空");
+        }
+
+        if (basCargoSpaceMapper.markInboundNeedCheck(job.getCargoSpaceId()) <= 0) {
+            return rollbackError("入库作业原货位异常状态更新失败");
+        }
+        BasCargoSpace cargoSpace = basCargoSpaceMapper.selectAvailableInboundCargoSpaceInRoadway(job);
+        if (cargoSpace == null) {
+            return rollbackError("相同巷道没有可用入库货位");
+        }
+
+        BasCargoSpace lockCargoSpace = new BasCargoSpace();
+        lockCargoSpace.setCargoSpaceId(cargoSpace.getCargoSpaceId());
+        lockCargoSpace.setStatus("3");
+        lockCargoSpace.setTrayCode(job.getTrayCode());
+        if (basCargoSpaceMapper.updateBasCargoSpace(lockCargoSpace) <= 0) {
+            return rollbackError("新入库货位锁定失败");
+        }
+
+        MydoJob updateJob = new MydoJob();
+        updateJob.setJobId(job.getJobId());
+        updateJob.setRoadwayId(cargoSpace.getRoadwayId());
+        updateJob.setCargoSpaceId(cargoSpace.getCargoSpaceId());
+        updateJob.setCargoSpaceName(cargoSpace.getCargoSpaceName());
+        if (mydoJobMapper.updateMydoJob(updateJob) <= 0) {
+            return rollbackError("入库作业货位更新失败");
+        }
+
+        MydoJob updatedJob = mydoJobMapper.selectMydoJobByJobId(jobId);
+        if (updatedJob == null) {
+            updatedJob = updateJob;
+        }
+        return AjaxResult.success("放货有货异常处理完成", updatedJob);
+    }
+
+    private AjaxResult releaseOutboundCargoSpace(MydoJob job)
+    {
+        if (job == null || StringUtils.isEmpty(job.getCargoSpaceId())) {
             return AjaxResult.success();
         }
-        return AjaxResult.error(Convert.toStr(map.get("v_resultmsg")));
+        if (basCargoSpaceMapper.releaseOutboundCargoSpace(job.getCargoSpaceId()) <= 0) {
+            return AjaxResult.error("出库作业货位释放失败");
+        }
+        return AjaxResult.success();
+    }
+
+    private AjaxResult rollbackError(String message)
+    {
+        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        return AjaxResult.error(message);
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/mapper/MydoJobDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/mapper/MydoJobDetailMapper.java
index f865a6c..80f7b10 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/mapper/MydoJobDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/mapper/MydoJobDetailMapper.java
@@ -59,5 +59,7 @@ public interface MydoJobDetailMapper
      */
     public int deleteMydoJobDetailByJobDetailIds(String[] jobDetailIds);
 
+    public int deleteMydoJobDetailByJobId(String jobId);
+
     List<MydoJobDetail> selectMydoJobDetailFinishList(MydoJobDetail mydoJobDetail);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
index fd138e1..308fa70 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
@@ -50,10 +50,10 @@ public class InStockinController extends BaseController
     {
         startPage();
         List<InStockin> list;
-        if (StringUtils.isEmpty(inStockin.getStatus()) || Convert.toInt(inStockin.getStatus())< 4){
-            list = inStockinService.selectInStockinList(inStockin);
-        }else {
+        if (isHistoryQuery(inStockin) || (StringUtils.isNotEmpty(inStockin.getStatus()) && Convert.toInt(inStockin.getStatus()) >= 4)){
             list = inStockinService.selectInStockinFinishList(inStockin);
+        }else {
+            list = inStockinService.selectInStockinList(inStockin);
         }
         return getDataTable(list);
     }
@@ -66,11 +66,23 @@ public class InStockinController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, InStockin inStockin)
     {
-        List<InStockin> list = inStockinService.selectInStockinList(inStockin);
+        List<InStockin> list;
+        if (isHistoryQuery(inStockin) || (StringUtils.isNotEmpty(inStockin.getStatus()) && Convert.toInt(inStockin.getStatus()) >= 4)) {
+            list = inStockinService.selectInStockinFinishList(inStockin);
+        } else {
+            list = inStockinService.selectInStockinList(inStockin);
+        }
         ExcelUtil<InStockin> util = new ExcelUtil<InStockin>(InStockin.class);
         util.exportExcel(response, list, "入库单据主信息数据");
     }
 
+    private boolean isHistoryQuery(InStockin inStockin)
+    {
+        return inStockin != null
+                && inStockin.getParams() != null
+                && "true".equalsIgnoreCase(Convert.toStr(inStockin.getParams().get("history")));
+    }
+
     /**
      * 获取入库单据主信息详细信息
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
index 363ffa3..38f65b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -12,6 +12,7 @@ import com.ruoyi.common.annotation.WarehouseScope;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -150,12 +151,26 @@ public class InStockinServiceImpl implements IInStockinService
                 }
                 // 关联主单ID
                 detail.setStockinId(saveDTO.getStockinId());
+                normalizeProductFields(detail);
                 inStockinDetailMapper.insertInStockinDetail(detail);
             }
         }
         return saveDTO.getStockinId();
     }
 
+    private void normalizeProductFields(InStockinDetail detail)
+    {
+        if (detail == null) {
+            return;
+        }
+        if (StringUtils.isNotEmpty(detail.getItemCod())) {
+            detail.setProductId(detail.getItemCod());
+        }
+        if (StringUtils.isNotEmpty(detail.getItemNam())) {
+            detail.setProductName(detail.getItemNam());
+        }
+    }
+
     /**
      * 手动作废入库单据
      *
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
index adb191a..b9cf1a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
+import java.util.function.Function;
 
 /**
  * KPI Service实现
@@ -45,6 +45,8 @@ public class KpiServiceImpl implements KpiService {
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
+    private static final String UNASSIGNED_ROADWAY = "未分配";
+
     @Override
     public Map<String, Object> selectInboundTrend(InAnalysisDataQuery query) {
         query.setStartTime(query.getStartTime()+" 00:00:00");
@@ -55,40 +57,12 @@ public class KpiServiceImpl implements KpiService {
         // 2. 获取时间范围内所有日期（x轴）
         List<String> dateListBetween = DateUtils.getDateListBetween(query.getStartTime(), query.getEndTime());
 
-        // 3. 按 巷道ID 分组
-        Map<String, List<InAnalysisData>> roadwayMap = list.stream()
-                .collect(Collectors.groupingBy(InAnalysisData::getRoadwayId));
-
-        // 4. 组装 series
-        List<Map<String, Object>> seriesList = new ArrayList<>();
-
-        for (Map.Entry<String, List<InAnalysisData>> entry : roadwayMap.entrySet()) {
-            String roadwayId = entry.getKey(); // 巷道ID
-            List<InAnalysisData> dataList = entry.getValue();
-
-            // 把数据转成 Map<日期, 数量> 方便查找
-            Map<String, Long> dateCountMap = dataList.stream()
-                    .collect(Collectors.toMap(InAnalysisData::getDateDay, InAnalysisData::getCount));
-
-            // 遍历所有日期，没有数据补 0
-            List<Long> countList = new ArrayList<>();
-            for (String date : dateListBetween) {
-                countList.add(dateCountMap.getOrDefault(date, 0L));
-            }
-
-            // 构造 series 项
-            Map<String, Object> series = new HashMap<>();
-            series.put("name", "巷道"+roadwayId); // 巷道1、巷道2...
-            series.put("data", countList);
-            seriesList.add(series);
-        }
-
-        // 5. 组装最终返回结构
-        Map<String, Object> result = new HashMap<>();
-        result.put("xAxis", dateListBetween);
-        result.put("series", seriesList);
-
-        return result; // ← 这里返回，不是return null
+        return buildRoadwayTrend(
+                list,
+                dateListBetween,
+                InAnalysisData::getRoadwayId,
+                InAnalysisData::getDateDay,
+                InAnalysisData::getCount);
     }
 
 
@@ -103,40 +77,58 @@ public class KpiServiceImpl implements KpiService {
         // 2. 获取时间范围内所有日期（x轴）
         List<String> dateListBetween = DateUtils.getDateListBetween(query.getStartTime(), query.getEndTime());
 
-        // 3. 按 巷道ID 分组
-        Map<String, List<OutAnalysisData>> roadwayMap = list.stream()
-                .collect(Collectors.groupingBy(OutAnalysisData::getRoadwayId));
+        return buildRoadwayTrend(
+                list,
+                dateListBetween,
+                OutAnalysisData::getRoadwayId,
+                OutAnalysisData::getDateDay,
+                OutAnalysisData::getCount);
+    }
+
+    private <T> Map<String, Object> buildRoadwayTrend(List<T> list,
+                                                      List<String> dateListBetween,
+                                                      Function<T, String> roadwayGetter,
+                                                      Function<T, String> dateGetter,
+                                                      Function<T, Long> countGetter) {
+        Map<String, Map<String, Long>> roadwayDateCountMap = new LinkedHashMap<>();
+        if (list != null) {
+            for (T item : list) {
+                String dateDay = dateGetter.apply(item);
+                if (dateDay == null || dateDay.trim().isEmpty()) {
+                    continue;
+                }
+                String roadwayId = normalizeRoadwayId(roadwayGetter.apply(item));
+                Long count = countGetter.apply(item);
+                roadwayDateCountMap
+                        .computeIfAbsent(roadwayId, key -> new LinkedHashMap<>())
+                        .merge(dateDay, count == null ? 0L : count, Long::sum);
+            }
+        }
 
-        // 4. 组装 series
         List<Map<String, Object>> seriesList = new ArrayList<>();
-
-        for (Map.Entry<String, List<OutAnalysisData>> entry : roadwayMap.entrySet()) {
-            String roadwayId = entry.getKey(); // 巷道ID
-            List<OutAnalysisData> dataList = entry.getValue();
-
-            // 把数据转成 Map<日期, 数量> 方便查找
-            Map<String, Long> dateCountMap = dataList.stream()
-                    .collect(Collectors.toMap(OutAnalysisData::getDateDay, OutAnalysisData::getCount));
-
-            // 遍历所有日期，没有数据补 0
+        for (Map.Entry<String, Map<String, Long>> entry : roadwayDateCountMap.entrySet()) {
             List<Long> countList = new ArrayList<>();
             for (String date : dateListBetween) {
-                countList.add(dateCountMap.getOrDefault(date, 0L));
+                countList.add(entry.getValue().getOrDefault(date, 0L));
             }
 
-            // 构造 series 项
             Map<String, Object> series = new HashMap<>();
-            series.put("name", "巷道"+roadwayId); // 巷道1、巷道2...
+            series.put("name", "巷道" + entry.getKey());
             series.put("data", countList);
             seriesList.add(series);
         }
 
-        // 5. 组装最终返回结构
         Map<String, Object> result = new HashMap<>();
         result.put("xAxis", dateListBetween);
         result.put("series", seriesList);
+        return result;
+    }
 
-        return result; // ← 这里返回，不是return null
+    private String normalizeRoadwayId(String roadwayId) {
+        if (roadwayId == null || roadwayId.trim().isEmpty()) {
+            return UNASSIGNED_ROADWAY;
+        }
+        return roadwayId.trim();
     }
 
     @Override
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/job/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/job/controller/OutMydoJobController.java
index ba4964b..b1b0657 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/job/controller/OutMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/job/controller/OutMydoJobController.java
@@ -4,8 +4,10 @@ import java.util.List;
 
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.in.job.domain.MydoJob;
 import com.ruoyi.in.job.service.IMydoJobService;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,14 +46,39 @@ public class OutMydoJobController extends BaseController
     {
         startPage();
         List<MydoJob> list;
-        if (StringUtils.isEmpty(mydoJob.getStatus()) || Convert.toInt(mydoJob.getStatus())<4){
-            list = mydoJobService.selectOutMydoJobList(mydoJob);
-        }else {
+        if (isHistoryQuery(mydoJob) || (StringUtils.isNotEmpty(mydoJob.getStatus()) && Convert.toInt(mydoJob.getStatus()) >= 4)){
             list = mydoJobService.selectOutMydoJobFinishList(mydoJob);
+        }else {
+            list = mydoJobService.selectOutMydoJobList(mydoJob);
         }
         return getDataTable(list);
     }
 
+    /**
+     * 导出出库作业信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('out:job:export')")
+    @Log(title = "出库作业信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MydoJob mydoJob)
+    {
+        List<MydoJob> list;
+        if (isHistoryQuery(mydoJob) || (StringUtils.isNotEmpty(mydoJob.getStatus()) && Convert.toInt(mydoJob.getStatus()) >= 4)) {
+            list = mydoJobService.selectOutMydoJobFinishList(mydoJob);
+        } else {
+            list = mydoJobService.selectOutMydoJobList(mydoJob);
+        }
+        ExcelUtil<MydoJob> util = new ExcelUtil<MydoJob>(MydoJob.class);
+        util.exportExcel(response, list, "出库作业信息数据");
+    }
+
+    private boolean isHistoryQuery(MydoJob mydoJob)
+    {
+        return mydoJob != null
+                && mydoJob.getParams() != null
+                && "true".equalsIgnoreCase(Convert.toStr(mydoJob.getParams().get("history")));
+    }
+
     /**
      * 获取作业信息详细信息
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/location/controller/LocationOutboundController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/location/controller/LocationOutboundController.java
new file mode 100644
index 0000000..87f5d84
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/location/controller/LocationOutboundController.java
@@ -0,0 +1,53 @@
+package com.ruoyi.out.location.controller;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.out.location.domain.LocationOutboundGenerateRequest;
+import com.ruoyi.out.location.domain.LocationOutboundStock;
+import com.ruoyi.out.location.service.ILocationOutboundService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 指定货位出库Controller。
+ */
+@RestController
+@RequestMapping("/out/locationOutbound")
+public class LocationOutboundController extends BaseController
+{
+    @Autowired
+    private ILocationOutboundService locationOutboundService;
+
+    /**
+     * 查询货位库存列表。
+     */
+    @PreAuthorize("@ss.hasPermi('out:locationOutbound:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LocationOutboundStock query)
+    {
+        startPage();
+        List<LocationOutboundStock> list = locationOutboundService.selectLocationOutboundStockList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 按选中货位整托生成出库作业。
+     */
+    @PreAuthorize("@ss.hasPermi('out:locationOutbound:generate')")
+    @Log(title = "指定货位出库", businessType = BusinessType.INSERT)
+    @PostMapping("/generate")
+    public AjaxResult generate(@RequestBody LocationOutboundGenerateRequest request)
+    {
+        return success(locationOutboundService.generateWholeTrayOutboundJob(request));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/location/domain/LocationOutboundGenerateRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/out/location/domain/LocationOutboundGenerateRequest.java
new file mode 100644
index 0000000..a055b7e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/location/domain/LocationOutboundGenerateRequest.java
@@ -0,0 +1,35 @@
+package com.ruoyi.out.location.domain;
+
+/**
+ * 指定货位出库作业生成参数。
+ */
+public class LocationOutboundGenerateRequest
+{
+    private String stockId;
+    private String cargoSpaceId;
+    private String exitId;
+
+    public String getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
+    }
+
+    public String getCargoSpaceId() {
+        return cargoSpaceId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getExitId() {
+        return exitId;
+    }
+
+    public void setExitId(String exitId) {
+        this.exitId = exitId;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/location/domain/LocationOutboundStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/location/domain/LocationOutboundStock.java
new file mode 100644
index 0000000..f8b58ec
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/location/domain/LocationOutboundStock.java
@@ -0,0 +1,290 @@
+package com.ruoyi.out.location.domain;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.bas.stock.domain.BasStockDetail;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 指定货位出库库存视图。
+ */
+public class LocationOutboundStock extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private String cargoSpaceId;
+    private String cargoSpaceName;
+    private String cargoSpaceStatus;
+    private String locked;
+    private String warehouseId;
+    private String warehouseName;
+    private String roadwayId;
+    private Long thePlatoon;
+    private Long theColumn;
+    private Long theFloor;
+    private String theType;
+    private String theTypeName;
+    private String stockId;
+    private String stockStatus;
+    private String trayCode;
+    private String trayType;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inDate;
+    private String stockinId;
+    private String inType;
+    private String supplierId;
+    private String supplierName;
+    private Integer detailCount;
+    private BigDecimal quantity;
+    private BigDecimal outQuantity;
+    private BigDecimal availableQuantity;
+    private String productId;
+    private String productName;
+    private String lotNo;
+    private Boolean showEmpty;
+    private List<BasStockDetail> details = new ArrayList<>();
+
+    public String getCargoSpaceId() {
+        return cargoSpaceId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceName() {
+        return cargoSpaceName;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getCargoSpaceStatus() {
+        return cargoSpaceStatus;
+    }
+
+    public void setCargoSpaceStatus(String cargoSpaceStatus) {
+        this.cargoSpaceStatus = cargoSpaceStatus;
+    }
+
+    public String getLocked() {
+        return locked;
+    }
+
+    public void setLocked(String locked) {
+        this.locked = locked;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public Long getThePlatoon() {
+        return thePlatoon;
+    }
+
+    public void setThePlatoon(Long thePlatoon) {
+        this.thePlatoon = thePlatoon;
+    }
+
+    public Long getTheColumn() {
+        return theColumn;
+    }
+
+    public void setTheColumn(Long theColumn) {
+        this.theColumn = theColumn;
+    }
+
+    public Long getTheFloor() {
+        return theFloor;
+    }
+
+    public void setTheFloor(Long theFloor) {
+        this.theFloor = theFloor;
+    }
+
+    public String getTheType() {
+        return theType;
+    }
+
+    public void setTheType(String theType) {
+        this.theType = theType;
+    }
+
+    public String getTheTypeName() {
+        return theTypeName;
+    }
+
+    public void setTheTypeName(String theTypeName) {
+        this.theTypeName = theTypeName;
+    }
+
+    public String getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
+    }
+
+    public String getStockStatus() {
+        return stockStatus;
+    }
+
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getTrayCode() {
+        return trayCode;
+    }
+
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
+    }
+
+    public String getTrayType() {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType) {
+        this.trayType = trayType;
+    }
+
+    public Date getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(Date inDate) {
+        this.inDate = inDate;
+    }
+
+    public String getStockinId() {
+        return stockinId;
+    }
+
+    public void setStockinId(String stockinId) {
+        this.stockinId = stockinId;
+    }
+
+    public String getInType() {
+        return inType;
+    }
+
+    public void setInType(String inType) {
+        this.inType = inType;
+    }
+
+    public String getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(String supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public Integer getDetailCount() {
+        return detailCount;
+    }
+
+    public void setDetailCount(Integer detailCount) {
+        this.detailCount = detailCount;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getOutQuantity() {
+        return outQuantity;
+    }
+
+    public void setOutQuantity(BigDecimal outQuantity) {
+        this.outQuantity = outQuantity;
+    }
+
+    public BigDecimal getAvailableQuantity() {
+        return availableQuantity;
+    }
+
+    public void setAvailableQuantity(BigDecimal availableQuantity) {
+        this.availableQuantity = availableQuantity;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public Boolean getShowEmpty() {
+        return showEmpty;
+    }
+
+    public void setShowEmpty(Boolean showEmpty) {
+        this.showEmpty = showEmpty;
+    }
+
+    public List<BasStockDetail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<BasStockDetail> details) {
+        this.details = details;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/location/mapper/LocationOutboundMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/location/mapper/LocationOutboundMapper.java
new file mode 100644
index 0000000..7cfbe08
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/location/mapper/LocationOutboundMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.out.location.mapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.ruoyi.bas.stock.domain.BasStockDetail;
+import com.ruoyi.out.location.domain.LocationOutboundStock;
+
+/**
+ * 指定货位出库Mapper。
+ */
+public interface LocationOutboundMapper
+{
+    List<LocationOutboundStock> selectLocationOutboundStockList(LocationOutboundStock query);
+
+    List<BasStockDetail> selectLocationOutboundDetailsByStockIds(String[] stockIds);
+
+    LocationOutboundStock selectLocationOutboundStockForUpdate(String stockId);
+
+    LocationOutboundStock selectLocationOutboundLocationForUpdate(String cargoSpaceId);
+
+    List<BasStockDetail> selectAvailableDetailsForUpdate(String stockId);
+
+    int reserveStockDetailForOutbound(HashMap<String, Object> map);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/location/service/ILocationOutboundService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/location/service/ILocationOutboundService.java
new file mode 100644
index 0000000..69e18e6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/location/service/ILocationOutboundService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.out.location.service;
+
+import java.util.List;
+
+import com.ruoyi.out.location.domain.LocationOutboundGenerateRequest;
+import com.ruoyi.out.location.domain.LocationOutboundStock;
+
+/**
+ * 指定货位出库服务。
+ */
+public interface ILocationOutboundService
+{
+    List<LocationOutboundStock> selectLocationOutboundStockList(LocationOutboundStock query);
+
+    String generateWholeTrayOutboundJob(LocationOutboundGenerateRequest request);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/location/service/impl/LocationOutboundServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/location/service/impl/LocationOutboundServiceImpl.java
new file mode 100644
index 0000000..a49b4a3
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/location/service/impl/LocationOutboundServiceImpl.java
@@ -0,0 +1,310 @@
+package com.ruoyi.out.location.service.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
+import com.ruoyi.bas.id.job.service.JobIdService;
+import com.ruoyi.bas.id.taskno.service.TaskNoService;
+import com.ruoyi.bas.stationpoint.domain.BasStationPoint;
+import com.ruoyi.bas.stationpoint.service.IBasStationPointService;
+import com.ruoyi.bas.stock.domain.BasStockDetail;
+import com.ruoyi.bas.stock.mapper.BasStockMapper;
+import com.ruoyi.common.annotation.WarehouseScope;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.in.job.domain.MydoJob;
+import com.ruoyi.in.job.service.IMydoJobService;
+import com.ruoyi.in.jobdetail.domain.MydoJobDetail;
+import com.ruoyi.in.jobdetail.service.IMydoJobDetailService;
+import com.ruoyi.out.location.domain.LocationOutboundGenerateRequest;
+import com.ruoyi.out.location.domain.LocationOutboundStock;
+import com.ruoyi.out.location.mapper.LocationOutboundMapper;
+import com.ruoyi.out.location.service.ILocationOutboundService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 指定货位出库服务实现。
+ */
+@Service
+public class LocationOutboundServiceImpl implements ILocationOutboundService
+{
+    @Autowired
+    private LocationOutboundMapper locationOutboundMapper;
+
+    @Autowired
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
+    @Autowired
+    private BasStockMapper basStockMapper;
+
+    @Autowired
+    private IBasStationPointService basStationPointService;
+
+    @Autowired
+    private IMydoJobService mydoJobService;
+
+    @Autowired
+    private IMydoJobDetailService mydoJobDetailService;
+
+    @Autowired
+    private JobIdService jobIdService;
+
+    @Autowired
+    private TaskNoService taskNoService;
+
+    @Override
+    @WarehouseScope(warehouseField = "bcs.warehouse_id")
+    public List<LocationOutboundStock> selectLocationOutboundStockList(LocationOutboundStock query)
+    {
+        List<LocationOutboundStock> rows = locationOutboundMapper.selectLocationOutboundStockList(query);
+        if (rows == null || rows.isEmpty()) {
+            return rows;
+        }
+        List<String> stockIds = rows.stream()
+            .map(LocationOutboundStock::getStockId)
+            .filter(StringUtils::isNotEmpty)
+            .distinct()
+            .collect(Collectors.toList());
+        if (stockIds.isEmpty()) {
+            return rows;
+        }
+        List<BasStockDetail> details = locationOutboundMapper.selectLocationOutboundDetailsByStockIds(stockIds.toArray(new String[0]));
+        Map<String, List<BasStockDetail>> detailMap = details == null ? new HashMap<>() :
+            details.stream().collect(Collectors.groupingBy(BasStockDetail::getStockId));
+        for (LocationOutboundStock row : rows) {
+            if (StringUtils.isNotEmpty(row.getStockId())) {
+                row.setDetails(detailMap.getOrDefault(row.getStockId(), new ArrayList<>()));
+            }
+        }
+        return rows;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String generateWholeTrayOutboundJob(LocationOutboundGenerateRequest request)
+    {
+        checkRequest(request);
+        LocationOutboundStock stock = selectOutboundLocationForUpdate(request);
+        boolean emptyLocation = StringUtils.isEmpty(stock.getStockId());
+        if (emptyLocation) {
+            checkEmptyLocation(stock);
+        } else {
+            checkStock(stock);
+        }
+
+        BasStationPoint exitPoint = validateExitPoint(request.getExitId(), stock);
+        String jobId = jobIdService.getId("CK");
+        String taskNo = taskNoService.getTaskNo("20");
+        MydoJob job = buildOutboundJob(jobId, taskNo, stock, exitPoint);
+        if (mydoJobService.insertMydoJob(job) <= 0) {
+            throw new RuntimeException("指定货位出库作业生成失败");
+        }
+
+        if (emptyLocation) {
+            if (basCargoSpaceMapper.markOutboundAssignedByCargoSpaceId(stock.getCargoSpaceId()) <= 0) {
+                throw new RuntimeException("当前货位已被占用，请刷新后重试");
+            }
+        } else {
+            List<BasStockDetail> details = locationOutboundMapper.selectAvailableDetailsForUpdate(stock.getStockId());
+            if (details == null || details.isEmpty()) {
+                throw new RuntimeException("当前托盘无可出库库存明细");
+            }
+
+            int index = 1;
+            BigDecimal totalQuantity = BigDecimal.ZERO;
+            for (BasStockDetail detail : details) {
+                BigDecimal availableQuantity = availableQuantity(detail);
+                if (availableQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                    continue;
+                }
+                String jobDetailId = jobId + "-" + index++;
+                MydoJobDetail jobDetail = buildOutboundJobDetail(job, jobDetailId, stock, detail, availableQuantity);
+                if (mydoJobDetailService.insertMydoJobDetail(jobDetail) <= 0) {
+                    throw new RuntimeException("指定货位出库作业明细生成失败");
+                }
+                HashMap<String, Object> reserveMap = new HashMap<>();
+                reserveMap.put("stockDetailId", detail.getDetailId());
+                reserveMap.put("stockId", detail.getStockId());
+                reserveMap.put("jobDetailId", jobDetailId);
+                reserveMap.put("quantity", availableQuantity);
+                if (locationOutboundMapper.reserveStockDetailForOutbound(reserveMap) <= 0) {
+                    throw new RuntimeException("库存已被占用，请刷新后重试");
+                }
+                totalQuantity = totalQuantity.add(availableQuantity);
+            }
+            if (totalQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                throw new RuntimeException("当前托盘无可出库库存明细");
+            }
+
+            basStockMapper.refreshBasStockSummary(stock.getStockId());
+            basCargoSpaceMapper.markOutboundAssignedByStockId(stock.getStockId());
+        }
+
+        AjaxResult pushResult = mydoJobService.pushOutJobToWcs(jobId);
+        if (pushResult == null || pushResult.isError()) {
+            throw new RuntimeException(pushResult == null ? "WCS出库作业下发失败" : Convert.toStr(pushResult.get(AjaxResult.MSG_TAG)));
+        }
+        return "指定货位出库作业生成成功：" + jobId + "；" + Convert.toStr(pushResult.get(AjaxResult.MSG_TAG));
+    }
+
+    private void checkRequest(LocationOutboundGenerateRequest request)
+    {
+        if (request == null || (StringUtils.isEmpty(request.getStockId()) && StringUtils.isEmpty(request.getCargoSpaceId()))) {
+            throw new RuntimeException("请选择要出库的货位");
+        }
+        if (StringUtils.isEmpty(request.getExitId())) {
+            throw new RuntimeException("请选择出库口");
+        }
+    }
+
+    private LocationOutboundStock selectOutboundLocationForUpdate(LocationOutboundGenerateRequest request)
+    {
+        LocationOutboundStock stock = StringUtils.isNotEmpty(request.getStockId())
+            ? locationOutboundMapper.selectLocationOutboundStockForUpdate(request.getStockId())
+            : locationOutboundMapper.selectLocationOutboundLocationForUpdate(request.getCargoSpaceId());
+        if (stock == null || StringUtils.isEmpty(stock.getCargoSpaceId())) {
+            throw new RuntimeException("货位不存在或已出库");
+        }
+        return stock;
+    }
+
+    private void checkStock(LocationOutboundStock stock)
+    {
+        if (stock == null || StringUtils.isEmpty(stock.getStockId())) {
+            throw new RuntimeException("库存不存在或已出库");
+        }
+        if (!"2".equals(stock.getCargoSpaceStatus())) {
+            if ("4".equals(stock.getCargoSpaceStatus())) {
+                throw new RuntimeException("当前货位已生成出库作业");
+            }
+            throw new RuntimeException("当前货位不是库内有库存状态");
+        }
+        if (stock.getAvailableQuantity() == null || stock.getAvailableQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+            throw new RuntimeException("当前托盘无可出库库存");
+        }
+    }
+
+    private void checkEmptyLocation(LocationOutboundStock stock)
+    {
+        if (stock == null || StringUtils.isEmpty(stock.getCargoSpaceId())) {
+            throw new RuntimeException("货位不存在");
+        }
+        String status = stock.getCargoSpaceStatus();
+        if ("4".equals(status)) {
+            throw new RuntimeException("当前货位已生成出库作业");
+        }
+        if (!"1".equals(status) && !"6".equals(status)) {
+            throw new RuntimeException("当前货位不是可生成作业的空货位");
+        }
+    }
+
+    private BasStationPoint validateExitPoint(String exitId, LocationOutboundStock stock)
+    {
+        BasStationPoint point = basStationPointService.selectBasStationPointByPointId(exitId);
+        if (point == null) {
+            throw new RuntimeException("出库口不存在");
+        }
+        if (StringUtils.isEmpty(stock.getWarehouseId()) || !stock.getWarehouseId().equals(point.getWarehouseId())) {
+            throw new RuntimeException("出库口不属于当前仓库");
+        }
+        if (!"2".equals(point.getPointType()) && !"3".equals(point.getPointType())) {
+            throw new RuntimeException("请选择出库或入出库点位");
+        }
+        if (!"0".equals(point.getStatus())) {
+            throw new RuntimeException("出库口已禁用");
+        }
+        String pointStatus = StringUtils.isEmpty(point.getPointStatus()) ? "0" : point.getPointStatus();
+        if (!"0".equals(pointStatus)) {
+            throw new RuntimeException("出库口已被分配");
+        }
+        if (StringUtils.isNotEmpty(stock.getTrayType()) && StringUtils.isNotEmpty(point.getTrayType())
+            && !supportsTrayType(point.getTrayType(), stock.getTrayType())) {
+            throw new RuntimeException("出库口不支持当前托盘类型");
+        }
+        return point;
+    }
+
+    private boolean supportsTrayType(String pointTrayTypes, String trayType)
+    {
+        String[] values = pointTrayTypes.split(",");
+        for (String value : values) {
+            if (trayType.equalsIgnoreCase(value.trim())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private MydoJob buildOutboundJob(String jobId, String taskNo, LocationOutboundStock stock, BasStationPoint exitPoint)
+    {
+        MydoJob job = new MydoJob();
+        job.setJobId(jobId);
+        job.setTaskNo(StringUtils.isNotEmpty(taskNo) ? taskNo : jobId);
+        job.setInOrOut(20L);
+        job.setStatus("1");
+        job.setExecutionPhase("4");
+        job.setTrayCode(stock.getTrayCode());
+        job.setWarehouseId(stock.getWarehouseId());
+        job.setWarehouseName(stock.getWarehouseName());
+        job.setRoadwayId(stock.getRoadwayId());
+        job.setCargoSpaceId(stock.getCargoSpaceId());
+        job.setCargoSpaceName(stock.getCargoSpaceName());
+        job.setLineType("1");
+        job.setPriority(10L);
+        job.setHeight(BigDecimal.ZERO);
+        job.setWeight(BigDecimal.ZERO);
+        job.setExitId(exitPoint.getPointId());
+        copyLoginUser(job);
+        return job;
+    }
+
+    private MydoJobDetail buildOutboundJobDetail(MydoJob job, String jobDetailId, LocationOutboundStock stock,
+                                                 BasStockDetail detail, BigDecimal availableQuantity)
+    {
+        MydoJobDetail jobDetail = new MydoJobDetail();
+        jobDetail.setJobDetailId(jobDetailId);
+        jobDetail.setJobId(job.getJobId());
+        jobDetail.setStockId(detail.getStockId());
+        jobDetail.setLotNo(detail.getLotNo());
+        jobDetail.setInDate(DateUtils.getTime());
+        jobDetail.setProductId(detail.getProductId());
+        jobDetail.setProductName(detail.getProductName());
+        jobDetail.setStockQuantity(availableQuantity);
+        jobDetail.setOutQuantity(availableQuantity);
+        jobDetail.setStockinDetailId(detail.getDetailId());
+        jobDetail.setSupplierId(stock.getSupplierId());
+        jobDetail.setSupplierName(stock.getSupplierName());
+        return jobDetail;
+    }
+
+    private BigDecimal availableQuantity(BasStockDetail detail)
+    {
+        if (detail.getAvailableQuantity() != null) {
+            return detail.getAvailableQuantity();
+        }
+        BigDecimal quantity = detail.getQuantity() == null ? BigDecimal.ZERO : detail.getQuantity();
+        BigDecimal outQuantity = detail.getOutQuantity() == null ? BigDecimal.ZERO : detail.getOutQuantity();
+        return quantity.subtract(outQuantity);
+    }
+
+    private void copyLoginUser(MydoJob job)
+    {
+        try {
+            job.setUserId(SecurityUtils.getUserId());
+            job.setDeptId(SecurityUtils.getDeptId());
+            job.setUserName(SecurityUtils.getUsername());
+        } catch (RuntimeException ignored) {
+            // External callbacks and focused unit tests can run without login context.
+        }
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/controller/OutStockoutController.java
index c8b193b..15e4785 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/controller/OutStockoutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/controller/OutStockoutController.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.out.stockout.domain.OutStockoutAssignDTO;
 import com.ruoyi.out.stockout.domain.OutStockoutManualAssignDTO;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.WarehouseScope;
@@ -50,10 +52,10 @@ public class OutStockoutController extends BaseController
     {
         startPage();
         List<OutStockout> list;
-        if (StringUtils.isEmpty(outStockout.getStatus()) || Convert.toInt(outStockout.getStatus()) < 4){
-            list = outStockoutService.selectOutStockoutList(outStockout);
-        }else {
+        if (isHistoryQuery(outStockout) || (StringUtils.isNotEmpty(outStockout.getStatus()) && Convert.toInt(outStockout.getStatus()) >= 4)){
             list = outStockoutService.selectOutStockoutFinishList(outStockout);
+        }else {
+            list = outStockoutService.selectOutStockoutList(outStockout);
         }
         return getDataTable(list);
     }
@@ -66,11 +68,23 @@ public class OutStockoutController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, OutStockout outStockout)
     {
-        List<OutStockout> list = outStockoutService.selectOutStockoutList(outStockout);
+        List<OutStockout> list;
+        if (isHistoryQuery(outStockout) || (StringUtils.isNotEmpty(outStockout.getStatus()) && Convert.toInt(outStockout.getStatus()) >= 4)) {
+            list = outStockoutService.selectOutStockoutFinishList(outStockout);
+        } else {
+            list = outStockoutService.selectOutStockoutList(outStockout);
+        }
         ExcelUtil<OutStockout> util = new ExcelUtil<OutStockout>(OutStockout.class);
         util.exportExcel(response, list, "出库单据主信息数据");
     }
 
+    private boolean isHistoryQuery(OutStockout outStockout)
+    {
+        return outStockout != null
+                && outStockout.getParams() != null
+                && "true".equalsIgnoreCase(Convert.toStr(outStockout.getParams().get("history")));
+    }
+
     /**
      * 获取出库单据主信息详细信息
      */
@@ -153,9 +167,17 @@ public class OutStockoutController extends BaseController
     @PreAuthorize("@ss.hasPermi('out:stockout:autoAssign')")
     @Log(title = "出库单据主信息", businessType = BusinessType.UPDATE)
     @PutMapping("/autoAssign/{stockoutId}")
-    public AjaxResult autoAssign(@PathVariable("stockoutId") String stockoutId)
+    public AjaxResult autoAssign(@PathVariable("stockoutId") String stockoutId,
+                                 @RequestBody(required = false) OutStockoutAssignDTO assignDTO,
+                                 @RequestParam(value = "exitId", required = false) String exitId)
     {
-        return outStockoutService.autoAssignOutStockout(stockoutId);
+        if (assignDTO == null) {
+            assignDTO = new OutStockoutAssignDTO();
+        }
+        if (StringUtils.isNotEmpty(exitId)) {
+            assignDTO.setExitId(exitId);
+        }
+        return outStockoutService.autoAssignOutStockout(stockoutId, assignDTO);
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutAssignDTO.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutAssignDTO.java
new file mode 100644
index 0000000..8327a1c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutAssignDTO.java
@@ -0,0 +1,24 @@
+package com.ruoyi.out.stockout.domain;
+
+import java.util.Map;
+
+public class OutStockoutAssignDTO {
+    private String exitId;
+    private Map<String, String> exitByTrayType;
+
+    public String getExitId() {
+        return exitId;
+    }
+
+    public void setExitId(String exitId) {
+        this.exitId = exitId;
+    }
+
+    public Map<String, String> getExitByTrayType() {
+        return exitByTrayType;
+    }
+
+    public void setExitByTrayType(Map<String, String> exitByTrayType) {
+        this.exitByTrayType = exitByTrayType;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutManualAssignDTO.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutManualAssignDTO.java
index e3c1d3f..7162319 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutManualAssignDTO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutManualAssignDTO.java
@@ -1,9 +1,13 @@
 package com.ruoyi.out.stockout.domain;
 
 import java.util.List;
+import java.util.Map;
 
 public class OutStockoutManualAssignDTO {
     private String stockoutDetailId;
+    private String exitId;
+    private Map<String, String> exitByTrayType;
+    private Map<String, String> exitByStockId;
     private List<String> stockIdList;
 
     public String getStockoutDetailId() {
@@ -14,6 +18,30 @@ public class OutStockoutManualAssignDTO {
         this.stockoutDetailId = stockoutDetailId;
     }
 
+    public String getExitId() {
+        return exitId;
+    }
+
+    public void setExitId(String exitId) {
+        this.exitId = exitId;
+    }
+
+    public Map<String, String> getExitByTrayType() {
+        return exitByTrayType;
+    }
+
+    public void setExitByTrayType(Map<String, String> exitByTrayType) {
+        this.exitByTrayType = exitByTrayType;
+    }
+
+    public Map<String, String> getExitByStockId() {
+        return exitByStockId;
+    }
+
+    public void setExitByStockId(Map<String, String> exitByStockId) {
+        this.exitByStockId = exitByStockId;
+    }
+
     public List<String> getStockIdList() {
         return stockIdList;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/mapper/OutStockoutMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/mapper/OutStockoutMapper.java
index 37373fd..cc909ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/mapper/OutStockoutMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/mapper/OutStockoutMapper.java
@@ -82,4 +82,12 @@ public interface OutStockoutMapper
      * @return
      */
     List<OutStockout> selectOutStockoutFinishList(OutStockout outStockout);
+
+    /**
+     * 取货无货异常作废最后一个活动作业后，将出库主单退回已审核状态。
+     *
+     * @param jobId 作业ID
+     * @return 结果
+     */
+    int reopenOutStockoutByExceptionJobId(String jobId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/IOutStockoutService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/IOutStockoutService.java
index f4d20d0..4b49fb0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/IOutStockoutService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/IOutStockoutService.java
@@ -2,6 +2,7 @@ package com.ruoyi.out.stockout.service;
 
 import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.out.stockout.domain.OutStockoutAssignDTO;
 import com.ruoyi.out.stockout.domain.OutStockout;
 import com.ruoyi.out.stockout.domain.OutStockoutManualAssignDTO;
 import com.ruoyi.out.stockout.domain.OutStockoutSaveDTO;
@@ -90,9 +91,19 @@ public interface IOutStockoutService
      * 自动分配出库单据
      *
      * @param stockoutId 出库单据主键
+     * @param exitId 出库口点位
      * @return 结果
      */
-    public AjaxResult autoAssignOutStockout(String stockoutId);
+    public AjaxResult autoAssignOutStockout(String stockoutId, String exitId);
+
+    /**
+     * 自动分配出库单据
+     *
+     * @param stockoutId 出库单据主键
+     * @param assignDTO 出库口分配信息
+     * @return 结果
+     */
+    public AjaxResult autoAssignOutStockout(String stockoutId, OutStockoutAssignDTO assignDTO);
 
     /**
      * 手动分配出库单据
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
index d58a073..bc438a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
@@ -1,14 +1,18 @@
 package com.ruoyi.out.stockout.service.impl;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.annotation.WarehouseScope;
 import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
 import com.ruoyi.in.job.domain.MydoJob;
 import com.ruoyi.in.job.service.IMydoJobService;
+import com.ruoyi.out.stockout.domain.OutStockoutAssignDTO;
 import com.ruoyi.out.stockout.domain.OutStockoutManualAssignDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,6 +21,7 @@ import com.ruoyi.bas.id.job.service.JobIdService;
 import com.ruoyi.common.OutStockoutStatusEnum;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.out.stockout.mapper.OutStockoutMapper;
 import com.ruoyi.out.stockout.domain.OutStockout;
@@ -49,6 +54,9 @@ public class OutStockoutServiceImpl implements IOutStockoutService
     @Autowired
     private IMydoJobService mydoJobService;
 
+    @Autowired
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
     /**
      * 查询出库单据主信息
      */
@@ -159,16 +167,47 @@ public class OutStockoutServiceImpl implements IOutStockoutService
      * 自动分配出库单据
      */
     @Override
-    public AjaxResult autoAssignOutStockout(String stockoutId)
+    public AjaxResult autoAssignOutStockout(String stockoutId, String exitId)
     {
+        OutStockoutAssignDTO assignDTO = new OutStockoutAssignDTO();
+        assignDTO.setExitId(exitId);
+        return autoAssignOutStockout(stockoutId, assignDTO);
+    }
+
+    /**
+     * 自动分配出库单据
+     */
+    @Override
+    public AjaxResult autoAssignOutStockout(String stockoutId, OutStockoutAssignDTO assignDTO)
+    {
+        if (assignDTO == null) {
+            assignDTO = new OutStockoutAssignDTO();
+        }
         StringBuilder str = new StringBuilder();
         List<OutStockoutDetail> details = outStockoutDetailMapper.selectOutStockoutDetailListByStockoutId(stockoutId);
+        if (details == null || details.isEmpty()) {
+            return AjaxResult.error("出库单据无明细");
+        }
+        List<String> allocatedDetailIds = new ArrayList<>();
         for (OutStockoutDetail detail : details) {
+            String exitId = resolveExitId(assignDTO.getExitId(), assignDTO.getExitByTrayType(), detail.getTrayType());
+            if (StringUtils.isEmpty(exitId)) {
+                return AjaxResult.error(buildMissingExitMessage(detail.getTrayType()));
+            }
             HashMap<String, Object> map = new HashMap<>();
             map.put("v_stockout_detail_id", detail.getStockoutDetailId());
+            map.put("v_exit_id", exitId);
             outStockoutMapper.autoAssignOutStockoutByProc(map);
-            str.append(detail.getStockoutDetailId()).append(Convert.toStr(map.get("v_resultString"))).append("|");
-            AjaxResult pushResult = pushPendingOutJobs(detail.getStockoutDetailId());
+            String resultString = Convert.toStr(map.get("v_resultString"));
+            str.append(detail.getStockoutDetailId()).append(resultString).append("|");
+            if (!isProcedureSuccess(map)) {
+                return AjaxResult.error(detail.getStockoutDetailId() + resultString);
+            }
+            basCargoSpaceMapper.markOutboundAssignedByStockoutDetailId(detail.getStockoutDetailId());
+            allocatedDetailIds.add(detail.getStockoutDetailId());
+        }
+        for (String detailId : allocatedDetailIds) {
+            AjaxResult pushResult = pushPendingOutJobs(detailId);
             if (pushResult.isError()) {
                 return pushResult;
             }
@@ -182,14 +221,35 @@ public class OutStockoutServiceImpl implements IOutStockoutService
     @Override
     public AjaxResult manualAssignOutStockout(OutStockoutManualAssignDTO outStockoutManualAssignDTO)
     {
+        if (outStockoutManualAssignDTO == null) {
+            return AjaxResult.error("请选择出库口");
+        }
+        if (outStockoutManualAssignDTO.getStockIdList() == null || outStockoutManualAssignDTO.getStockIdList().isEmpty()) {
+            return AjaxResult.error("请选择要分配的库存");
+        }
         StringBuilder str = new StringBuilder();
+        List<String> allocatedDetailIds = new ArrayList<>();
         for (String stockId : outStockoutManualAssignDTO.getStockIdList()) {
+            String exitId = resolveManualExitId(outStockoutManualAssignDTO, stockId);
+            if (StringUtils.isEmpty(exitId)) {
+                return AjaxResult.error("请选择出库口");
+            }
             HashMap<String, Object> map = new HashMap<>();
             map.put("v_stockout_detail_id", outStockoutManualAssignDTO.getStockoutDetailId());
             map.put("v_stock_id", stockId);
+            map.put("v_exit_id", exitId);
             outStockoutMapper.manualAssignOutStockoutByProc(map);
-            str.append(outStockoutManualAssignDTO.getStockoutDetailId()).append("|").append(stockId).append(Convert.toStr(map.get("v_resultString"))).append("|");
-            AjaxResult pushResult = pushPendingOutJobs(outStockoutManualAssignDTO.getStockoutDetailId());
+            String resultString = Convert.toStr(map.get("v_resultString"));
+            str.append(outStockoutManualAssignDTO.getStockoutDetailId()).append("|").append(stockId).append(resultString).append("|");
+            if (!isProcedureSuccess(map)) {
+                return AjaxResult.error(outStockoutManualAssignDTO.getStockoutDetailId() + "|" + stockId + resultString);
+            }
+            basCargoSpaceMapper.markOutboundAssignedByStockRef(stockId);
+            basCargoSpaceMapper.markOutboundAssignedByStockoutDetailId(outStockoutManualAssignDTO.getStockoutDetailId());
+            allocatedDetailIds.add(outStockoutManualAssignDTO.getStockoutDetailId());
+        }
+        for (String detailId : allocatedDetailIds) {
+            AjaxResult pushResult = pushPendingOutJobs(detailId);
             if (pushResult.isError()) {
                 return pushResult;
             }
@@ -235,6 +295,38 @@ public class OutStockoutServiceImpl implements IOutStockoutService
         return saveDTO.getStockoutId();
     }
 
+    private boolean isProcedureSuccess(Map<String, Object> map)
+    {
+        return "10".equals(Convert.toStr(map.get("v_result")));
+    }
+
+    private String resolveManualExitId(OutStockoutManualAssignDTO assignDTO, String stockId)
+    {
+        if (assignDTO.getExitByStockId() != null && assignDTO.getExitByStockId().containsKey(stockId)) {
+            return assignDTO.getExitByStockId().get(stockId);
+        }
+        return resolveExitId(assignDTO.getExitId(), assignDTO.getExitByTrayType(), null);
+    }
+
+    private String resolveExitId(String defaultExitId, Map<String, String> exitByTrayType, String trayType)
+    {
+        if (StringUtils.isNotEmpty(trayType) && exitByTrayType != null && exitByTrayType.containsKey(trayType)) {
+            return exitByTrayType.get(trayType);
+        }
+        if (StringUtils.isEmpty(defaultExitId) && exitByTrayType != null && exitByTrayType.size() == 1) {
+            return exitByTrayType.values().iterator().next();
+        }
+        return defaultExitId;
+    }
+
+    private String buildMissingExitMessage(String trayType)
+    {
+        if (StringUtils.isNotEmpty(trayType)) {
+            return "请选择" + trayType + "类型托盘的出库口";
+        }
+        return "请选择出库口";
+    }
+
     @Override
     @WarehouseScope
     public List<OutStockout> selectOutStockoutFinishList(OutStockout outStockout) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/domain/OutStockoutDetail.java
index d1510bf..e7a68aa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/domain/OutStockoutDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/domain/OutStockoutDetail.java
@@ -101,6 +101,9 @@ public class OutStockoutDetail extends BaseEntity
     /** 分配库存明细ID */
     private String stockDetailId;
 
+    /** 托盘类型 */
+    private String trayType;
+
     public void setStatus(String status)
     {
         this.status = status;
@@ -131,6 +134,16 @@ public class OutStockoutDetail extends BaseEntity
         this.stockDetailId = stockDetailId;
     }
 
+    public String getTrayType()
+    {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType)
+    {
+        this.trayType = trayType;
+    }
+
     public void setStockoutDetailId(String stockoutDetailId) 
     {
         this.stockoutDetailId = stockoutDetailId;
@@ -345,6 +358,7 @@ public class OutStockoutDetail extends BaseEntity
             .append("remar", getRemar())
             .append("stockId", getStockId())
             .append("stockDetailId", getStockDetailId())
+            .append("trayType", getTrayType())
             .append("remark", getRemark())
             .toString();
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/mapper/OutStockoutDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/mapper/OutStockoutDetailMapper.java
index 96b3d3a..72e19ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/mapper/OutStockoutDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockoutdetail/mapper/OutStockoutDetailMapper.java
@@ -72,4 +72,12 @@ public interface OutStockoutDetailMapper
      * @return
      */
     List<OutStockoutDetail> selectOutStockoutDetailFinishList(OutStockoutDetail outStockoutDetail);
+
+    /**
+     * 按取货无货作业回滚出库子单分配数量。
+     *
+     * @param jobId 作业ID
+     * @return 结果
+     */
+    int rollbackAllotByJobId(String jobId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
index 55fd76e..c700cde 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
@@ -12,6 +12,7 @@ import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.sotckindetail.domain.InStockinDetail;
 import com.ruoyi.pda.domain.AddInJobRequest;
 import com.ruoyi.pda.domain.BindTrayRequest;
+import com.ruoyi.pda.domain.EmptyTrayOutboundRequest;
 import com.ruoyi.pda.service.PdaService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -151,6 +152,21 @@ public class PdaController extends BaseController {
         }
     }
 
+    /**
+     * PDA 空托入库：选择仓库、扫描托盘号、选择入库点位后直接生成空托入库作业。
+     */
+    @PostMapping("/emptyTrayInbound")
+    @PreAuthorize("@ss.hasPermi('in:job:add')")
+    @Log(title = "PDA空托入库并生成作业", businessType = BusinessType.INSERT)
+    public AjaxResult emptyTrayInbound(@Valid @RequestBody AddInJobRequest request) {
+        try {
+            String res = pdaService.addEmptyTrayInboundJob(request);
+            return AjaxResult.success(res);
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
     /**
      * 入库绑盘-查询物料信息
      * @param detailId
@@ -176,6 +192,47 @@ public class PdaController extends BaseController {
         return AjaxResult.success(pdaService.outboundTaskList(query));
     }
 
+    /**
+     * PDA 查询当前仓库库内空托按条码头分组的数量。
+     */
+    @GetMapping("/emptyTrayOutbound/count")
+    @PreAuthorize("@ss.hasPermi('out:job:list')")
+    public AjaxResult emptyTrayOutboundCount(String warehouseId) {
+        try {
+            return AjaxResult.success(pdaService.emptyTrayOutboundCount(warehouseId));
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * PDA 库存查询：扫描托盘码后查看托盘绑定的库存物料。
+     */
+    @GetMapping("/trayStock")
+    @PreAuthorize("@ss.hasPermi('bas:stock:list')")
+    public AjaxResult trayStock(String trayCode) {
+        try {
+            return AjaxResult.success(pdaService.trayStock(trayCode));
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * PDA 空托出库：按仓库、条码头类型和数量生成空托出库作业并下发 WCS。
+     */
+    @PostMapping("/emptyTrayOutbound")
+    @PreAuthorize("@ss.hasPermi('out:job:list')")
+    @Log(title = "PDA空托出库并下发WCS", businessType = BusinessType.INSERT)
+    public AjaxResult emptyTrayOutbound(@Valid @RequestBody EmptyTrayOutboundRequest request) {
+        try {
+            String res = pdaService.addEmptyTrayOutboundJob(request);
+            return AjaxResult.success(res);
+        } catch (RuntimeException e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
     /**
      * PDA 扫码查询出库任务明细。
      */
@@ -204,19 +261,4 @@ public class PdaController extends BaseController {
         }
     }
 
-    /**
-     * PDA 出库异常提交。
-     */
-    @PostMapping("/outboundException")
-    @PreAuthorize("@ss.hasPermi('out:job:complete')")
-    @Log(title = "PDA出库异常", businessType = BusinessType.UPDATE)
-    public AjaxResult outboundException(@RequestBody Map<String, Object> data) {
-        try {
-            pdaService.submitOutboundException(data);
-            return AjaxResult.success();
-        } catch (RuntimeException e) {
-            return AjaxResult.error(e.getMessage());
-        }
-    }
-
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/EmptyTrayOutboundRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/EmptyTrayOutboundRequest.java
new file mode 100644
index 0000000..c445a88
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/EmptyTrayOutboundRequest.java
@@ -0,0 +1,40 @@
+package com.ruoyi.pda.domain;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public class EmptyTrayOutboundRequest {
+
+    @NotNull
+    private String warehouseId;
+
+    @NotBlank
+    private String barcodePrefix;
+
+    @NotNull
+    private Integer quantity;
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getBarcodePrefix() {
+        return barcodePrefix;
+    }
+
+    public void setBarcodePrefix(String barcodePrefix) {
+        this.barcodePrefix = barcodePrefix;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
index a80d574..30efb75 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
@@ -3,6 +3,8 @@ package com.ruoyi.pda.mapper;
 import java.util.HashMap;
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 public interface PdaMapper {
     void bindTray(HashMap<String, Object> map);
 
@@ -25,7 +27,7 @@ public interface PdaMapper {
     HashMap<String, Object> selectAvailableInboundRoadway(HashMap<String, Object> map);
 
     /**
-     * WCS 请求货位时，按已分配巷道从下到上、前到后锁定一个可入库空货位。
+     * WCS 请求货位时，优先选择已分配巷道内空货位最多的排，再锁定一个可入库空货位。
      *
      * @param map 仓库、货位类型、托盘号、巷道
      * @return 锁定行数
@@ -57,4 +59,44 @@ public interface PdaMapper {
      * PDA 扫码查询出库任务明细。
      */
     HashMap<String, Object> selectOutboundDetail(HashMap<String, Object> map);
+
+    /**
+     * 查询出库托盘上的作业物料明细。
+     */
+    List<HashMap<String, Object>> selectOutboundTrayMaterials(HashMap<String, Object> map);
+
+    /**
+     * 查询出库确认后托盘上仍有库存的物料。
+     */
+    List<HashMap<String, Object>> selectResidualTrayMaterials(HashMap<String, Object> map);
+
+    /**
+     * PDA 库存查询：按托盘码查询托盘绑定的库存物料。
+     */
+    List<HashMap<String, Object>> selectTrayStockMaterials(@Param("trayCode") String trayCode);
+
+     /**
+     * 按条码格式前缀查询指定仓库可出库空托数量。
+     */
+    List<HashMap<String, Object>> selectAvailableEmptyTrayTypeCounts(@Param("warehouseId") String warehouseId);
+
+    /**
+     * 查询指定仓库、指定条码格式前缀可出库空托数量。
+     */
+    int countAvailableEmptyTrays(HashMap<String, Object> map);
+
+    /**
+     * 锁定读取指定仓库可出库空托库存明细。
+     */
+    List<HashMap<String, Object>> selectAvailableEmptyTrayStocks(HashMap<String, Object> map);
+
+    /**
+     * 预占空托库存明细，避免重复生成出库作业。
+     */
+    int reserveEmptyTrayStockDetail(HashMap<String, Object> map);
+
+    /**
+     * 将空托所在货位标记为出库锁定。
+     */
+    int lockEmptyTrayCargoSpace(HashMap<String, Object> map);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
index 41fd0cb..9dc598d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
@@ -6,7 +6,9 @@ import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.sotckindetail.domain.InStockinDetail;
 import com.ruoyi.pda.domain.AddInJobRequest;
 import com.ruoyi.pda.domain.BindTrayRequest;
+import com.ruoyi.pda.domain.EmptyTrayOutboundRequest;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -71,6 +73,38 @@ public interface PdaService {
      */
     String addInJob(AddInJobRequest request);
 
+    /**
+     * PDA 生成空托入库作业。
+     *
+     * @param request 仓库、托盘号和入库点位
+     * @return 作业生成和 WCS 下发结果
+     */
+    String addEmptyTrayInboundJob(AddInJobRequest request);
+
+    /**
+     * 查询指定仓库库内可出库空托按条码头分组的数量。
+     *
+     * @param warehouseId 仓库编码
+     * @return 空托类型数量列表
+     */
+    List<HashMap<String, Object>> emptyTrayOutboundCount(String warehouseId);
+
+    /**
+     * PDA 库存查询：按托盘码查询托盘绑定的库存物料。
+     *
+     * @param trayCode 托盘码
+     * @return 库存物料明细
+     */
+    List<HashMap<String, Object>> trayStock(String trayCode);
+
+    /**
+     * PDA 生成空托出库作业并下发 WCS。
+     *
+     * @param request 仓库、条码头类型和出库数量
+     * @return 作业生成和 WCS 下发结果
+     */
+    String addEmptyTrayOutboundJob(EmptyTrayOutboundRequest request);
+
     /**
      * WCS 到达入库口请求货位时，按作业已分配巷道锁定一个具体货位。
      *
@@ -112,10 +146,4 @@ public interface PdaService {
      */
     void confirmOutbound(Map<String, Object> data);
 
-    /**
-     * PDA 提交出库异常。
-     *
-     * @param data 异常数据
-     */
-    void submitOutboundException(Map<String, Object> data);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java
index f89b033..2a2580e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java
@@ -6,6 +6,8 @@ import com.ruoyi.bas.warehouse.domain.BasWarehouse;
 import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
 import com.ruoyi.api.client.WcsClient;
 import com.ruoyi.api.domain.ApiResponse;
+import com.ruoyi.bas.id.job.service.JobIdService;
+import com.ruoyi.bas.id.taskno.service.TaskNoService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
@@ -20,6 +22,7 @@ import com.ruoyi.in.sotckindetail.domain.InStockinDetail;
 import com.ruoyi.in.sotckindetail.mapper.InStockinDetailMapper;
 import com.ruoyi.pda.domain.AddInJobRequest;
 import com.ruoyi.pda.domain.BindTrayRequest;
+import com.ruoyi.pda.domain.EmptyTrayOutboundRequest;
 import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.service.PdaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +44,13 @@ import java.util.Map;
  */
 @Service
 public class PdaServiceImpl implements PdaService {
+    private static final String EMPTY_TRAY_PRODUCT_ID = "KTP0001";
+    private static final String EMPTY_TRAY_PRODUCT_NAME = "空容器";
+    private static final long EMPTY_TRAY_IN_JOB_TYPE = 3L;
+    private static final long EMPTY_TRAY_OUT_JOB_TYPE = 22L;
+    private static final String EMPTY_TRAY_IN_TASK_NO_TYPE = "6";
+    private static final String EMPTY_TRAY_OUT_TASK_NO_TYPE = "20";
+    private static final BigDecimal ONE_EMPTY_TRAY = BigDecimal.ONE;
 
     @Autowired
     private PdaMapper pdaMapper;
@@ -66,6 +76,12 @@ public class PdaServiceImpl implements PdaService {
     @Autowired
     private WcsClient wcsClient;
 
+    @Autowired
+    private JobIdService jobIdService;
+
+    @Autowired
+    private TaskNoService taskNoService;
+
     // ─────────────────────────────────────────────
     // 入库待处理任务列表
     // ─────────────────────────────────────────────
@@ -193,10 +209,18 @@ public class PdaServiceImpl implements PdaService {
         // 普通入库不使用 target_* 字段；生成作业阶段只写入口点位和作业巷道，不锁定具体货位。
         job.setEntranceId(stationPoint.getPointId());
         job.setRoadwayId(stationPoint.getRoadwayId());
+        BasWarehouse warehouse = basWarehouseService.selectBasWarehouseByWarehouseId(request.getWarehouseId());
+        if (warehouse != null) {
+            job.setWarehouseName(warehouse.getWarehouseName());
+        }
+        job.setStatus("1");
+        job.setExecutionPhase("0");
         // updateMydoJob 只更新非 null 字段，这里使用空字符串覆盖存储过程可能写入的作业货位。
         job.setCargoSpaceId("");
         job.setCargoSpaceName("");
-        mydoJobService.updateMydoJob(job);
+        if (mydoJobService.updateMydoJob(job) <= 0) {
+            throw new RuntimeException("入库作业初始化状态更新失败");
+        }
 
         MydoJobDetail query = new MydoJobDetail();
         query.setJobId(job.getJobId());
@@ -212,9 +236,241 @@ public class PdaServiceImpl implements PdaService {
             String message = wcsResponse == null ? "WCS接口无返回" : wcsResponse.getMessage();
             throw new RuntimeException("WCS入库作业下发失败：" + message);
         }
+        markInJobDispatchedToWcs(job.getJobId());
         return resultMsg + "；WCS入库作业下发成功：" + Convert.toStr(wcsResponse.getData());
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addEmptyTrayInboundJob(AddInJobRequest request) {
+        checkAddInJobRequest(request);
+        BasStationPoint stationPoint = validateInboundStationPoint(request.getStationPointId(), request.getWarehouseId(), request.getTrayCode());
+        ensureRoadwayHasEmptyCargoSpace(request.getTrayCode(), request.getWarehouseId(), stationPoint.getRoadwayId());
+        int occupyRows = basStationPointService.occupyBasStationPoint(stationPoint.getPointId());
+        if (occupyRows <= 0) {
+            throw new RuntimeException("入库点位已被分配，请重新选择点位");
+        }
+
+        String jobId = jobIdService.getId("RK");
+        String taskNo = taskNoService.getTaskNo(EMPTY_TRAY_IN_TASK_NO_TYPE);
+        MydoJob job = new MydoJob();
+        job.setJobId(jobId);
+        job.setTaskNo(StringUtils.hasText(taskNo) ? taskNo : jobId);
+        job.setInOrOut(EMPTY_TRAY_IN_JOB_TYPE);
+        job.setStatus("1");
+        job.setExecutionPhase("0");
+        job.setTrayCode(request.getTrayCode());
+        job.setWarehouseId(request.getWarehouseId());
+        BasWarehouse warehouse = basWarehouseService.selectBasWarehouseByWarehouseId(request.getWarehouseId());
+        if (warehouse != null) {
+            job.setWarehouseName(warehouse.getWarehouseName());
+        }
+        job.setEntranceId(stationPoint.getPointId());
+        job.setRoadwayId(stationPoint.getRoadwayId());
+        job.setPriority(10L);
+        job.setHeight(BigDecimal.ZERO);
+        job.setWeight(BigDecimal.ZERO);
+        copyLoginUser(job);
+        if (mydoJobService.insertMydoJob(job) <= 0) {
+            throw new RuntimeException("空托入库作业生成失败");
+        }
+
+        MydoJobDetail detail = new MydoJobDetail();
+        detail.setJobDetailId(jobId + "-1");
+        detail.setJobId(jobId);
+        detail.setProductId(EMPTY_TRAY_PRODUCT_ID);
+        detail.setProductName(EMPTY_TRAY_PRODUCT_NAME);
+        detail.setInQuantity(ONE_EMPTY_TRAY);
+        if (mydoJobDetailService.insertMydoJobDetail(detail) <= 0) {
+            throw new RuntimeException("空托入库作业明细生成失败");
+        }
+
+        ApiResponse<String> wcsResponse = wcsClient.sendPutawayTask(job);
+        if (wcsResponse == null || !wcsResponse.isSuccess()) {
+            String message = wcsResponse == null ? "WCS接口无返回" : wcsResponse.getMessage();
+            throw new RuntimeException("WCS入库作业下发失败：" + message);
+        }
+        markInJobDispatchedToWcs(job.getJobId());
+        return "空托入库作业生成成功：" + job.getJobId() + "；WCS入库作业下发成功：" + Convert.toStr(wcsResponse.getData());
+    }
+
+    @Override
+    public List<HashMap<String, Object>> emptyTrayOutboundCount(String warehouseId) {
+        if (!StringUtils.hasText(warehouseId)) {
+            throw new RuntimeException("仓库编码不能为空");
+        }
+        return pdaMapper.selectAvailableEmptyTrayTypeCounts(warehouseId);
+    }
+
+    @Override
+    public List<HashMap<String, Object>> trayStock(String trayCode) {
+        if (!StringUtils.hasText(trayCode)) {
+            throw new RuntimeException("托盘码不能为空");
+        }
+        return pdaMapper.selectTrayStockMaterials(trayCode.trim());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addEmptyTrayOutboundJob(EmptyTrayOutboundRequest request) {
+        checkEmptyTrayOutboundRequest(request);
+        int quantity = request.getQuantity();
+        HashMap<String, Object> countQuery = new HashMap<>();
+        countQuery.put("warehouseId", request.getWarehouseId());
+        countQuery.put("barcodePrefix", request.getBarcodePrefix());
+        int availableCount = pdaMapper.countAvailableEmptyTrays(countQuery);
+        if (availableCount < quantity) {
+            throw new RuntimeException("库内空托盘数量不足，当前可用：" + availableCount);
+        }
+
+        BasStationPoint exitPoint = selectDefaultOutboundStationPoint(request.getWarehouseId());
+        HashMap<String, Object> stockQuery = new HashMap<>();
+        stockQuery.put("warehouseId", request.getWarehouseId());
+        stockQuery.put("barcodePrefix", request.getBarcodePrefix());
+        stockQuery.put("limit", quantity);
+        List<HashMap<String, Object>> emptyTrayStocks = pdaMapper.selectAvailableEmptyTrayStocks(stockQuery);
+        if (emptyTrayStocks == null || emptyTrayStocks.size() < quantity) {
+            throw new RuntimeException("库内空托盘数量不足，请刷新后重试");
+        }
+
+        BasWarehouse warehouse = basWarehouseService.selectBasWarehouseByWarehouseId(request.getWarehouseId());
+        StringBuilder result = new StringBuilder("空托出库作业生成成功：");
+        for (int i = 0; i < quantity; i++) {
+            HashMap<String, Object> stock = emptyTrayStocks.get(i);
+            MydoJob job = buildEmptyTrayOutboundJob(request.getWarehouseId(), warehouse, exitPoint, stock);
+            if (mydoJobService.insertMydoJob(job) <= 0) {
+                throw new RuntimeException("空托出库作业生成失败");
+            }
+
+            MydoJobDetail detail = buildEmptyTrayOutboundDetail(job, stock);
+            if (mydoJobDetailService.insertMydoJobDetail(detail) <= 0) {
+                throw new RuntimeException("空托出库作业明细生成失败");
+            }
+
+            HashMap<String, Object> reserveMap = new HashMap<>();
+            reserveMap.put("stockDetailId", detail.getStockinDetailId());
+            reserveMap.put("stockId", detail.getStockId());
+            reserveMap.put("jobDetailId", detail.getJobDetailId());
+            reserveMap.put("quantity", detail.getOutQuantity());
+            if (pdaMapper.reserveEmptyTrayStockDetail(reserveMap) <= 0) {
+                throw new RuntimeException("空托库存已被占用，请刷新后重试");
+            }
+            HashMap<String, Object> cargoMap = new HashMap<>();
+            cargoMap.put("stockId", detail.getStockId());
+            cargoMap.put("cargoSpaceId", job.getCargoSpaceId());
+            pdaMapper.lockEmptyTrayCargoSpace(cargoMap);
+
+            AjaxResult pushResult = mydoJobService.pushOutJobToWcs(job.getJobId());
+            if (pushResult == null || pushResult.isError()) {
+                throw new RuntimeException(pushResult == null ? "WCS出库作业下发失败" : Convert.toStr(pushResult.get(AjaxResult.MSG_TAG)));
+            }
+            result.append(job.getJobId()).append("|");
+        }
+        return result.toString();
+    }
+
+    private void markInJobDispatchedToWcs(String jobId) {
+        MydoJob updateJob = new MydoJob();
+        updateJob.setJobId(jobId);
+        updateJob.setStatus("3");
+        updateJob.setExecutionPhase("1");
+        updateJob.setStartTime(DateUtils.getTime());
+        if (mydoJobService.updateMydoJob(updateJob) <= 0) {
+            throw new RuntimeException("入库作业WCS下发状态更新失败");
+        }
+    }
+
+    private void checkEmptyTrayOutboundRequest(EmptyTrayOutboundRequest request) {
+        if (request == null || !StringUtils.hasText(request.getWarehouseId())) {
+            throw new RuntimeException("仓库编码不能为空");
+        }
+        if (request.getQuantity() == null || request.getQuantity() <= 0) {
+            throw new RuntimeException("出库数量必须大于0");
+        }
+        if (!StringUtils.hasText(request.getBarcodePrefix())) {
+            throw new RuntimeException("空托盘类型不能为空");
+        }
+    }
+
+    private BasStationPoint selectDefaultOutboundStationPoint(String warehouseId) {
+        BasStationPoint query = new BasStationPoint();
+        query.setWarehouseId(warehouseId);
+        query.setStatus("0");
+        List<BasStationPoint> pointList = basStationPointService.selectBasStationPointList(query);
+        if (pointList != null) {
+            for (BasStationPoint point : pointList) {
+                if (point != null && ("2".equals(point.getPointType()) || "3".equals(point.getPointType()))) {
+                    return point;
+                }
+            }
+        }
+        throw new RuntimeException("当前仓库未配置可用出库点位");
+    }
+
+    private MydoJob buildEmptyTrayOutboundJob(String warehouseId, BasWarehouse warehouse, BasStationPoint exitPoint, HashMap<String, Object> stock) {
+        String jobId = jobIdService.getId("CK");
+        String taskNo = taskNoService.getTaskNo(EMPTY_TRAY_OUT_TASK_NO_TYPE);
+        MydoJob job = new MydoJob();
+        job.setJobId(jobId);
+        job.setTaskNo(StringUtils.hasText(taskNo) ? taskNo : jobId);
+        job.setInOrOut(EMPTY_TRAY_OUT_JOB_TYPE);
+        job.setStatus("1");
+        job.setExecutionPhase("0");
+        job.setTrayCode(mapString(stock, "trayCode"));
+        job.setWarehouseId(warehouseId);
+        String warehouseName = mapString(stock, "warehouseName");
+        if (!StringUtils.hasText(warehouseName) && warehouse != null) {
+            warehouseName = warehouse.getWarehouseName();
+        }
+        job.setWarehouseName(warehouseName);
+        job.setRoadwayId(mapString(stock, "roadwayId"));
+        job.setCargoSpaceId(mapString(stock, "cargoSpaceId"));
+        job.setCargoSpaceName(mapString(stock, "cargoSpaceName"));
+        job.setLineType("1");
+        job.setPriority(10L);
+        job.setHeight(BigDecimal.ZERO);
+        job.setWeight(BigDecimal.ZERO);
+        job.setExitId(exitPoint.getPointId());
+        copyLoginUser(job);
+        return job;
+    }
+
+    private MydoJobDetail buildEmptyTrayOutboundDetail(MydoJob job, HashMap<String, Object> stock) {
+        MydoJobDetail detail = new MydoJobDetail();
+        detail.setJobDetailId(job.getJobId() + "-1");
+        detail.setJobId(job.getJobId());
+        detail.setStockId(mapString(stock, "stockId"));
+        detail.setLotNo(mapString(stock, "lotNo"));
+        detail.setInDate(DateUtils.getTime());
+        detail.setProductId(EMPTY_TRAY_PRODUCT_ID);
+        detail.setProductName(EMPTY_TRAY_PRODUCT_NAME);
+        detail.setStockQuantity(toBigDecimal(mapValue(stock, "availableQuantity")));
+        detail.setOutQuantity(ONE_EMPTY_TRAY);
+        detail.setStockinDetailId(mapString(stock, "stockDetailId"));
+        detail.setSupplierId(mapString(stock, "supplierId"));
+        detail.setSupplierName(mapString(stock, "supplierName"));
+        return detail;
+    }
+
+    private Object mapValue(Map<String, Object> map, String key) {
+        if (map == null || key == null) {
+            return null;
+        }
+        if (map.containsKey(key)) {
+            return map.get(key);
+        }
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            if (key.equalsIgnoreCase(entry.getKey())) {
+                return entry.getValue();
+            }
+        }
+        return null;
+    }
+
+    private String mapString(Map<String, Object> map, String key) {
+        return Convert.toStr(mapValue(map, key));
+    }
+
     private void checkBindTrayRequest(BindTrayRequest request) {
         if (request == null || !StringUtils.hasText(request.getTrayCode())) {
             throw new RuntimeException("托盘号不能为空");
@@ -407,6 +663,10 @@ public class PdaServiceImpl implements PdaService {
         if (detail == null || detail.isEmpty()) {
             throw new RuntimeException("未找到对应出库任务");
         }
+        HashMap<String, Object> materialQuery = new HashMap<>();
+        materialQuery.put("jobId", detail.get("jobId"));
+        List<HashMap<String, Object>> materials = pdaMapper.selectOutboundTrayMaterials(materialQuery);
+        detail.put("materials", materials == null ? new ArrayList<>() : materials);
         return detail;
     }
 
@@ -415,22 +675,84 @@ public class PdaServiceImpl implements PdaService {
     public void confirmOutbound(Map<String, Object> data) {
         Map<String, Object> detail = outboundDetail(data);
         BigDecimal expectedQuantity = toBigDecimal(detail.get("quantity"));
-        BigDecimal actualQuantity = toBigDecimal(data == null ? null : data.get("quantity"));
+        BigDecimal actualQuantity = applyOutboundMaterialQuantities(data, detail);
         if (actualQuantity.compareTo(BigDecimal.ZERO) <= 0) {
             throw new RuntimeException("实际数量必须大于0");
         }
         if (actualQuantity.compareTo(expectedQuantity) != 0) {
             throw new RuntimeException("实际数量必须等于出库任务数量");
         }
-        AjaxResult result = mydoJobService.completeJob(Convert.toStr(detail.get("jobId")), "2");
+        String jobId = Convert.toStr(detail.get("jobId"));
+        MydoJob outboundJob = mydoJobService.selectMydoJobByJobId(jobId);
+        AjaxResult result = mydoJobService.completeJob(jobId, "2");
         if (result == null || result.isError()) {
             throw new RuntimeException(result == null ? "出库确认失败" : Convert.toStr(result.get(AjaxResult.MSG_TAG)));
         }
+        createReturnInboundJobIfNeeded(outboundJob);
     }
 
-    @Override
-    public void submitOutboundException(Map<String, Object> data) {
-        outboundDetail(data);
+    @SuppressWarnings("unchecked")
+    private BigDecimal applyOutboundMaterialQuantities(Map<String, Object> data, Map<String, Object> detail) {
+        Object materialPayload = data == null ? null : data.get("materials");
+        if (!(materialPayload instanceof List<?> requestMaterials) || requestMaterials.isEmpty()) {
+            return toBigDecimal(data == null ? null : data.get("quantity"));
+        }
+
+        List<HashMap<String, Object>> jobMaterials = detail.get("materials") instanceof List<?>
+            ? (List<HashMap<String, Object>>) detail.get("materials")
+            : new ArrayList<>();
+        if (jobMaterials.isEmpty()) {
+            throw new RuntimeException("出库作业无物料明细");
+        }
+
+        BigDecimal totalQuantity = BigDecimal.ZERO;
+        for (Object item : requestMaterials) {
+            if (!(item instanceof Map<?, ?>)) {
+                throw new RuntimeException("出库物料确认明细格式错误");
+            }
+            Map<String, Object> requestMaterial = (Map<String, Object>) item;
+            String jobDetailId = mapString(requestMaterial, "jobDetailId");
+            String stockDetailId = mapString(requestMaterial, "stockDetailId");
+            HashMap<String, Object> jobMaterial = findOutboundJobMaterial(jobMaterials, jobDetailId, stockDetailId);
+            if (jobMaterial == null) {
+                throw new RuntimeException("出库物料确认明细不存在");
+            }
+
+            BigDecimal quantity = toBigDecimal(firstNotBlank(mapValue(requestMaterial, "actualQuantity"), mapValue(requestMaterial, "quantity")));
+            if (quantity.compareTo(BigDecimal.ZERO) <= 0) {
+                throw new RuntimeException("物料实际数量必须大于0");
+            }
+            BigDecimal stockQuantity = toBigDecimal(mapValue(jobMaterial, "stockQuantity"));
+            if (stockQuantity.compareTo(BigDecimal.ZERO) > 0 && quantity.compareTo(stockQuantity) > 0) {
+                throw new RuntimeException("物料实际数量不能大于库存数量");
+            }
+
+            MydoJobDetail updateDetail = new MydoJobDetail();
+            updateDetail.setJobDetailId(mapString(jobMaterial, "jobDetailId"));
+            updateDetail.setOutQuantity(quantity);
+            if (mydoJobDetailService.updateMydoJobDetail(updateDetail) <= 0) {
+                throw new RuntimeException("出库物料确认数量更新失败");
+            }
+            totalQuantity = totalQuantity.add(quantity);
+        }
+
+        return totalQuantity;
+    }
+
+    private HashMap<String, Object> findOutboundJobMaterial(List<HashMap<String, Object>> jobMaterials, String jobDetailId, String stockDetailId) {
+        for (HashMap<String, Object> material : jobMaterials) {
+            if (StringUtils.hasText(jobDetailId) && jobDetailId.equals(mapString(material, "jobDetailId"))) {
+                return material;
+            }
+            if (StringUtils.hasText(stockDetailId) && stockDetailId.equals(mapString(material, "stockDetailId"))) {
+                return material;
+            }
+        }
+        return null;
+    }
+
+    private Object firstNotBlank(Object first, Object second) {
+        return StringUtils.hasText(Convert.toStr(first)) ? first : second;
     }
 
     private BigDecimal toBigDecimal(Object value) {
@@ -440,6 +762,84 @@ public class PdaServiceImpl implements PdaService {
         return new BigDecimal(Convert.toStr(value));
     }
 
+    private void createReturnInboundJobIfNeeded(MydoJob outboundJob) {
+        if (outboundJob == null || !StringUtils.hasText(outboundJob.getTrayCode()) || !StringUtils.hasText(outboundJob.getWarehouseId())) {
+            return;
+        }
+        HashMap<String, Object> residualQuery = new HashMap<>();
+        residualQuery.put("trayCode", outboundJob.getTrayCode());
+        residualQuery.put("warehouseId", outboundJob.getWarehouseId());
+        List<HashMap<String, Object>> residualMaterials = pdaMapper.selectResidualTrayMaterials(residualQuery);
+        if (residualMaterials == null || residualMaterials.isEmpty()) {
+            return;
+        }
+
+        String returnJobId = jobIdService.getId("HL");
+        String returnTaskNo = taskNoService.getTaskNo("5");
+        MydoJob returnJob = new MydoJob();
+        returnJob.setJobId(returnJobId);
+        returnJob.setTaskNo(StringUtils.hasText(returnTaskNo) ? returnTaskNo : returnJobId);
+        returnJob.setInOrOut(5L);
+        returnJob.setStatus("1");
+        returnJob.setExecutionPhase("0");
+        returnJob.setTrayCode(outboundJob.getTrayCode());
+        returnJob.setWarehouseId(outboundJob.getWarehouseId());
+        returnJob.setWarehouseName(outboundJob.getWarehouseName());
+        returnJob.setEntranceId(outboundJob.getExitId());
+        returnJob.setPriority(10L);
+        returnJob.setHeight(BigDecimal.ZERO);
+        returnJob.setWeight(BigDecimal.ZERO);
+        copyLoginUser(returnJob);
+        if (StringUtils.hasText(outboundJob.getExitId())) {
+            BasStationPoint exitPoint = basStationPointService.selectBasStationPointByPointId(outboundJob.getExitId());
+            if (exitPoint != null) {
+                returnJob.setRoadwayId(exitPoint.getRoadwayId());
+            }
+        }
+        mydoJobService.insertMydoJob(returnJob);
+
+        int index = 1;
+        for (HashMap<String, Object> material : residualMaterials) {
+            BigDecimal quantity = toBigDecimal(material.get("quantity"));
+            if (quantity.compareTo(BigDecimal.ZERO) <= 0) {
+                continue;
+            }
+            MydoJobDetail returnDetail = new MydoJobDetail();
+            returnDetail.setJobDetailId(returnJobId + "-" + index++);
+            returnDetail.setJobId(returnJobId);
+            returnDetail.setStockId(Convert.toStr(material.get("stockId")));
+            returnDetail.setLotNo(Convert.toStr(material.get("lotNo")));
+            returnDetail.setInDate(DateUtils.getTime());
+            returnDetail.setInOrOutId(outboundJob.getJobId());
+            returnDetail.setInOrOutDId(Convert.toStr(material.get("stockDetailId")));
+            returnDetail.setProductId(Convert.toStr(material.get("productId")));
+            returnDetail.setProductName(Convert.toStr(material.get("productName")));
+            returnDetail.setInQuantity(quantity);
+            returnDetail.setStockQuantity(quantity);
+            returnDetail.setStockinDetailId(Convert.toStr(material.get("stockDetailId")));
+            returnDetail.setSupplierId(Convert.toStr(material.get("supplierId")));
+            returnDetail.setSupplierName(Convert.toStr(material.get("supplierName")));
+            mydoJobDetailService.insertMydoJobDetail(returnDetail);
+        }
+
+        ApiResponse<String> wcsResponse = wcsClient.sendPutawayTask(returnJob);
+        if (wcsResponse == null || !wcsResponse.isSuccess()) {
+            String message = wcsResponse == null ? "WCS接口无返回" : wcsResponse.getMessage();
+            throw new RuntimeException("WCS回流入库作业下发失败：" + message);
+        }
+        markInJobDispatchedToWcs(returnJobId);
+    }
+
+    private void copyLoginUser(MydoJob job) {
+        try {
+            job.setUserId(SecurityUtils.getUserId());
+            job.setDeptId(SecurityUtils.getDeptId());
+            job.setUserName(SecurityUtils.getUsername());
+        } catch (RuntimeException ignored) {
+            // Unit tests and external callbacks may run without a Spring Security context.
+        }
+    }
+
     /**
      * 作业生成后将关联入库单置为执行状态，供完成单据过程按既有规则校验 scan_num 与 assign_num。
      */
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ca200ef..e4d4516 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -168,6 +168,8 @@ external:
     WCS:
       base-url: http://172.16.4.63:8084
       token: wcs-token
+      # 本地测试默认启用模拟返回；联调或生产设为 false 即可恢复真实 WCS 调用
+      mock-enabled: false
       apis:
         sendPutawayTask: /wcs/api/receiveWmsJob
         sendRetrieveTask: /wcs/api/receiveWmsJob
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml
index 4af841b..bbb6476 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml
@@ -177,6 +177,100 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where cargo_space_id = #{cargoSpaceId}
     </update>
 
+    <update id="markOutboundAssignedByStockId" parameterType="String">
+        update bcs
+        set bcs.status = '4',
+            bcs.tray_code = bs.tray_code
+        from bas_cargo_space bcs
+        inner join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
+        where bs.stock_id = #{stockId}
+    </update>
+
+    <update id="markOutboundAssignedByStockRef" parameterType="String">
+        update bcs
+        set bcs.status = '4',
+            bcs.tray_code = bs.tray_code
+        from bas_cargo_space bcs
+        inner join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
+        where bs.stock_id = #{stockRef}
+           or exists (
+               select 1
+               from bas_stock_detail bsd
+               where bsd.stock_id = bs.stock_id
+                 and bsd.detail_id = #{stockRef}
+           )
+    </update>
+
+    <update id="markOutboundAssignedByStockoutDetailId" parameterType="String">
+        update bcs
+        set bcs.status = '4',
+            bcs.tray_code = bs.tray_code
+        from bas_cargo_space bcs
+        inner join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
+        where exists (
+            select 1
+            from mydo_job_detail jd
+            inner join mydo_job j on j.job_id = jd.job_id
+            where jd.stock_id = bs.stock_id
+              and jd.in_or_out_d_id = #{stockoutDetailId}
+              and j.in_or_out &gt;= 20
+              and j.status in ('1', '2', '3')
+        )
+    </update>
+
+    <update id="markOutboundAssignedByCargoSpaceId" parameterType="String">
+        update bas_cargo_space
+        set status = '4'
+        where cargo_space_id = #{cargoSpaceId}
+          and status in ('1', '6')
+    </update>
+
+    <update id="releaseOutboundCargoSpace" parameterType="String">
+        update bas_cargo_space
+        set status = '1',
+            tray_code = null
+        where cargo_space_id = #{cargoSpaceId}
+    </update>
+
+    <update id="markOutboundNeedCheck" parameterType="String">
+        update bas_cargo_space
+        set status = '6'
+        where cargo_space_id = #{cargoSpaceId}
+    </update>
+
+    <update id="markInboundNeedCheck" parameterType="String">
+        update bas_cargo_space
+        set status = '5'
+        where cargo_space_id = #{cargoSpaceId}
+    </update>
+
+    <select id="selectAvailableInboundCargoSpaceInRoadway" parameterType="com.ruoyi.in.job.domain.MydoJob" resultMap="BasCargoSpaceResult">
+        select top 1 cargo_space_id, warehouse_id, roadway_id, cargo_area_id, the_type, the_type_name, cargo_space_name, the_platoon, the_column, the_floor, status, locked, tray_code, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area, dept_id, dept_name, the_weight, the_height
+        from (
+            select bcs.cargo_space_id, bcs.warehouse_id, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type, bcs.the_type_name,
+                   bcs.cargo_space_name, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked,
+                   bcs.tray_code, bcs.iss_double, bcs.group_coding_no, bcs.group_coding, bcs.cargo_space_logo,
+                   bcs.this_cargo_area, bcs.dept_id, bcs.dept_name, bcs.the_weight, bcs.the_height,
+                   count(1) over (partition by bcs.the_platoon) as platoon_empty_count
+            from bas_cargo_space bcs
+            where bcs.warehouse_id = #{warehouseId}
+              and bcs.roadway_id = #{roadwayId}
+              and bcs.status = '1'
+              and ISNULL(bcs.locked, 'N') = 'N'
+              and (#{cargoSpaceId} is null or bcs.cargo_space_id != #{cargoSpaceId})
+              and bcs.the_type = (select top 1 btr.allowed_cargo_type
+                                  from bas_tray_rule btr
+                                  where btr.tray_type is not null
+                                    and btr.tray_type != ''
+                                    and #{trayCode} is not null
+                                    and #{trayCode} != ''
+                                    and left(#{trayCode}, len(btr.tray_type)) = btr.tray_type
+                                    and charindex(',' + #{warehouseId} + ',', ',' + btr.allowed_warehouses + ',') &gt; 0
+                                  order by len(btr.tray_type) desc, btr.id)
+        ) candidate
+        order by platoon_empty_count desc, the_platoon asc, the_floor asc, the_column asc, cargo_space_id asc
+    </select>
+
     <delete id="deleteBasCargoSpaceByCargoSpaceId" parameterType="String">
         delete from bas_cargo_space where cargo_space_id = #{cargoSpaceId}
     </delete>
@@ -187,4 +281,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{cargoSpaceId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml
index faa40e0..1f14414 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trayCode" column="tray_code" />
         <result property="warehouseId" column="warehouse_id" />
         <result property="warehouseName" column="warehouse_name" />
+        <result property="trayType" column="tray_type" />
         <result property="availableQuantity" column="available_quantity" />
         <result property="createTime" column="create_time" />
         <result property="updateTime" column="update_time" />
@@ -33,17 +34,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select bsd.detail_id, bsd.stock_id, bsd.product_status, bsd.lot_no, bsd.product_id, bsd.product_name,
                bsd.quantity, bsd.out_quantity, bsd.job_detail_id, bsd.stockin_detail_id,
                bs.cargo_space_id, bcs.cargo_space_name, bs.stock_status, bs.in_date, bs.back_date,
-               bs.tray_code, bs.warehouse_id, bs.warehouse_name,
+               bs.tray_code, bs.warehouse_id, ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
+               bbf.tray_type,
                ISNULL(bsd.quantity, 0) - ISNULL(bsd.out_quantity, 0) as available_quantity,
                bsd.create_time, bsd.update_time, bsd.remark
         from bas_stock_detail bsd
         left join bas_stock bs on bsd.stock_id = bs.stock_id
         left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+        OUTER APPLY (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
     </sql>
 
     <select id="selectBasStockDetailList" parameterType="BasStockDetail" resultMap="BasStockDetailResult">
         <include refid="selectBasStockDetailVo" />
         <where>
+            bcs.status = '2'
             <if test="detailId != null and detailId != ''"> and bsd.detail_id = #{detailId}</if>
             <if test="stockId != null and stockId != ''"> and bsd.stock_id = #{stockId}</if>
             <if test="productStatus != null and productStatus != ''"> and bsd.product_status = #{productStatus}</if>
@@ -56,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
             <if test="trayCode != null and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
             <if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
-            <if test="warehouseName != null and warehouseName != ''"> and bs.warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="warehouseName != null and warehouseName != ''"> and ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name) like concat('%', #{warehouseName}, '%')</if>
             <if test="params.beginInDate != null and params.beginInDate != '' and params.endInDate != null and params.endInDate != ''"> and bs.in_date between #{params.beginInDate} and #{params.endInDate}</if>
             <if test="params.beginBackDate != null and params.beginBackDate != '' and params.endBackDate != null and params.endBackDate != ''"> and bs.back_date between #{params.beginBackDate} and #{params.endBackDate}</if>
             ${params.warehouseScope}
@@ -69,6 +82,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bsd.detail_id = #{detailId}
     </select>
 
+    <select id="countBasStockDetailByStockId" parameterType="String" resultType="int">
+        select count(1)
+        from bas_stock_detail with (UPDLOCK, HOLDLOCK)
+        where stock_id = #{stockId}
+    </select>
+
     <select id="selectStockIdsByDetailIds" parameterType="String" resultType="String">
         select distinct stock_id from bas_stock_detail where detail_id in
         <foreach item="detailId" collection="array" open="(" separator="," close=")">
@@ -128,6 +147,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where detail_id = #{detailId}
     </update>
 
+    <update id="rollbackOutboundQuantityByJobId" parameterType="String">
+        update bsd
+        set bsd.out_quantity = case
+                when ISNULL(bsd.out_quantity, 0) - ISNULL(jd.rollback_quantity, 0) &lt; 0 then 0
+                else ISNULL(bsd.out_quantity, 0) - ISNULL(jd.rollback_quantity, 0)
+            end,
+            bsd.job_detail_id = case
+                when exists (
+                    select 1
+                    from mydo_job_detail x
+                    where x.job_id = #{jobId}
+                      and x.job_detail_id = bsd.job_detail_id
+                ) then null
+                else bsd.job_detail_id
+            end,
+            bsd.update_time = SYSDATETIME()
+        from bas_stock_detail bsd
+        inner join (
+            select stockin_detail_id as detail_id,
+                   sum(ISNULL(out_quantity, 0)) as rollback_quantity
+            from mydo_job_detail
+            where job_id = #{jobId}
+              and stockin_detail_id is not null
+              and stockin_detail_id != ''
+            group by stockin_detail_id
+        ) jd on jd.detail_id = bsd.detail_id
+    </update>
+
     <delete id="deleteBasStockDetailByDetailId" parameterType="String">
         delete from bas_stock_detail where detail_id = #{detailId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml
index cc9e29a..149e00e 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml
@@ -35,7 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBasStockVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_id, product_name, quantity, job_id, job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, warehouse_id, warehouse_name, user_id, user_name, dept_id, dept_name, supplier_id as suplier_id, supplier_name as suplier_name from bas_stock
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_id, product_name, quantity, job_id, job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, warehouse_id,
+               ISNULL(NULLIF(warehouse_name, ''), (select top 1 bw.warehouse_name from bas_warehouse bw where bw.warehouse_id = bas_stock.warehouse_id)) as warehouse_name,
+               user_id, user_name, dept_id, dept_name, supplier_id as suplier_id, supplier_name as suplier_name from bas_stock
     </sql>
 
     <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
@@ -46,12 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bs.job_id, null as job_detail_id,
         bs.tray_code, ISNULL(bsa.out_quantity, 0) as out_quantity,
         null as stockin_detail_id,
-        bs.stockin_id, bs.in_type, bs.warehouse_id, bs.warehouse_name,
+        bs.stockin_id, bs.in_type, bs.warehouse_id, ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
         bs.user_id, bs.user_name, bs.dept_id, bs.dept_name, bs.supplier_id as suplier_id, bs.supplier_name as suplier_name,
         ISNULL(bsa.detail_count, 0) as detail_count,
         ISNULL(bsa.quantity, 0) - ISNULL(bsa.out_quantity, 0) as available_quantity
         from bas_stock bs
         left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
         left join (
             select stock_id,
                    count(1) as detail_count,
@@ -80,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and bs.in_type = #{inType}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
-            <if test="warehouseName != null  and warehouseName != ''"> and bs.warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name) like concat('%', #{warehouseName}, '%')</if>
             <if test="userName != null  and userName != ''"> and bs.user_name like concat('%', #{userName}, '%')</if>
             <if test="deptName != null  and deptName != ''"> and bs.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="suplierName != null  and suplierName != ''"> and bs.supplier_name like concat('%', #{suplierName}, '%')</if>
@@ -204,6 +207,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bs.stock_id = #{stockId}
     </update>
 
+    <update id="markExceptionByJobId" parameterType="String">
+        update bs
+        set bs.stock_status = '3'
+        from bas_stock bs
+        where exists (
+            select 1
+            from mydo_job_detail jd
+            where jd.job_id = #{jobId}
+              and jd.stock_id = bs.stock_id
+        )
+    </update>
+
     <delete id="deleteBasStockByStockId" parameterType="String">
         delete from bas_stock where stock_id = #{stockId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/mapper/in/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/MydoJobDetailMapper.xml
index fee1f0b..3a21490 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/MydoJobDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/MydoJobDetailMapper.xml
@@ -153,4 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{jobDetailId}
         </foreach>
     </delete>
+
+    <delete id="deleteMydoJobDetailByJobId" parameterType="String">
+        delete from mydo_job_detail where job_id = #{jobId}
+    </delete>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml
index b7b23ad..b330958 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml
@@ -39,10 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMydoJobVo">
-        select job_id, status, task_no, in_or_out, execution_phase, tray_code, warehouse_id, warehouse_name, roadway_id, cargo_space_id, cargo_space_name, target_roadway_id, target_cargo_space_id, target_cargo_space_name, line_type, priority, height, weight, create_time, start_time, finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id, supplier_name, customer_id, customer_name from mydo_job
+        select job_id, status, task_no, in_or_out, execution_phase, tray_code, warehouse_id,
+               isnull(nullif(warehouse_name, ''), (select top 1 bw.warehouse_name from bas_warehouse bw where bw.warehouse_id = mydo_job.warehouse_id)) as warehouse_name,
+               roadway_id, cargo_space_id, cargo_space_name, target_roadway_id, target_cargo_space_id, target_cargo_space_name, line_type, priority, height, weight, create_time, start_time, finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id, supplier_name, customer_id, customer_name from mydo_job
     </sql>
     <sql id="selectMydoJobFinishVo">
-        select job_id, status, task_no, in_or_out, execution_phase, tray_code, warehouse_id, warehouse_name, roadway_id, cargo_space_id, cargo_space_name, target_roadway_id, target_cargo_space_id, target_cargo_space_name, line_type, priority, height, weight, create_time, start_time, finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id, supplier_name, customer_id, customer_name from mydo_job_finish
+        select job_id, status, task_no, in_or_out, execution_phase, tray_code, warehouse_id,
+               isnull(nullif(warehouse_name, ''), (select top 1 bw.warehouse_name from bas_warehouse bw where bw.warehouse_id = mydo_job_finish.warehouse_id)) as warehouse_name,
+               roadway_id, cargo_space_id, cargo_space_name, target_roadway_id, target_cargo_space_id, target_cargo_space_name, line_type, priority, height, weight, create_time, start_time, finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id, supplier_name, customer_id, customer_name from mydo_job_finish
     </sql>
 
     <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
@@ -53,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
             <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
             <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
@@ -84,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id,
                supplier_name, customer_id, customer_name
         from mydo_job
-        where tray_code = #{trayCode} and in_or_out = 1
+        where tray_code = #{trayCode} and in_or_out &lt; 20
         order by create_time desc
     </select>
 
@@ -95,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id,
                supplier_name, customer_id, customer_name
         from mydo_job
-        where task_no = #{taskNo} and in_or_out = 1
+        where task_no = #{taskNo} and in_or_out &lt; 20
         order by create_time desc
     </select>
 
@@ -117,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                finish_time, entrance_id, exit_id, dept_id, dept_name, user_id, user_name, supplier_id,
                supplier_name, customer_id, customer_name
         from mydo_job
-        where tray_code = #{trayCode} and warehouse_id = #{warehouseId} and in_or_out = 1
+        where tray_code = #{trayCode} and warehouse_id = #{warehouseId} and in_or_out &lt; 20
         order by create_time desc
     </select>
 
@@ -154,6 +159,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and stockin_id is not null
           and stockin_id != ''
     </select>
+
+    <select id="selectStockIdsByJobId" parameterType="String" resultType="String">
+        select distinct stock_id
+        from mydo_job_detail
+        where job_id = #{jobId}
+          and stock_id is not null
+          and stock_id != ''
+    </select>
+
+    <select id="selectStockoutDetailIdsByJobId" parameterType="String" resultType="String">
+        select distinct in_or_out_d_id
+        from mydo_job_detail
+        where job_id = #{jobId}
+          and in_or_out_d_id is not null
+          and in_or_out_d_id != ''
+    </select>
     <select id="completeJob" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_complete_in_job(
                 #{job_id,mode=IN,jdbcType=VARCHAR},
@@ -313,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
             <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
             <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
@@ -339,6 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
         <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
         <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+        <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
         <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
         <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
         <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
@@ -365,6 +388,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
         <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
         <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+        <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
         <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
         <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
         <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
@@ -392,6 +416,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
         <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
         <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+        <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
         <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
         <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
         <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/LocationOutboundMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/LocationOutboundMapper.xml
new file mode 100644
index 0000000..c72c5fc
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/out/LocationOutboundMapper.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.location.mapper.LocationOutboundMapper">
+
+    <resultMap type="LocationOutboundStock" id="LocationOutboundStockResult">
+        <result property="cargoSpaceId" column="cargo_space_id" />
+        <result property="cargoSpaceName" column="cargo_space_name" />
+        <result property="cargoSpaceStatus" column="cargo_space_status" />
+        <result property="locked" column="locked" />
+        <result property="warehouseId" column="warehouse_id" />
+        <result property="warehouseName" column="warehouse_name" />
+        <result property="roadwayId" column="roadway_id" />
+        <result property="thePlatoon" column="the_platoon" />
+        <result property="theColumn" column="the_column" />
+        <result property="theFloor" column="the_floor" />
+        <result property="theType" column="the_type" />
+        <result property="theTypeName" column="the_type_name" />
+        <result property="stockId" column="stock_id" />
+        <result property="stockStatus" column="stock_status" />
+        <result property="trayCode" column="tray_code" />
+        <result property="trayType" column="tray_type" />
+        <result property="inDate" column="in_date" />
+        <result property="stockinId" column="stockin_id" />
+        <result property="inType" column="in_type" />
+        <result property="supplierId" column="supplier_id" />
+        <result property="supplierName" column="supplier_name" />
+        <result property="detailCount" column="detail_count" />
+        <result property="quantity" column="quantity" />
+        <result property="outQuantity" column="out_quantity" />
+        <result property="availableQuantity" column="available_quantity" />
+    </resultMap>
+
+    <resultMap type="BasStockDetail" id="LocationOutboundDetailResult">
+        <result property="detailId" column="detail_id" />
+        <result property="stockId" column="stock_id" />
+        <result property="productStatus" column="product_status" />
+        <result property="lotNo" column="lot_no" />
+        <result property="productId" column="product_id" />
+        <result property="productName" column="product_name" />
+        <result property="quantity" column="quantity" />
+        <result property="outQuantity" column="out_quantity" />
+        <result property="jobDetailId" column="job_detail_id" />
+        <result property="stockinDetailId" column="stockin_detail_id" />
+        <result property="cargoSpaceId" column="cargo_space_id" />
+        <result property="cargoSpaceName" column="cargo_space_name" />
+        <result property="stockStatus" column="stock_status" />
+        <result property="inDate" column="in_date" />
+        <result property="backDate" column="back_date" />
+        <result property="trayCode" column="tray_code" />
+        <result property="warehouseId" column="warehouse_id" />
+        <result property="warehouseName" column="warehouse_name" />
+        <result property="trayType" column="tray_type" />
+        <result property="availableQuantity" column="available_quantity" />
+        <result property="createTime" column="create_time" />
+        <result property="updateTime" column="update_time" />
+        <result property="remark" column="remark" />
+    </resultMap>
+
+    <sql id="stockAggregate">
+        select stock_id,
+               count(1) as detail_count,
+               sum(isnull(quantity, 0)) as quantity,
+               sum(isnull(out_quantity, 0)) as out_quantity,
+               sum(isnull(quantity, 0) - isnull(out_quantity, 0)) as available_quantity
+        from bas_stock_detail
+        group by stock_id
+    </sql>
+
+    <sql id="detailSelect">
+        select bsd.detail_id, bsd.stock_id, bsd.product_status, bsd.lot_no, bsd.product_id, bsd.product_name,
+               bsd.quantity, bsd.out_quantity, bsd.job_detail_id, bsd.stockin_detail_id,
+               bs.cargo_space_id, bcs.cargo_space_name, bs.stock_status, bs.in_date, bs.back_date,
+               bs.tray_code, bs.warehouse_id, isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
+               bbf.tray_type,
+               isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) as available_quantity,
+               bsd.create_time, bsd.update_time, bsd.remark
+        from bas_stock_detail bsd
+        inner join bas_stock bs on bsd.stock_id = bs.stock_id
+        left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+        outer apply (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
+    </sql>
+
+    <select id="selectLocationOutboundStockList" parameterType="LocationOutboundStock" resultMap="LocationOutboundStockResult">
+        select bcs.cargo_space_id, bcs.cargo_space_name, bcs.status as cargo_space_status, bcs.locked,
+               bcs.warehouse_id, isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
+               bcs.roadway_id, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.the_type, bcs.the_type_name,
+               bs.stock_id, bs.stock_status, bs.tray_code, bbf.tray_type, bs.in_date, bs.stockin_id, bs.in_type,
+               bs.supplier_id, bs.supplier_name,
+               isnull(bsa.detail_count, 0) as detail_count,
+               isnull(bsa.quantity, 0) as quantity,
+               isnull(bsa.out_quantity, 0) as out_quantity,
+               isnull(bsa.available_quantity, 0) as available_quantity
+        from bas_cargo_space bcs
+        left join bas_stock bs on bs.cargo_space_id = bcs.cargo_space_id
+            and bcs.status in ('2', '4')
+        left join bas_warehouse bw on bcs.warehouse_id = bw.warehouse_id
+        left join (
+            <include refid="stockAggregate" />
+        ) bsa on bsa.stock_id = bs.stock_id
+        outer apply (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
+        <where>
+            <if test="showEmpty == null or showEmpty == false">
+                and bcs.status = '2'
+                and bs.stock_id is not null
+                and isnull(bsa.available_quantity, 0) &gt; 0
+            </if>
+            <if test="warehouseId != null and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
+            <if test="warehouseName != null and warehouseName != ''"> and isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) like concat('%', #{warehouseName}, '%')</if>
+            <if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
+            <if test="cargoSpaceId != null and cargoSpaceId != ''"> and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="cargoSpaceName != null and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> and bcs.status = #{cargoSpaceStatus}</if>
+            <if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
+            <if test="trayCode != null and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="productId != null and productId != ''"> and exists (select 1 from bas_stock_detail x where x.stock_id = bs.stock_id and x.product_id like concat('%', #{productId}, '%'))</if>
+            <if test="productName != null and productName != ''"> and exists (select 1 from bas_stock_detail x where x.stock_id = bs.stock_id and x.product_name like concat('%', #{productName}, '%'))</if>
+            <if test="lotNo != null and lotNo != ''"> and exists (select 1 from bas_stock_detail x where x.stock_id = bs.stock_id and x.lot_no like concat('%', #{lotNo}, '%'))</if>
+            ${params.warehouseScope}
+        </where>
+        order by bcs.warehouse_id, bcs.roadway_id, bcs.the_floor, bcs.the_platoon, bcs.the_column, bcs.cargo_space_id, bs.stock_id
+    </select>
+
+    <select id="selectLocationOutboundDetailsByStockIds" parameterType="String" resultMap="LocationOutboundDetailResult">
+        <include refid="detailSelect" />
+        where bsd.stock_id in
+        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+          and isnull(bsd.quantity, 0) &gt; 0
+        order by bsd.stock_id, bsd.product_id, bsd.detail_id
+    </select>
+
+    <select id="selectLocationOutboundStockForUpdate" parameterType="String" resultMap="LocationOutboundStockResult">
+        select top 1 bcs.cargo_space_id, bcs.cargo_space_name, bcs.status as cargo_space_status, bcs.locked,
+               bcs.warehouse_id, isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
+               bcs.roadway_id, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.the_type, bcs.the_type_name,
+               bs.stock_id, bs.stock_status, bs.tray_code, bbf.tray_type, bs.in_date, bs.stockin_id, bs.in_type,
+               bs.supplier_id, bs.supplier_name,
+               isnull(bsa.detail_count, 0) as detail_count,
+               isnull(bsa.quantity, 0) as quantity,
+               isnull(bsa.out_quantity, 0) as out_quantity,
+               isnull(bsa.available_quantity, 0) as available_quantity
+        from bas_stock bs with (UPDLOCK, HOLDLOCK)
+        inner join bas_cargo_space bcs with (UPDLOCK, HOLDLOCK) on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+        left join (
+            <include refid="stockAggregate" />
+        ) bsa on bsa.stock_id = bs.stock_id
+        outer apply (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
+        where bs.stock_id = #{stockId}
+    </select>
+
+    <select id="selectLocationOutboundLocationForUpdate" parameterType="String" resultMap="LocationOutboundStockResult">
+        select top 1 bcs.cargo_space_id, bcs.cargo_space_name, bcs.status as cargo_space_status, bcs.locked,
+               bcs.warehouse_id, isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
+               bcs.roadway_id, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.the_type, bcs.the_type_name,
+               bs.stock_id, bs.stock_status, bs.tray_code, bbf.tray_type, bs.in_date, bs.stockin_id, bs.in_type,
+               bs.supplier_id, bs.supplier_name,
+               isnull(bsa.detail_count, 0) as detail_count,
+               isnull(bsa.quantity, 0) as quantity,
+               isnull(bsa.out_quantity, 0) as out_quantity,
+               isnull(bsa.available_quantity, 0) as available_quantity
+        from bas_cargo_space bcs with (UPDLOCK, HOLDLOCK)
+        left join bas_stock bs with (UPDLOCK, HOLDLOCK) on bs.cargo_space_id = bcs.cargo_space_id
+            and bcs.status in ('2', '4')
+        left join bas_warehouse bw on bcs.warehouse_id = bw.warehouse_id
+        left join (
+            <include refid="stockAggregate" />
+        ) bsa on bsa.stock_id = bs.stock_id
+        outer apply (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
+        where bcs.cargo_space_id = #{cargoSpaceId}
+        order by bs.in_date desc, bs.stock_id
+    </select>
+
+    <select id="selectAvailableDetailsForUpdate" parameterType="String" resultMap="LocationOutboundDetailResult">
+        select bsd.detail_id, bsd.stock_id, bsd.product_status, bsd.lot_no, bsd.product_id, bsd.product_name,
+               bsd.quantity, bsd.out_quantity, bsd.job_detail_id, bsd.stockin_detail_id,
+               bs.cargo_space_id, bcs.cargo_space_name, bs.stock_status, bs.in_date, bs.back_date,
+               bs.tray_code, bs.warehouse_id, isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name,
+               bbf.tray_type,
+               isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) as available_quantity,
+               bsd.create_time, bsd.update_time, bsd.remark
+        from bas_stock_detail bsd with (UPDLOCK, HOLDLOCK)
+        inner join bas_stock bs with (UPDLOCK, HOLDLOCK) on bsd.stock_id = bs.stock_id
+        left join bas_cargo_space bcs with (UPDLOCK, HOLDLOCK) on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+        outer apply (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
+        where bsd.stock_id = #{stockId}
+          and isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) &gt; 0
+        order by bsd.product_id, bsd.detail_id
+    </select>
+
+    <update id="reserveStockDetailForOutbound" parameterType="java.util.Map">
+        update bas_stock_detail
+        set out_quantity = isnull(out_quantity, 0) + #{quantity},
+            job_detail_id = #{jobDetailId},
+            update_time = sysdatetime()
+        where detail_id = #{stockDetailId}
+          and stock_id = #{stockId}
+          and isnull(quantity, 0) - isnull(out_quantity, 0) &gt;= #{quantity}
+    </update>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
index 780ef61..f232a95 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
@@ -28,56 +28,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remar" column="remar" />
         <result property="stockId" column="stock_id" />
         <result property="stockDetailId" column="stock_detail_id" />
+        <result property="trayType" column="tray_type" />
     </resultMap>
 
     <sql id="selectOutStockoutDetailVo">
-        select stockout_detail_id, stockout_id, lot_no, product_id, product_name, quantity, allot_num, assign_num, remark, status,
-               line_n, item_cod, item_nam, spec_mode, uni, actual_qt, warehous, locatio, inventory_, source_doc_n, remar,
-               stock_id, stock_detail_id
-        from out_stockout_detail
+        select d.stockout_detail_id, d.stockout_id, d.lot_no, d.product_id, d.product_name, d.quantity, d.allot_num, d.assign_num, d.remark, d.status,
+               d.line_n, d.item_cod, d.item_nam, d.spec_mode, d.uni, d.actual_qt, d.warehous, d.locatio, d.inventory_, d.source_doc_n, d.remar,
+               d.stock_id, d.stock_detail_id, bbf.tray_type
+        from out_stockout_detail d
+        left join bas_stock_detail bsd on d.stock_detail_id = bsd.detail_id
+        left join bas_stock bs on bs.stock_id = COALESCE(NULLIF(d.stock_id, ''), bsd.stock_id)
+        OUTER APPLY (
+            select top 1 prefix as tray_type
+            from bas_barcode_format bbf
+            where bbf.prefix is not null
+              and bbf.prefix != ''
+              and bs.tray_code is not null
+              and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+            order by len(bbf.prefix) desc
+        ) bbf
     </sql>
     <sql id="selectOutStockoutDetailFinishVo">
-        select stockout_detail_id, stockout_id, lot_no, product_id, product_name, quantity, allot_num, assign_num, remark, status,
-               line_n, item_cod, item_nam, spec_mode, uni, actual_qt, warehous, locatio, inventory_, source_doc_n, remar,
-               stock_id, stock_detail_id
-        from out_stockout_detail_finish
+        select d.stockout_detail_id, d.stockout_id, d.lot_no, d.product_id, d.product_name, d.quantity, d.allot_num, d.assign_num, d.remark, d.status,
+               d.line_n, d.item_cod, d.item_nam, d.spec_mode, d.uni, d.actual_qt, d.warehous, d.locatio, d.inventory_, d.source_doc_n, d.remar,
+               d.stock_id, d.stock_detail_id, null as tray_type
+        from out_stockout_detail_finish d
     </sql>
 
     <select id="selectOutStockoutDetailList" parameterType="OutStockoutDetail" resultMap="OutStockoutDetailResult">
         <include refid="selectOutStockoutDetailVo"/>
         <where>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null "> and quantity = #{quantity}</if>
-            <if test="allotNum != null "> and allot_num = #{allotNum}</if>
-            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
-            <if test="itemCod != null and itemCod != ''"> and item_cod like concat('%', #{itemCod}, '%')</if>
-            <if test="itemNam != null and itemNam != ''"> and item_nam like concat('%', #{itemNam}, '%')</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and d.stockout_id = #{stockoutId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and d.lot_no = #{lotNo}</if>
+            <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</if>
+            <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
+            <if test="quantity != null "> and d.quantity = #{quantity}</if>
+            <if test="allotNum != null "> and d.allot_num = #{allotNum}</if>
+            <if test="assignNum != null "> and d.assign_num = #{assignNum}</if>
+            <if test="itemCod != null and itemCod != ''"> and d.item_cod like concat('%', #{itemCod}, '%')</if>
+            <if test="itemNam != null and itemNam != ''"> and d.item_nam like concat('%', #{itemNam}, '%')</if>
         </where>
     </select>
 
     <select id="selectOutStockoutDetailByStockoutDetailId" parameterType="String" resultMap="OutStockoutDetailResult">
         <include refid="selectOutStockoutDetailVo"/>
-        where stockout_detail_id = #{stockoutDetailId}
+        where d.stockout_detail_id = #{stockoutDetailId}
     </select>
     <select id="selectOutStockoutDetailListByStockoutId" parameterType="String" resultMap="OutStockoutDetailResult">
         <include refid="selectOutStockoutDetailVo"/>
-        where stockout_id = #{stockoutDetailId}
+        where d.stockout_id = #{stockoutDetailId}
     </select>
     <select id="selectOutStockoutDetailFinishList" parameterType="OutStockoutDetail" resultMap="OutStockoutDetailResult">
         <include refid="selectOutStockoutDetailFinishVo"/>
         <where>
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null "> and quantity = #{quantity}</if>
-            <if test="allotNum != null "> and allot_num = #{allotNum}</if>
-            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
-            <if test="itemCod != null and itemCod != ''"> and item_cod like concat('%', #{itemCod}, '%')</if>
-            <if test="itemNam != null and itemNam != ''"> and item_nam like concat('%', #{itemNam}, '%')</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and d.stockout_id = #{stockoutId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and d.lot_no = #{lotNo}</if>
+            <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</if>
+            <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
+            <if test="quantity != null "> and d.quantity = #{quantity}</if>
+            <if test="allotNum != null "> and d.allot_num = #{allotNum}</if>
+            <if test="assignNum != null "> and d.assign_num = #{assignNum}</if>
+            <if test="itemCod != null and itemCod != ''"> and d.item_cod like concat('%', #{itemCod}, '%')</if>
+            <if test="itemNam != null and itemNam != ''"> and d.item_nam like concat('%', #{itemNam}, '%')</if>
         </where>
     </select>
 
@@ -164,6 +176,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where stockout_detail_id = #{stockoutDetailId}
     </update>
 
+    <update id="rollbackAllotByJobId" parameterType="String">
+        update d
+        set d.allot_num = case
+                when ISNULL(d.allot_num, 0) - ISNULL(jd.rollback_quantity, 0) &lt; 0 then 0
+                else ISNULL(d.allot_num, 0) - ISNULL(jd.rollback_quantity, 0)
+            end,
+            d.status = case
+                when ISNULL(d.allot_num, 0) - ISNULL(jd.rollback_quantity, 0) &lt;= 0 then '0'
+                else d.status
+            end
+        from out_stockout_detail d
+        inner join (
+            select in_or_out_d_id as stockout_detail_id,
+                   sum(ISNULL(out_quantity, 0)) as rollback_quantity
+            from mydo_job_detail
+            where job_id = #{jobId}
+              and in_or_out_d_id is not null
+              and in_or_out_d_id != ''
+            group by in_or_out_d_id
+        ) jd on jd.stockout_detail_id = d.stockout_detail_id
+    </update>
+
     <delete id="deleteOutStockoutDetailByStockoutDetailId" parameterType="String">
         delete from out_stockout_detail where stockout_detail_id = #{stockoutDetailId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index 6c5e808..08080c6 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="autoAssignOutStockoutByProc" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_out_auto_allocation(
                 #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultString,mode=OUT,jdbcType=VARCHAR}
               )}
@@ -252,11 +253,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         {call proc_out_hand_allocation(
                 #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
                 #{v_stock_id,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultString,mode=OUT,jdbcType=VARCHAR}
               )}
     </select>
 
+    <update id="reopenOutStockoutByExceptionJobId" parameterType="String">
+        update o
+        set o.status = '2',
+            o.start_date = null
+        from out_stockout o
+        where o.status = '3'
+          and exists (
+              select 1
+              from mydo_job_detail jd
+              where jd.job_id = #{jobId}
+                and jd.in_or_out_id = o.stockout_id
+          )
+          and not exists (
+              select 1
+              from mydo_job_detail active_jd
+              where active_jd.in_or_out_id = o.stockout_id
+                and active_jd.job_id != #{jobId}
+          )
+    </update>
+
     <delete id="deleteOutStockoutByStockoutId" parameterType="String">
         delete from out_stockout where stockout_id = #{stockoutId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
index 534265f..9a3efa6 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
@@ -50,18 +50,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="lockInboundCargoSpace" parameterType="java.util.Map">
         update bas_cargo_space
         set status = '3',
-            locked = 'Y',
             tray_code = #{v_tray_code}
         where cargo_space_id = (
             select top 1 cargo_space_id
-            from bas_cargo_space with (UPDLOCK, READPAST, ROWLOCK)
-            where warehouse_id = #{v_warehouse_id}
-              and the_type = #{v_cargo_type}
-              and (#{v_roadway_id} is null or #{v_roadway_id} = '' or roadway_id = #{v_roadway_id})
-              and status = '1'
-              and locked = 'N'
-              and (tray_code is null or tray_code = '')
-            order by the_floor asc, the_platoon asc, the_column asc
+            from (
+                select bcs.cargo_space_id,
+                       bcs.the_platoon,
+                       bcs.the_column,
+                       bcs.the_floor,
+                       count(1) over (partition by bcs.the_platoon) as platoon_empty_count
+                from bas_cargo_space bcs with (UPDLOCK, READPAST, ROWLOCK)
+                where bcs.warehouse_id = #{v_warehouse_id}
+                  and bcs.the_type = #{v_cargo_type}
+                  and (#{v_roadway_id} is null or #{v_roadway_id} = '' or bcs.roadway_id = #{v_roadway_id})
+                  and bcs.status = '1'
+                  and bcs.locked = 'N'
+                  and (bcs.tray_code is null or bcs.tray_code = '')
+            ) candidate
+            order by platoon_empty_count desc, the_platoon asc, the_floor asc, the_column asc, cargo_space_id asc
         )
     </update>
 
@@ -72,19 +78,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and tray_code = #{v_tray_code}
           and (#{v_roadway_id} is null or #{v_roadway_id} = '' or roadway_id = #{v_roadway_id})
           and status = '3'
-          and locked = 'Y'
         order by the_floor asc, the_platoon asc, the_column asc
     </select>
 
     <update id="releaseInboundCargoSpace" parameterType="java.util.Map">
         update bas_cargo_space
         set status = '1',
-            locked = 'N',
             tray_code = null
         where warehouse_id = #{v_warehouse_id}
           and tray_code = #{v_tray_code}
           and status = '3'
-          and locked = 'Y'
     </update>
 
     <select id="outboundTaskList" parameterType="java.util.Map" resultType="java.util.HashMap">
@@ -99,16 +102,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                isnull(j.exit_id, '') as portName,
                convert(varchar(19), j.create_time, 120) as createTime,
                j.status as status,
-               case j.status
-                   when '1' then '未执行'
-                   when '2' then '待执行'
-                   when '3' then '执行中'
+               j.execution_phase as executionPhase,
+               case
+                   when j.execution_phase = '5' then '待扫码确认'
+                   when j.status = '1' then '未执行'
+                   when j.status = '2' then '待执行'
+                   when j.status = '3' then '执行中'
                    else '待确认'
                end as statusName,
-               case j.status
-                   when '1' then 'pending'
-                   when '2' then 'pending'
-                   when '3' then 'processing'
+               case
+                   when j.execution_phase = '5' then 'pending'
+                   when j.status = '1' then 'pending'
+                   when j.status = '2' then 'pending'
+                   when j.status = '3' then 'processing'
                    else 'pending'
                end as statusClass
         from mydo_job j
@@ -116,38 +122,192 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where j.in_or_out &gt;= 20
           and j.status in ('1', '2', '3')
           and (#{taskNo} is null or #{taskNo} = '' or j.task_no = #{taskNo})
-        group by j.job_id, j.task_no, j.exit_id, j.create_time, j.status
+        group by j.job_id, j.task_no, j.exit_id, j.create_time, j.status, j.execution_phase
         order by j.create_time desc
     </select>
 
     <select id="selectOutboundDetail" parameterType="java.util.Map" resultType="java.util.HashMap">
         select top 1 j.job_id as jobId,
                j.task_no as taskNo,
-               jd.job_detail_id as jobDetailId,
-               jd.stock_id as stockId,
-               jd.stockin_detail_id as stockDetailId,
-               jd.product_id as materialCode,
-               jd.product_name as materialName,
-               jd.lot_no as lotNo,
-               jd.out_quantity as quantity,
                j.tray_code as trayCode,
                j.cargo_space_id as locationCode,
                j.cargo_space_name as locationName,
+               j.warehouse_id as warehouseId,
+               j.warehouse_name as warehouseName,
+               j.execution_phase as executionPhase,
                isnull(j.exit_id, '') as portName,
+               sum(isnull(jd.out_quantity, 0)) as quantity,
+               count(1) as materialCount,
                '' as spec
         from mydo_job j
         inner join mydo_job_detail jd on j.job_id = jd.job_id
         where j.in_or_out &gt;= 20
           and j.status in ('1', '2', '3')
           and (#{taskNo} is null or #{taskNo} = '' or j.task_no = #{taskNo})
-          and (
-              #{barcode} is null or #{barcode} = ''
-              or j.task_no = #{barcode}
-              or j.tray_code = #{barcode}
-              or jd.stock_id = #{barcode}
-              or jd.stockin_detail_id = #{barcode}
-              or jd.product_id = #{barcode}
-          )
-        order by j.create_time desc, jd.job_detail_id
+          and (#{barcode} is null or #{barcode} = '' or j.tray_code = #{barcode})
+        group by j.job_id, j.task_no, j.tray_code, j.cargo_space_id, j.cargo_space_name,
+                 j.warehouse_id, j.warehouse_name, j.execution_phase, j.exit_id, j.create_time
+        order by j.create_time desc
     </select>
+
+    <select id="selectOutboundTrayMaterials" parameterType="java.util.Map" resultType="java.util.HashMap">
+        select jd.job_detail_id as jobDetailId,
+               jd.stock_id as stockId,
+               jd.stockin_detail_id as stockDetailId,
+               jd.product_id as materialCode,
+               jd.product_name as materialName,
+               jd.lot_no as lotNo,
+               jd.stock_quantity as stockQuantity,
+               jd.out_quantity as quantity,
+               isnull(jd.stock_quantity, 0) - isnull(jd.out_quantity, 0) as residualQuantity
+        from mydo_job_detail jd
+        where jd.job_id = #{jobId}
+        order by jd.job_detail_id
+    </select>
+
+    <select id="selectResidualTrayMaterials" parameterType="java.util.Map" resultType="java.util.HashMap">
+        select bsd.detail_id as stockDetailId,
+               bsd.stock_id as stockId,
+               bsd.product_id as productId,
+               bsd.product_id as materialCode,
+               bsd.product_name as productName,
+               bsd.product_name as materialName,
+               bsd.lot_no as lotNo,
+               isnull(bsd.quantity, 0) as quantity,
+               bs.tray_code as trayCode,
+               bs.warehouse_id as warehouseId,
+               bs.warehouse_name as warehouseName,
+               bs.cargo_space_id as cargoSpaceId,
+               bcs.cargo_space_name as cargoSpaceName,
+               bcs.roadway_id as roadwayId,
+               bs.supplier_id as supplierId,
+               bs.supplier_name as supplierName
+        from bas_stock_detail bsd
+        inner join bas_stock bs on bsd.stock_id = bs.stock_id
+        left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+        where bs.tray_code = #{trayCode}
+          and bs.warehouse_id = #{warehouseId}
+          and isnull(bsd.quantity, 0) &gt; 0
+        order by bsd.detail_id
+    </select>
+
+    <select id="selectTrayStockMaterials" parameterType="String" resultType="java.util.HashMap">
+        select bsd.detail_id as stockDetailId,
+               bsd.stock_id as stockId,
+               bsd.product_id as productId,
+               bsd.product_id as materialCode,
+               bsd.product_name as productName,
+               bsd.product_name as materialName,
+               bsd.lot_no as lotNo,
+               isnull(bsd.quantity, 0) as quantity,
+               isnull(bsd.out_quantity, 0) as outQuantity,
+               isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) as availableQuantity,
+               bs.tray_code as trayCode,
+               bs.stock_status as stockStatus,
+               bs.product_status as productStatus,
+               bs.warehouse_id as warehouseId,
+               isnull(nullif(bs.warehouse_name, ''), bw.warehouse_name) as warehouseName,
+               bs.cargo_space_id as cargoSpaceId,
+               bcs.cargo_space_name as cargoSpaceName,
+               bcs.roadway_id as roadwayId,
+               bs.supplier_id as supplierId,
+               bs.supplier_name as supplierName,
+               convert(varchar(19), bs.in_date, 120) as inDate
+        from bas_stock bs
+        inner join bas_stock_detail bsd on bs.stock_id = bsd.stock_id
+        left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+        where bs.tray_code = #{trayCode}
+          and isnull(bsd.quantity, 0) &gt; 0
+        order by bsd.detail_id
+    </select>
+
+    <select id="selectAvailableEmptyTrayTypeCounts" parameterType="String" resultType="java.util.HashMap">
+        select bbf.id as formatId,
+               bbf.format_name as formatName,
+               bbf.prefix as barcodePrefix,
+               count(1) as quantity
+        from bas_stock_detail bsd
+        inner join bas_stock bs on bsd.stock_id = bs.stock_id
+        inner join bas_barcode_format bbf
+            on bbf.prefix is not null
+           and bbf.prefix != ''
+           and left(bs.tray_code, len(bbf.prefix)) = bbf.prefix
+        where bs.warehouse_id = #{warehouseId}
+          and bsd.product_id = 'KTP0001'
+          and isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) &gt; 0
+          and bs.tray_code is not null
+          and bs.tray_code != ''
+          and not exists (
+              select 1
+              from bas_barcode_format bbf2
+              where bbf2.prefix is not null
+                and bbf2.prefix != ''
+                and left(bs.tray_code, len(bbf2.prefix)) = bbf2.prefix
+                and len(bbf2.prefix) &gt; len(bbf.prefix)
+          )
+        group by bbf.id, bbf.format_name, bbf.prefix
+        order by bbf.prefix
+    </select>
+
+    <select id="countAvailableEmptyTrays" parameterType="java.util.Map" resultType="int">
+        select count(1)
+        from bas_stock_detail bsd
+        inner join bas_stock bs on bsd.stock_id = bs.stock_id
+        where bs.warehouse_id = #{warehouseId}
+          and left(bs.tray_code, len(#{barcodePrefix})) = #{barcodePrefix}
+          and bsd.product_id = 'KTP0001'
+          and isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) &gt; 0
+          and bs.tray_code is not null
+          and bs.tray_code != ''
+    </select>
+
+    <select id="selectAvailableEmptyTrayStocks" parameterType="java.util.Map" resultType="java.util.HashMap">
+        select top (#{limit})
+               bsd.detail_id as stockDetailId,
+               bsd.stock_id as stockId,
+               bsd.lot_no as lotNo,
+               bsd.product_id as productId,
+               bsd.product_name as productName,
+               isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) as availableQuantity,
+               bs.tray_code as trayCode,
+               bs.warehouse_id as warehouseId,
+               isnull(nullif(bs.warehouse_name, ''), (select top 1 bw.warehouse_name from bas_warehouse bw where bw.warehouse_id = bs.warehouse_id)) as warehouseName,
+               bs.cargo_space_id as cargoSpaceId,
+               bcs.cargo_space_name as cargoSpaceName,
+               bcs.roadway_id as roadwayId,
+               bs.supplier_id as supplierId,
+               bs.supplier_name as supplierName
+        from bas_stock_detail bsd with (UPDLOCK, HOLDLOCK)
+        inner join bas_stock bs with (UPDLOCK, HOLDLOCK) on bsd.stock_id = bs.stock_id
+        left join bas_cargo_space bcs with (UPDLOCK, HOLDLOCK) on bs.cargo_space_id = bcs.cargo_space_id
+        where bs.warehouse_id = #{warehouseId}
+          and left(bs.tray_code, len(#{barcodePrefix})) = #{barcodePrefix}
+          and bsd.product_id = 'KTP0001'
+          and isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) &gt; 0
+          and bs.tray_code is not null
+          and bs.tray_code != ''
+        order by bs.in_date asc, bs.cargo_space_id asc, bsd.detail_id asc
+    </select>
+
+    <update id="reserveEmptyTrayStockDetail" parameterType="java.util.Map">
+        update bas_stock_detail
+        set out_quantity = isnull(out_quantity, 0) + #{quantity},
+            job_detail_id = #{jobDetailId},
+            update_time = sysdatetime()
+        where detail_id = #{stockDetailId}
+          and stock_id = #{stockId}
+          and product_id = 'KTP0001'
+          and isnull(quantity, 0) - isnull(out_quantity, 0) &gt;= #{quantity}
+    </update>
+
+    <update id="lockEmptyTrayCargoSpace" parameterType="java.util.Map">
+        update bcs
+        set status = '4',
+            tray_code = bs.tray_code
+        from bas_cargo_space bcs
+        inner join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
+        where bs.stock_id = #{stockId}
+          and bs.cargo_space_id = #{cargoSpaceId}
+    </update>
 </mapper>
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/api/aspect/ApiLogAspectTest.java b/ruoyi-admin/src/test/java/com/ruoyi/api/aspect/ApiLogAspectTest.java
new file mode 100644
index 0000000..45113bf
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/api/aspect/ApiLogAspectTest.java
@@ -0,0 +1,106 @@
+package com.ruoyi.api.aspect;
+
+import com.ruoyi.api.service.ApiLogService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.aspectj.lang.JoinPoint;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.lang.annotation.Annotation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ApiLogAspectTest {
+
+    @Mock
+    private ApiLogService apiLogService;
+
+    @Mock
+    private JoinPoint joinPoint;
+
+    private ApiLogAspect aspect;
+
+    @BeforeEach
+    void setUp() {
+        aspect = new ApiLogAspect();
+        ReflectionTestUtils.setField(aspect, "apiLogService", apiLogService);
+
+        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/api/wcs/exception");
+        request.addHeader("X-Trace-Id", "TRACE-001");
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+    }
+
+    @AfterEach
+    void tearDown() {
+        RequestContextHolder.resetRequestAttributes();
+    }
+
+    @Test
+    void recordsReturnedAjaxResultFailureAsFailedApiLog() {
+        when(joinPoint.getArgs()).thenReturn(new Object[0]);
+        com.ruoyi.common.annotation.ApiLog annotation = apiLogAnnotation();
+
+        aspect.doBefore(joinPoint, annotation);
+        aspect.doAfterReturning(joinPoint, annotation, new AjaxResult(1, "未找到对应作业"));
+
+        ArgumentCaptor<com.ruoyi.api.domain.ApiLog> logCaptor =
+                ArgumentCaptor.forClass(com.ruoyi.api.domain.ApiLog.class);
+        verify(apiLogService).record(logCaptor.capture());
+        com.ruoyi.api.domain.ApiLog apiLog = logCaptor.getValue();
+        assertThat(apiLog.getStatus()).isEqualTo("FAIL");
+        assertThat(apiLog.getHttpStatus()).isEqualTo(200);
+        assertThat(apiLog.getErrorMsg()).isEqualTo("未找到对应作业");
+        assertThat(apiLog.getResponseBody()).contains("未找到对应作业");
+    }
+
+    private com.ruoyi.common.annotation.ApiLog apiLogAnnotation() {
+        return new com.ruoyi.common.annotation.ApiLog() {
+            @Override
+            public String interfaceName() {
+                return "WCS-作业异常处理";
+            }
+
+            @Override
+            public String sysCode() {
+                return "WCS";
+            }
+
+            @Override
+            public String direction() {
+                return "INBOUND";
+            }
+
+            @Override
+            public boolean isSaveRequestData() {
+                return true;
+            }
+
+            @Override
+            public boolean isSaveResponseData() {
+                return true;
+            }
+
+            @Override
+            public String[] excludeParamNames() {
+                return new String[0];
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return com.ruoyi.common.annotation.ApiLog.class;
+            }
+        };
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/api/client/WcsClientTest.java b/ruoyi-admin/src/test/java/com/ruoyi/api/client/WcsClientTest.java
index 0b6d6fc..c06b750 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/api/client/WcsClientTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/api/client/WcsClientTest.java
@@ -3,10 +3,10 @@ package com.ruoyi.api.client;
 import com.ruoyi.api.config.ExternalProp;
 import com.ruoyi.api.constant.MsgTypeEnum;
 import com.ruoyi.api.domain.ApiResponse;
+import com.ruoyi.api.exception.BizException;
 import com.ruoyi.in.job.domain.MydoJob;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 class WcsClientTest {
 
     @Test
-    void inboundAndOutboundJobPayloadsUseSameWcsReceiveEndpoint() {
-        RecordingWcsClient client = new RecordingWcsClient();
+    void wcsMethodsReturnMockValuesWithoutPostingToRealWcs() {
+        NoPostWcsClient client = new NoPostWcsClient(true);
 
         MydoJob inboundJob = new MydoJob();
         inboundJob.setJobId("RK001");
@@ -27,31 +27,108 @@ class WcsClientTest {
         outboundJob.setJobId("CK001");
         outboundJob.setInOrOut(20L);
 
-        client.sendPutawayTask(inboundJob);
-        client.sendRetrieveTask(outboundJob);
-
-        assertThat(client.urls).containsExactly(
-                "http://wcs/wcs/api/receiveWmsJob",
-                "http://wcs/wcs/api/receiveWmsJob");
-        assertThat(client.messageTypes).containsExactly(MsgTypeEnum.JSON, MsgTypeEnum.JSON);
+        assertThat(client.sendPutawayTask("RK001", "A0101", "TP001", "10").getData())
+                .isEqualTo("MOCK_WCS_PUTAWAY_OK");
+        assertThat(client.sendPutawayTask(inboundJob).getData())
+                .isEqualTo("MOCK_WCS_PUTAWAY_OK");
+        assertThat(client.sendRetrieveTask("CK001", "A0101", "M001", "1").getData())
+                .isEqualTo("MOCK_WCS_RETRIEVE_OK");
+        assertThat(client.sendRetrieveTask(outboundJob).getData())
+                .isEqualTo("MOCK_WCS_RETRIEVE_OK");
+        assertThat(client.sendCraneMove("CR01", "A0101", "A0102", "MOVE").getData())
+                .isEqualTo("MOCK_WCS_CRANE_MOVE_OK");
+        assertThat(client.cancelTask("TASK001").getData())
+                .isEqualTo("MOCK_WCS_CANCEL_OK");
+        assertThat(client.queryDeviceStatus("CRANE").getData()).hasSize(1);
+        assertThat(client.queryDeviceStatus("CRANE").getData().get(0).get("status"))
+                .isEqualTo("MOCK_ONLINE");
     }
 
-    private static class RecordingWcsClient extends WcsClient {
-        private final ExternalProp externalProp;
-        private final List<String> urls = new ArrayList<>();
-        private final List<MsgTypeEnum> messageTypes = new ArrayList<>();
+    @Test
+    void wcsMethodsPostToConfiguredEndpointsWhenMockDisabled() {
+        RecordingWcsClient client = new RecordingWcsClient(false);
 
-        private RecordingWcsClient() {
-            externalProp = new ExternalProp();
-            ExternalProp.SystemConfig wcs = new ExternalProp.SystemConfig();
-            wcs.setBaseUrl("http://wcs");
-            Map<String, String> apis = new HashMap<>();
-            apis.put("sendPutawayTask", "/wcs/api/receiveWmsJob");
-            apis.put("sendRetrieveTask", "/task/dispatch");
-            wcs.setApis(apis);
-            Map<String, ExternalProp.SystemConfig> systems = new HashMap<>();
-            systems.put("WCS", wcs);
-            externalProp.setSystems(systems);
+        MydoJob inboundJob = new MydoJob();
+        inboundJob.setJobId("RK001");
+        inboundJob.setInOrOut(1L);
+
+        MydoJob outboundJob = new MydoJob();
+        outboundJob.setJobId("CK001");
+        outboundJob.setInOrOut(20L);
+
+        assertThat(client.sendPutawayTask("RK001", "A0101", "TP001", "10").getData())
+                .isEqualTo("ACCEPTED");
+        assertThat(client.sendPutawayTask(inboundJob).getData())
+                .isEqualTo("ACCEPTED");
+        assertThat(client.sendRetrieveTask("CK001", "A0101", "M001", "1").getData())
+                .isEqualTo("ACCEPTED");
+        assertThat(client.sendRetrieveTask(outboundJob).getData())
+                .isEqualTo("ACCEPTED");
+        assertThat(client.queryDeviceStatus("CRANE").getData().get(0).get("status"))
+                .isEqualTo("ONLINE");
+        assertThat(client.sendCraneMove("CR01", "A0101", "A0102", "MOVE").getData())
+                .isEqualTo("ACCEPTED");
+        assertThat(client.cancelTask("TASK001").getData())
+                .isEqualTo("ACCEPTED");
+
+        assertThat(client.calls).extracting(Call::url).containsExactly(
+                "http://wcs/wcs/api/receiveWmsJob",
+                "http://wcs/wcs/api/receiveWmsJob",
+                "http://wcs/task/dispatch",
+                "http://wcs/wcs/api/receiveWmsJob",
+                "http://wcs/device/status",
+                "http://wcs/crane/move",
+                "http://wcs/task/cancel");
+        assertThat(client.calls).extracting(Call::messageType).containsExactly(
+                MsgTypeEnum.TEXT,
+                MsgTypeEnum.JSON,
+                MsgTypeEnum.TEXT,
+                MsgTypeEnum.JSON,
+                MsgTypeEnum.TEXT,
+                MsgTypeEnum.TEXT,
+                MsgTypeEnum.TEXT);
+    }
+
+    @Test
+    void jsonAckTreatsCodeZeroAsSuccess() {
+        RecordingWcsClient client = new RecordingWcsClient(false,
+                "{\"code\":0,\"message\":\"ok\",\"data\":\"ACCEPTED\"}");
+
+        ApiResponse<String> response = client.sendPutawayTask(inboundJob());
+
+        assertThat(response.isSuccess()).isTrue();
+        assertThat(response.getData()).isEqualTo("ACCEPTED");
+    }
+
+    @Test
+    void jsonAckTreatsCodeOneAsFailure() {
+        RecordingWcsClient client = new RecordingWcsClient(false,
+                "{\"code\":1,\"message\":\"任务拒绝\"}");
+
+        ApiResponse<String> response = client.sendPutawayTask(inboundJob());
+
+        assertThat(response.isSuccess()).isFalse();
+        assertThat(response.getCode()).isEqualTo("BIZ_FAIL");
+        assertThat(response.getMessage()).isEqualTo("WCS拒绝: 任务拒绝");
+    }
+
+    @Test
+    void jsonAckNoLongerTreatsLegacyCodeTwoHundredAsSuccess() {
+        RecordingWcsClient client = new RecordingWcsClient(false,
+                "{\"code\":200,\"message\":\"旧成功码\"}");
+
+        ApiResponse<String> response = client.sendPutawayTask(inboundJob());
+
+        assertThat(response.isSuccess()).isFalse();
+        assertThat(response.getCode()).isEqualTo("BIZ_FAIL");
+        assertThat(response.getMessage()).isEqualTo("WCS拒绝: 旧成功码");
+    }
+
+    private static class NoPostWcsClient extends WcsClient {
+        private final ExternalProp externalProp;
+
+        private NoPostWcsClient(boolean mockEnabled) {
+            externalProp = testExternalProp(mockEnabled);
         }
 
         @Override
@@ -62,9 +139,76 @@ class WcsClientTest {
         @Override
         protected <T> ApiResponse<T> post(String url, String body, String interfaceName,
                                           ResponseParser<T> parser, MsgTypeEnum messageType) {
-            urls.add(url);
-            messageTypes.add(messageType);
-            return ApiResponse.ok(null);
+            throw new AssertionError("WCS local mock must not post to real WCS");
         }
     }
+
+    private static class RecordingWcsClient extends WcsClient {
+        private final ExternalProp externalProp;
+        private final List<Call> calls = new java.util.ArrayList<>();
+        private final String jsonAckBody;
+
+        private RecordingWcsClient(boolean mockEnabled) {
+            this(mockEnabled, null);
+        }
+
+        private RecordingWcsClient(boolean mockEnabled, String jsonAckBody) {
+            externalProp = testExternalProp(mockEnabled);
+            this.jsonAckBody = jsonAckBody;
+        }
+
+        @Override
+        protected ExternalProp externalProp() {
+            return externalProp;
+        }
+
+        @Override
+        protected <T> ApiResponse<T> post(String url, String body, String interfaceName,
+                                          ResponseParser<T> parser, MsgTypeEnum messageType) {
+            calls.add(new Call(url, body, interfaceName, messageType));
+            try {
+                String rawBody;
+                if ("WCS-查询设备状态".equals(interfaceName)) {
+                    rawBody = "OK|CR01,ONLINE,Y,";
+                } else if (jsonAckBody != null && MsgTypeEnum.JSON.equals(messageType)) {
+                    rawBody = jsonAckBody;
+                } else {
+                    rawBody = "OK|ACCEPTED";
+                }
+                return ApiResponse.ok(parser.parse(rawBody));
+            } catch (BizException e) {
+                return ApiResponse.fail("BIZ_FAIL", e.getMessage());
+            } catch (Exception e) {
+                return ApiResponse.fail("PARSE_FAIL", e.getMessage());
+            }
+        }
+    }
+
+    private static MydoJob inboundJob() {
+        MydoJob job = new MydoJob();
+        job.setJobId("RK001");
+        job.setInOrOut(1L);
+        return job;
+    }
+
+    private static ExternalProp testExternalProp(boolean mockEnabled) {
+        ExternalProp externalProp = new ExternalProp();
+        ExternalProp.SystemConfig wcs = new ExternalProp.SystemConfig();
+        wcs.setBaseUrl("http://wcs");
+        wcs.setMockEnabled(mockEnabled);
+        Map<String, String> apis = new HashMap<>();
+        apis.put("sendPutawayTask", "/wcs/api/receiveWmsJob");
+        apis.put("sendRetrieveTask", "/task/dispatch");
+        apis.put("queryDeviceStatus", "/device/status");
+        apis.put("sendCraneMove", "/crane/move");
+        apis.put("cancelTask", "/task/cancel");
+        wcs.setApis(apis);
+        Map<String, ExternalProp.SystemConfig> systems = new HashMap<>();
+        systems.put("WCS", wcs);
+        externalProp.setSystems(systems);
+        return externalProp;
+    }
+
+    private record Call(String url, String body, String interfaceName, MsgTypeEnum messageType) {
+    }
 }
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/api/controller/ExternalApiControllerWcsCodeTest.java b/ruoyi-admin/src/test/java/com/ruoyi/api/controller/ExternalApiControllerWcsCodeTest.java
new file mode 100644
index 0000000..336e070
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/api/controller/ExternalApiControllerWcsCodeTest.java
@@ -0,0 +1,146 @@
+package com.ruoyi.api.controller;
+
+import com.ruoyi.api.client.WcsClient;
+import com.ruoyi.api.domain.ApiResponse;
+import com.ruoyi.api.domain.WcsInboundCompleteRequest;
+import com.ruoyi.api.domain.WcsJobExceptionRequest;
+import com.ruoyi.api.domain.WcsOutboundCompleteRequest;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.in.job.domain.MydoJob;
+import com.ruoyi.in.job.service.IMydoJobService;
+import com.ruoyi.pda.service.PdaService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ExternalApiControllerWcsCodeTest {
+
+    @Mock
+    private WcsClient wcsClient;
+
+    @Mock
+    private IMydoJobService mydoJobService;
+
+    @Mock
+    private PdaService pdaService;
+
+    @InjectMocks
+    private ExternalApiController controller;
+
+    @Test
+    void wcsClientTriggerEndpointsReturnCodeZeroWhenWcsCallSucceeds() {
+        when(wcsClient.sendPutawayTask("RK001", "A0101", "TP001", "NORMAL"))
+            .thenReturn(ApiResponse.ok("PUTAWAY_OK"));
+        when(wcsClient.sendRetrieveTask("CK001", "A0101", "M001", "2"))
+            .thenReturn(ApiResponse.ok("RETRIEVE_OK"));
+        when(wcsClient.queryDeviceStatus("ALL"))
+            .thenReturn(ApiResponse.ok(List.of(Map.of("deviceId", "CR01", "status", "ONLINE"))));
+        when(wcsClient.sendCraneMove("CR01", "A0101", "A0102", "MOVE"))
+            .thenReturn(ApiResponse.ok("MOVE_OK"));
+        when(wcsClient.cancelTask("TASK001"))
+            .thenReturn(ApiResponse.ok("CANCEL_OK"));
+
+        assertWcsSuccess(controller.sendPutawayTask("RK001", "A0101", "TP001", "NORMAL"));
+        assertWcsSuccess(controller.sendRetrieveTask("CK001", "A0101", "M001", "2"));
+        assertWcsSuccess(controller.queryDeviceStatus("ALL"));
+        assertWcsSuccess(controller.sendCraneMove("CR01", "A0101", "A0102", "MOVE"));
+        assertWcsSuccess(controller.cancelWcsTask("TASK001"));
+    }
+
+    @Test
+    void wcsClientTriggerEndpointsReturnCodeOneWhenWcsCallFails() {
+        when(wcsClient.sendRetrieveTask("CK001", "A0101", "M001", "2"))
+            .thenReturn(ApiResponse.fail("WCS_NG", "WCS拒绝任务"));
+
+        AjaxResult result = controller.sendRetrieveTask("CK001", "A0101", "M001", "2");
+
+        assertWcsError(result, "WCS拒绝任务");
+    }
+
+    @Test
+    void wcsCallbackEndpointsReturnCodeZeroWhenBusinessHandlingSucceeds() {
+        MydoJob inboundJob = new MydoJob();
+        inboundJob.setJobId("RK001");
+        inboundJob.setInOrOut(1L);
+        when(mydoJobService.selectMydoJobByJobId("RK001")).thenReturn(inboundJob);
+        when(mydoJobService.completeInJobFromWcs("RK001")).thenReturn(AjaxResult.success("入库完成"));
+
+        MydoJob outboundJob = new MydoJob();
+        outboundJob.setJobId("CK001");
+        outboundJob.setInOrOut(20L);
+        when(mydoJobService.selectMydoJobByJobId("CK001")).thenReturn(outboundJob);
+        when(mydoJobService.completeOutJobFromWcs("CK001")).thenReturn(AjaxResult.success("出库完成"));
+
+        WcsInboundCompleteRequest inboundRequest = new WcsInboundCompleteRequest();
+        inboundRequest.setJobId("RK001");
+        WcsOutboundCompleteRequest outboundRequest = new WcsOutboundCompleteRequest();
+        outboundRequest.setJobId("CK001");
+
+        assertWcsSuccess(controller.completeInbound(inboundRequest));
+        assertWcsSuccess(controller.completeOutbound(outboundRequest));
+    }
+
+    @Test
+    void wcsCallbackEndpointsReturnCodeOneWhenBusinessHandlingFails() {
+        MydoJob outboundJob = new MydoJob();
+        outboundJob.setJobId("CK001");
+        outboundJob.setInOrOut(20L);
+        when(mydoJobService.selectMydoJobByJobId("CK001")).thenReturn(outboundJob);
+        when(mydoJobService.completeOutJobFromWcs("CK001")).thenReturn(AjaxResult.error("出库完成失败"));
+
+        WcsOutboundCompleteRequest request = new WcsOutboundCompleteRequest();
+        request.setJobId("CK001");
+
+        assertWcsError(controller.completeOutbound(request), "出库完成失败");
+    }
+
+    @Test
+    void wcsCallbackEndpointsRejectMismatchedJobTypes() {
+        MydoJob outboundJob = new MydoJob();
+        outboundJob.setJobId("CK001");
+        outboundJob.setInOrOut(20L);
+        when(mydoJobService.selectMydoJobByJobId("RK001")).thenReturn(outboundJob);
+
+        MydoJob inboundJob = new MydoJob();
+        inboundJob.setJobId("RK002");
+        inboundJob.setInOrOut(1L);
+        when(mydoJobService.selectMydoJobByJobId("RK002")).thenReturn(inboundJob);
+
+        WcsInboundCompleteRequest inboundRequest = new WcsInboundCompleteRequest();
+        inboundRequest.setJobId("RK001");
+        WcsOutboundCompleteRequest outboundRequest = new WcsOutboundCompleteRequest();
+        outboundRequest.setJobId("RK002");
+
+        assertWcsError(controller.completeInbound(inboundRequest), "非法入库作业");
+        assertWcsError(controller.completeOutbound(outboundRequest), "非法出库作业");
+        verify(mydoJobService, never()).completeInJobFromWcs("RK001");
+        verify(mydoJobService, never()).completeOutJobFromWcs("RK002");
+    }
+
+    @Test
+    void wcsCallbackValidationErrorsReturnCodeOne() {
+        WcsJobExceptionRequest request = new WcsJobExceptionRequest();
+
+        assertWcsError(controller.handleWcsException(request), "异常类型不能为空");
+    }
+
+    private void assertWcsSuccess(AjaxResult result) {
+        assertThat(result.get(AjaxResult.CODE_TAG)).isEqualTo(0);
+    }
+
+    private void assertWcsError(AjaxResult result, String messagePart) {
+        assertThat(result.get(AjaxResult.CODE_TAG)).isEqualTo(1);
+        assertThat(String.valueOf(result.get(AjaxResult.MSG_TAG))).contains(messagePart);
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapperSqlTest.java b/ruoyi-admin/src/test/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapperSqlTest.java
new file mode 100644
index 0000000..3d1e202
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/bas/cargospace/mapper/BasCargoSpaceMapperSqlTest.java
@@ -0,0 +1,72 @@
+package com.ruoyi.bas.cargospace.mapper;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BasCargoSpaceMapperSqlTest {
+
+    @Test
+    void putOccupiedReallocationUsesTrayRuleCargoTypeInsteadOfOriginalCargoSpaceType() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String selectSql = section(xml, "<select id=\"selectAvailableInboundCargoSpaceInRoadway\"", "</select>");
+
+        assertThat(selectSql)
+            .contains("bas_tray_rule")
+            .contains("allowed_cargo_type")
+            .contains("left(#{trayCode}, len(btr.tray_type)) = btr.tray_type")
+            .doesNotContain("cs2.the_type");
+    }
+
+    @Test
+    void automaticCargoSpaceStatusUpdatesDoNotChangeManualLockedFlag() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+
+        for (String id : List.of(
+            "markOutboundAssignedByStockId",
+            "markOutboundAssignedByStockRef",
+            "markOutboundAssignedByStockoutDetailId",
+            "markOutboundAssignedByCargoSpaceId",
+            "releaseOutboundCargoSpace",
+            "markOutboundNeedCheck",
+            "markInboundNeedCheck")) {
+            String updateSql = section(xml, "<update id=\"" + id + "\"", "</update>");
+            assertThat(updateSql)
+                .doesNotContain("locked = 'Y'")
+                .doesNotContain("locked = 'N'");
+        }
+    }
+
+    @Test
+    void putOccupiedReallocationChoosesPlatoonWithMostAvailableCargoSpaces() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String selectSql = section(xml, "<select id=\"selectAvailableInboundCargoSpaceInRoadway\"", "</select>");
+
+        assertThat(selectSql)
+            .contains("count(1) over (partition by bcs.the_platoon) as platoon_empty_count")
+            .contains("order by platoon_empty_count desc");
+    }
+
+    private Path resolveMapperXml() {
+        return Stream.of(
+                Path.of("src/main/resources/mapper/bas/BasCargoSpaceMapper.xml"),
+                Path.of("ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml")
+            )
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private String section(String text, String startMarker, String endMarker) {
+        int start = text.indexOf(startMarker);
+        assertThat(start).isGreaterThanOrEqualTo(0);
+        int end = text.indexOf(endMarker, start);
+        assertThat(end).isGreaterThan(start);
+        return text.substring(start, end);
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/bas/stationpoint/BasStationPointConfigurationTest.java b/ruoyi-admin/src/test/java/com/ruoyi/bas/stationpoint/BasStationPointConfigurationTest.java
new file mode 100644
index 0000000..ae5c3b0
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/bas/stationpoint/BasStationPointConfigurationTest.java
@@ -0,0 +1,41 @@
+package com.ruoyi.bas.stationpoint;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BasStationPointConfigurationTest {
+
+    @Test
+    void pointSizeConfigurationIncludesCommonPointType() throws Exception {
+        String domain = Files.readString(resolvePath(
+            "src/main/java/com/ruoyi/bas/stationpoint/domain/BasStationPoint.java",
+            "ruoyi-admin/src/main/java/com/ruoyi/bas/stationpoint/domain/BasStationPoint.java"));
+        String vue = Files.readString(resolvePath(
+            "../ruoyi-ui/src/views/bas/stationpoint/index.vue",
+            "ruoyi-ui/src/views/bas/stationpoint/index.vue"));
+        String sql = Files.readString(resolvePath(
+            "../sql/bas_station_point.sql",
+            "sql/bas_station_point.sql"));
+
+        assertThat(domain)
+            .contains("1-大点位，2-小点位，3-通用点位")
+            .contains("1=大点位,2=小点位,3=通用点位");
+        assertThat(vue)
+            .contains("<el-option label=\"通用点位\" value=\"3\" />")
+            .contains("if (size === '3') return '通用点位'");
+        assertThat(sql)
+            .contains("1=大点位，2=小点位，3=通用点位");
+    }
+
+    private Path resolvePath(String modulePath, String rootPath) {
+        return Stream.of(Path.of(modulePath), Path.of(rootPath))
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImplTest.java
new file mode 100644
index 0000000..07b8765
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImplTest.java
@@ -0,0 +1,91 @@
+package com.ruoyi.bas.stock.service.impl;
+
+import com.ruoyi.bas.stock.domain.BasStock;
+import com.ruoyi.bas.stock.domain.BasStockDetail;
+import com.ruoyi.bas.stock.mapper.BasStockDetailMapper;
+import com.ruoyi.bas.stock.mapper.BasStockMapper;
+import com.ruoyi.bas.stockoper.mapper.BasStockOperRecordMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class BasStockServiceImplTest {
+
+    @Mock
+    private BasStockMapper basStockMapper;
+
+    @Mock
+    private BasStockDetailMapper basStockDetailMapper;
+
+    @Mock
+    private BasStockOperRecordMapper basStockOperRecordMapper;
+
+    @Mock
+    private SysDeptMapper sysDeptMapper;
+
+    @InjectMocks
+    private BasStockServiceImpl service;
+
+    @Test
+    void insertBasStockGeneratesKcMillisecondTimestampStockIdWhenMissing() {
+        BasStock stock = new BasStock();
+        stock.setWarehouseId("WH01");
+        stock.setStockStatus("1");
+        when(basStockMapper.insertBasStock(stock)).thenReturn(1);
+
+        int rows = service.insertBasStock(stock);
+
+        assertThat(rows).isEqualTo(1);
+        ArgumentCaptor<BasStock> stockCaptor = ArgumentCaptor.forClass(BasStock.class);
+        verify(basStockMapper).insertBasStock(stockCaptor.capture());
+        assertThat(stockCaptor.getValue().getStockId()).matches("KC\\d{17}");
+        verify(basStockDetailMapper, never()).insertBasStockDetail(org.mockito.ArgumentMatchers.any());
+    }
+
+    @Test
+    void insertBasStockCreatesInitialDetailIdFromStockIdAndDetailSequence() {
+        BasStock stock = new BasStock();
+        stock.setStockId("KC20260624152234021");
+        stock.setProductId("MAT001");
+        stock.setProductName("物料1");
+        stock.setQuantity(new BigDecimal("6"));
+        when(basStockMapper.insertBasStock(stock)).thenReturn(1);
+
+        int rows = service.insertBasStock(stock);
+
+        assertThat(rows).isEqualTo(1);
+        ArgumentCaptor<BasStockDetail> detailCaptor = ArgumentCaptor.forClass(BasStockDetail.class);
+        verify(basStockDetailMapper).insertBasStockDetail(detailCaptor.capture());
+        assertThat(detailCaptor.getValue().getDetailId()).isEqualTo("KC20260624152234021-1");
+    }
+
+    @Test
+    void insertBasStockDetailCreatesDetailIdFromStockIdAndDetailSequence() {
+        BasStockDetail detail = new BasStockDetail();
+        detail.setStockId("KC20260624152234021");
+        detail.setProductId("MAT002");
+        detail.setProductName("物料2");
+        detail.setQuantity(new BigDecimal("4"));
+        when(basStockDetailMapper.insertBasStockDetail(any(BasStockDetail.class))).thenReturn(1);
+
+        int rows = service.insertBasStockDetail(detail);
+
+        assertThat(rows).isEqualTo(1);
+        ArgumentCaptor<BasStockDetail> detailCaptor = ArgumentCaptor.forClass(BasStockDetail.class);
+        verify(basStockDetailMapper).insertBasStockDetail(detailCaptor.capture());
+        assertThat(detailCaptor.getValue().getDetailId()).isEqualTo("KC20260624152234021-1");
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java b/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java
new file mode 100644
index 0000000..643ef3f
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/in/job/mapper/MydoJobMapperSqlTest.java
@@ -0,0 +1,125 @@
+package com.ruoyi.in.job.mapper;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MydoJobMapperSqlTest {
+
+    @Test
+    void inboundJobListFiltersByWarehouseIdSoWarehouseDropdownCanQueryReliably() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String selectInList = section(xml, "<select id=\"selectInMydoJobList\"", "</select>");
+
+        assertThat(selectInList)
+            .contains("<if test=\"warehouseId != null  and warehouseId != ''\"> and warehouse_id = #{warehouseId}</if>");
+    }
+
+    @Test
+    void inboundCompletionProcedureUsesMillisecondTimestampStockId() throws Exception {
+        String script = Files.readString(resolveSqlPath()).replace("\r\n", "\n");
+        String proc = section(script, "CREATE PROCEDURE [dbo].[proc_complete_in_job]", "END\nGO");
+
+        assertThat(proc)
+            .contains("@now DATETIME2(3) = SYSDATETIME()")
+            .contains("FORMAT(@now, 'yyyyMMddHHmmssfff')")
+            .contains("SET @stock_id = 'KC' + FORMAT(@now, 'yyyyMMddHHmmssfff')");
+    }
+
+    @Test
+    void jobDictUpdateScriptAddsWaitingForPdaScanExecutionPhase() throws Exception {
+        String script = Files.readString(resolveJobDictScriptPath());
+
+        assertThat(script)
+            .contains("dict_type = N'mydo_job_execution_phase' AND dict_value = N'5'")
+            .contains("N'等待扫码确认'")
+            .contains("N'warning'")
+            .doesNotContain("INSERT INTO sys_dict_data (dict_code");
+    }
+
+    @Test
+    void inboundCancelProcedureAllowsReturnInboundJobs() throws Exception {
+        String script = Files.readString(resolveCancelInJobScriptPath()).replace("\r\n", "\n");
+        String proc = section(script, "CREATE PROCEDURE [dbo].[proc_hand_delete_in_job]", "END\nGO");
+
+        assertThat(proc)
+            .contains("AND in_or_out < 20")
+            .doesNotContain("AND in_or_out = 1");
+    }
+
+    @Test
+    void inboundCompletionProcedureDoesNotChangeManualLockedFlag() throws Exception {
+        String script = Files.readString(resolveSqlPath()).replace("\r\n", "\n");
+        String proc = section(script, "CREATE PROCEDURE [dbo].[proc_complete_in_job]", "END\nGO");
+        String cargoSpaceUpdate = section(proc, "UPDATE bas_cargo_space", "WHERE cargo_space_id = @cargo_space_id");
+
+        assertThat(cargoSpaceUpdate)
+            .contains("SET status = '2'")
+            .doesNotContain("locked =");
+    }
+
+    @Test
+    void inboundCancelProcedureDoesNotChangeManualLockedFlag() throws Exception {
+        String script = Files.readString(resolveCancelInJobScriptPath()).replace("\r\n", "\n");
+        String proc = section(script, "CREATE PROCEDURE [dbo].[proc_hand_delete_in_job]", "END\nGO");
+        String cargoSpaceUpdate = section(proc, "UPDATE dbo.bas_cargo_space", "DELETE FROM dbo.mydo_job_detail");
+
+        assertThat(cargoSpaceUpdate)
+            .contains("SET status = '1'")
+            .contains("AND status = '3'")
+            .doesNotContain("locked =")
+            .doesNotContain("AND locked = 'Y'");
+    }
+
+    private Path resolveMapperXml() {
+        return Stream.of(
+                Path.of("src/main/resources/mapper/in/MydoJobMapper.xml"),
+                Path.of("ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml")
+            )
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private Path resolveSqlPath() {
+        return Stream.of(
+                Path.of("../sql/bas_stock_master_detail.sql"),
+                Path.of("sql/bas_stock_master_detail.sql")
+            )
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private Path resolveJobDictScriptPath() {
+        return Stream.of(
+                Path.of("../sql/20260624_update_job_dicts.sql"),
+                Path.of("sql/20260624_update_job_dicts.sql")
+            )
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private Path resolveCancelInJobScriptPath() {
+        return Stream.of(
+                Path.of("../sql/proc_hand_delete_in_job.sql"),
+                Path.of("sql/proc_hand_delete_in_job.sql")
+            )
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private String section(String text, String startMarker, String endMarker) {
+        int start = text.indexOf(startMarker);
+        assertThat(start).isGreaterThanOrEqualTo(0);
+        int end = text.indexOf(endMarker, start);
+        assertThat(end).isGreaterThan(start);
+        return text.substring(start, end);
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/in/job/service/impl/MydoJobServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/in/job/service/impl/MydoJobServiceImplTest.java
index 542d820..7d84d76 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/in/job/service/impl/MydoJobServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/in/job/service/impl/MydoJobServiceImplTest.java
@@ -2,20 +2,37 @@ package com.ruoyi.in.job.service.impl;
 
 import com.ruoyi.api.client.WcsClient;
 import com.ruoyi.api.domain.ApiResponse;
+import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
+import com.ruoyi.bas.stock.mapper.BasStockDetailMapper;
+import com.ruoyi.bas.stock.mapper.BasStockMapper;
 import com.ruoyi.bas.stationpoint.service.IBasStationPointService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.in.job.domain.MydoJob;
 import com.ruoyi.in.job.mapper.MydoJobMapper;
+import com.ruoyi.in.jobdetail.mapper.MydoJobDetailMapper;
 import com.ruoyi.in.stockin.mapper.InStockinMapper;
+import com.ruoyi.out.stockout.mapper.OutStockoutMapper;
+import com.ruoyi.out.stockoutdetail.mapper.OutStockoutDetailMapper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -33,12 +50,44 @@ class MydoJobServiceImplTest {
     @Mock
     private IBasStationPointService basStationPointService;
 
+    @Mock
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
+    @Mock
+    private BasStockMapper basStockMapper;
+
+    @Mock
+    private BasStockDetailMapper basStockDetailMapper;
+
+    @Mock
+    private OutStockoutDetailMapper outStockoutDetailMapper;
+
+    @Mock
+    private OutStockoutMapper outStockoutMapper;
+
+    @Mock
+    private MydoJobDetailMapper mydoJobDetailMapper;
+
     @Mock
     private WcsClient wcsClient;
 
     @InjectMocks
     private MydoJobServiceImpl service;
 
+    @BeforeEach
+    void setUpSecurityContext() {
+        SysUser user = new SysUser();
+        user.setUserName("tester");
+        LoginUser loginUser = new LoginUser(10L, 20L, user, Collections.emptySet());
+        SecurityContextHolder.getContext().setAuthentication(
+            new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities()));
+    }
+
+    @AfterEach
+    void clearSecurityContext() {
+        SecurityContextHolder.clearContext();
+    }
+
     @Test
     void pushOutJobToWcsRejectsInboundJob() {
         MydoJob job = new MydoJob();
@@ -88,7 +137,276 @@ class MydoJobServiceImplTest {
         verify(mydoJobMapper).updateMydoJob(updateCaptor.capture());
         MydoJob update = updateCaptor.getValue();
         assertThat(update.getJobId()).isEqualTo("CK002");
-        assertThat(update.getStatus()).isEqualTo("2");
+        assertThat(update.getStatus()).isEqualTo("3");
+        assertThat(update.getExecutionPhase()).isEqualTo("1");
         assertThat(update.getStartTime()).isNotBlank();
     }
+
+    @Test
+    void cancelOutJobAsksWcsBeforeCancellingPushedJob() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK003");
+        job.setTaskNo("TASK003");
+        job.setStatus("2");
+        job.setInOrOut(20L);
+        when(mydoJobMapper.selectMydoJobByJobId("CK003")).thenReturn(job);
+        when(wcsClient.cancelTask("TASK003")).thenReturn(ApiResponse.ok("OK"));
+        doAnswer(invocation -> {
+            @SuppressWarnings("unchecked")
+            java.util.HashMap<String, Object> map = invocation.getArgument(0);
+            map.put("v_result", "10");
+            return null;
+        }).when(mydoJobMapper).cancelOutJob(any(java.util.HashMap.class));
+
+        AjaxResult result = service.cancelJob("CK003", "2");
+
+        assertThat(result.isSuccess()).isTrue();
+        verify(wcsClient).cancelTask("TASK003");
+        verify(mydoJobMapper).cancelOutJob(any(java.util.HashMap.class));
+    }
+
+    @Test
+    void cancelOutJobStopsWhenWcsRejectsPushedJobCancellation() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK004");
+        job.setTaskNo("TASK004");
+        job.setStatus("2");
+        job.setInOrOut(20L);
+        when(mydoJobMapper.selectMydoJobByJobId("CK004")).thenReturn(job);
+        when(wcsClient.cancelTask("TASK004")).thenReturn(ApiResponse.fail("WCS_NG", "任务已执行不能取消"));
+
+        AjaxResult result = service.cancelJob("CK004", "2");
+
+        assertThat(result.isError()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG)).isEqualTo("WCS拒绝作废：任务已执行不能取消");
+        verify(wcsClient).cancelTask("TASK004");
+        verify(mydoJobMapper, never()).cancelOutJob(any(java.util.HashMap.class));
+    }
+
+    @Test
+    void completeOutJobFromWcsMarksJobWaitingForPdaScanAndReleasesCargoSpace() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK005");
+        job.setStatus("3");
+        job.setInOrOut(20L);
+        job.setCargoSpaceId("CS001");
+        job.setExitId("OUT01");
+        when(mydoJobMapper.selectMydoJobByJobId("CK005")).thenReturn(job);
+        when(mydoJobMapper.updateMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(basCargoSpaceMapper.releaseOutboundCargoSpace("CS001")).thenReturn(1);
+
+        AjaxResult result = service.completeOutJobFromWcs("CK005");
+
+        assertThat(result.isSuccess()).isTrue();
+        ArgumentCaptor<MydoJob> updateCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobMapper).updateMydoJob(updateCaptor.capture());
+        MydoJob update = updateCaptor.getValue();
+        assertThat(update.getJobId()).isEqualTo("CK005");
+        assertThat(update.getStatus()).isNull();
+        assertThat(update.getExecutionPhase()).isEqualTo("5");
+        assertThat(update.getFinishTime()).isNull();
+        verify(basCargoSpaceMapper).releaseOutboundCargoSpace("CS001");
+        verify(mydoJobMapper, never()).makeSure(any(java.util.HashMap.class));
+        verifyNoInteractions(basStationPointService);
+    }
+
+    @Test
+    void completeInJobFromWcsRejectsOutboundJobType() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK-WRONG");
+        job.setInOrOut(20L);
+        when(mydoJobMapper.selectMydoJobByJobId("CK-WRONG")).thenReturn(job);
+
+        AjaxResult result = service.completeInJobFromWcs("CK-WRONG");
+
+        assertThat(result.isError()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG)).isEqualTo("非法入库作业");
+        verify(mydoJobMapper, never()).selectStockinIdsByJobId("CK-WRONG");
+        verify(mydoJobMapper, never()).completeJob(any(java.util.HashMap.class));
+    }
+
+    @Test
+    void completeOutJobFromWcsRejectsInboundJobType() {
+        MydoJob job = new MydoJob();
+        job.setJobId("RK-WRONG");
+        job.setInOrOut(1L);
+        when(mydoJobMapper.selectMydoJobByJobId("RK-WRONG")).thenReturn(job);
+
+        AjaxResult result = service.completeOutJobFromWcs("RK-WRONG");
+
+        assertThat(result.isError()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG)).isEqualTo("非法出库作业");
+        verify(mydoJobMapper, never()).updateMydoJob(any(MydoJob.class));
+        verifyNoInteractions(basCargoSpaceMapper);
+    }
+
+    @Test
+    void manualCompleteOutJobDoesNotReleaseCargoSpaceAfterProcedureCompletes() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK006");
+        job.setStatus("3");
+        job.setInOrOut(20L);
+        job.setCargoSpaceId("CS002");
+        job.setExitId("OUT02");
+        when(mydoJobMapper.selectMydoJobByJobId("CK006")).thenReturn(job);
+        doAnswer(invocation -> {
+            @SuppressWarnings("unchecked")
+            java.util.HashMap<String, Object> map = invocation.getArgument(0);
+            map.put("v_result", "10");
+            return null;
+        }).when(mydoJobMapper).makeSure(any(java.util.HashMap.class));
+
+        AjaxResult result = service.completeJob("CK006", "2");
+
+        assertThat(result.isSuccess()).isTrue();
+        verify(mydoJobMapper).makeSure(any(java.util.HashMap.class));
+        verify(basCargoSpaceMapper, never()).releaseOutboundCargoSpace("CS002");
+        verify(basStationPointService).releaseBasStationPoint("OUT02");
+    }
+
+    @Test
+    void handleWcsPickEmptyExceptionDeletesAssociatedStockAndRollsBackDocumentAllocation() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK007");
+        job.setStatus("3");
+        job.setInOrOut(20L);
+        job.setCargoSpaceId("CS003");
+        job.setExitId("OUT03");
+        when(mydoJobMapper.selectMydoJobByJobId("CK007")).thenReturn(job);
+        when(mydoJobMapper.selectStockIdsByJobId("CK007")).thenReturn(Collections.singletonList("ST001"));
+        when(mydoJobMapper.selectStockoutDetailIdsByJobId("CK007")).thenReturn(Collections.singletonList("CKD001-1"));
+        when(basCargoSpaceMapper.markOutboundNeedCheck("CS003")).thenReturn(1);
+        when(outStockoutDetailMapper.rollbackAllotByJobId("CK007")).thenReturn(1);
+        when(basStockDetailMapper.deleteBasStockDetailByStockIds(any(String[].class))).thenReturn(1);
+        when(basStockMapper.deleteBasStockByStockIds(any(String[].class))).thenReturn(1);
+        when(outStockoutMapper.reopenOutStockoutByExceptionJobId("CK007")).thenReturn(1);
+        when(mydoJobDetailMapper.deleteMydoJobDetailByJobId("CK007")).thenReturn(1);
+        when(mydoJobMapper.deleteMydoJobByJobId("CK007")).thenReturn(1);
+
+        AjaxResult result = service.handleWcsPickEmptyException("CK007");
+
+        assertThat(result.isSuccess()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG)).isEqualTo("取货无货异常处理完成");
+        verify(basCargoSpaceMapper).markOutboundNeedCheck("CS003");
+        verify(outStockoutDetailMapper).rollbackAllotByJobId("CK007");
+        verify(basStockDetailMapper).deleteBasStockDetailByStockIds(argThat(ids ->
+            java.util.Arrays.equals(ids, new String[] {"ST001"})));
+        verify(basStockMapper).deleteBasStockByStockIds(argThat(ids ->
+            java.util.Arrays.equals(ids, new String[] {"ST001"})));
+        verify(basStockDetailMapper, never()).rollbackOutboundQuantityByJobId("CK007");
+        verify(basStockMapper, never()).refreshBasStockSummary("ST001");
+        verify(basStockMapper, never()).markExceptionByJobId("CK007");
+        verify(outStockoutMapper).reopenOutStockoutByExceptionJobId("CK007");
+        verify(mydoJobDetailMapper).deleteMydoJobDetailByJobId("CK007");
+        verify(mydoJobMapper).deleteMydoJobByJobId("CK007");
+        verify(basStationPointService).releaseBasStationPoint("OUT03");
+    }
+
+    @Test
+    void handleWcsPickEmptyExceptionWithoutStockDetailsStillCompletes() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK008");
+        job.setStatus("3");
+        job.setInOrOut(20L);
+        job.setCargoSpaceId("CS008");
+        job.setExitId("OUT08");
+        when(mydoJobMapper.selectMydoJobByJobId("CK008")).thenReturn(job);
+        when(mydoJobMapper.selectStockIdsByJobId("CK008")).thenReturn(Collections.emptyList());
+        when(basCargoSpaceMapper.markOutboundNeedCheck("CS008")).thenReturn(1);
+        when(mydoJobDetailMapper.deleteMydoJobDetailByJobId("CK008")).thenReturn(1);
+        when(mydoJobMapper.deleteMydoJobByJobId("CK008")).thenReturn(1);
+
+        AjaxResult result = service.handleWcsPickEmptyException("CK008");
+
+        assertThat(result.isSuccess()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG)).isEqualTo("取货无货异常处理完成");
+        verify(basCargoSpaceMapper).markOutboundNeedCheck("CS008");
+        verify(mydoJobDetailMapper).deleteMydoJobDetailByJobId("CK008");
+        verify(mydoJobMapper).deleteMydoJobByJobId("CK008");
+        verify(basStationPointService).releaseBasStationPoint("OUT08");
+        verifyNoInteractions(outStockoutDetailMapper);
+        verifyNoInteractions(basStockDetailMapper);
+        verifyNoInteractions(basStockMapper);
+        verifyNoInteractions(outStockoutMapper);
+    }
+
+    @Test
+    void handleWcsPickEmptyExceptionForLocationOutboundWithoutStockoutDocumentSkipsDocumentRollback() {
+        MydoJob job = new MydoJob();
+        job.setJobId("CK009");
+        job.setStatus("3");
+        job.setInOrOut(20L);
+        job.setCargoSpaceId("CS009");
+        job.setExitId("OUT09");
+        when(mydoJobMapper.selectMydoJobByJobId("CK009")).thenReturn(job);
+        when(mydoJobMapper.selectStockIdsByJobId("CK009")).thenReturn(Collections.singletonList("ST009"));
+        when(basCargoSpaceMapper.markOutboundNeedCheck("CS009")).thenReturn(1);
+        when(basStockDetailMapper.deleteBasStockDetailByStockIds(any(String[].class))).thenReturn(1);
+        when(basStockMapper.deleteBasStockByStockIds(any(String[].class))).thenReturn(1);
+        when(mydoJobDetailMapper.deleteMydoJobDetailByJobId("CK009")).thenReturn(1);
+        when(mydoJobMapper.deleteMydoJobByJobId("CK009")).thenReturn(1);
+
+        AjaxResult result = service.handleWcsPickEmptyException("CK009");
+
+        assertThat(result.isSuccess()).isTrue();
+        verify(basStockDetailMapper).deleteBasStockDetailByStockIds(argThat(ids ->
+            java.util.Arrays.equals(ids, new String[] {"ST009"})));
+        verify(basStockMapper).deleteBasStockByStockIds(argThat(ids ->
+            java.util.Arrays.equals(ids, new String[] {"ST009"})));
+        verify(basStockDetailMapper, never()).rollbackOutboundQuantityByJobId("CK009");
+        verify(basStockMapper, never()).refreshBasStockSummary("ST009");
+        verify(basStockMapper, never()).markExceptionByJobId("CK009");
+        verifyNoInteractions(outStockoutDetailMapper);
+        verify(outStockoutMapper, never()).reopenOutStockoutByExceptionJobId("CK009");
+    }
+
+    @Test
+    void handleWcsPutOccupiedExceptionMarksOldLocationAndReturnsReassignedInboundJob() {
+        MydoJob job = new MydoJob();
+        job.setJobId("RK002");
+        job.setStatus("3");
+        job.setInOrOut(10L);
+        job.setTrayCode("TRAY002");
+        job.setWarehouseId("WH01");
+        job.setRoadwayId("R01");
+        job.setCargoSpaceId("OLD-CS");
+        job.setCargoSpaceName("旧货位");
+
+        MydoJob updatedJob = new MydoJob();
+        updatedJob.setJobId("RK002");
+        updatedJob.setStatus("3");
+        updatedJob.setInOrOut(10L);
+        updatedJob.setTrayCode("TRAY002");
+        updatedJob.setWarehouseId("WH01");
+        updatedJob.setRoadwayId("R01");
+        updatedJob.setCargoSpaceId("NEW-CS");
+        updatedJob.setCargoSpaceName("新货位");
+
+        BasCargoSpace newCargoSpace = new BasCargoSpace();
+        newCargoSpace.setCargoSpaceId("NEW-CS");
+        newCargoSpace.setCargoSpaceName("新货位");
+        newCargoSpace.setRoadwayId("R01");
+
+        when(mydoJobMapper.selectMydoJobByJobId("RK002")).thenReturn(job, updatedJob);
+        when(basCargoSpaceMapper.selectAvailableInboundCargoSpaceInRoadway(job)).thenReturn(newCargoSpace);
+        when(basCargoSpaceMapper.updateBasCargoSpace(any(BasCargoSpace.class))).thenReturn(1);
+        when(basCargoSpaceMapper.markInboundNeedCheck("OLD-CS")).thenReturn(1);
+        when(mydoJobMapper.updateMydoJob(any(MydoJob.class))).thenReturn(1);
+
+        AjaxResult result = service.handleWcsPutOccupiedException("RK002");
+
+        assertThat(result.isSuccess()).isTrue();
+        assertThat(result.get(AjaxResult.DATA_TAG)).isSameAs(updatedJob);
+        verify(basCargoSpaceMapper).markInboundNeedCheck("OLD-CS");
+        verify(basCargoSpaceMapper).updateBasCargoSpace(argThat(cargoSpace ->
+            "NEW-CS".equals(cargoSpace.getCargoSpaceId())
+                && "3".equals(cargoSpace.getStatus())
+                && cargoSpace.getLocked() == null
+                && "TRAY002".equals(cargoSpace.getTrayCode())));
+        verify(mydoJobMapper).updateMydoJob(argThat(update ->
+            "RK002".equals(update.getJobId())
+                && "R01".equals(update.getRoadwayId())
+                && "NEW-CS".equals(update.getCargoSpaceId())
+                && "新货位".equals(update.getCargoSpaceName())));
+    }
 }
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImplTest.java
new file mode 100644
index 0000000..afa5643
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImplTest.java
@@ -0,0 +1,97 @@
+package com.ruoyi.in.stockin.service.impl;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.bas.id.job.service.JobIdService;
+import com.ruoyi.in.sotckindetail.domain.InStockinDetail;
+import com.ruoyi.in.sotckindetail.mapper.InStockinDetailMapper;
+import com.ruoyi.in.stockin.domain.InStockinSaveDTO;
+import com.ruoyi.in.stockin.mapper.InStockinMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class InStockinServiceImplTest {
+
+    @Mock
+    private InStockinMapper inStockinMapper;
+
+    @Mock
+    private InStockinDetailMapper inStockinDetailMapper;
+
+    @Mock
+    private SysDeptMapper sysDeptMapper;
+
+    @Mock
+    private JobIdService jobIdService;
+
+    @InjectMocks
+    private InStockinServiceImpl service;
+
+    @BeforeEach
+    void setUpSecurityContext() {
+        SysUser user = new SysUser();
+        user.setUserName("tester");
+        LoginUser loginUser = new LoginUser(10L, 20L, user, Collections.emptySet());
+        SecurityContextHolder.getContext().setAuthentication(
+            new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities()));
+    }
+
+    @AfterEach
+    void clearSecurityContext() {
+        SecurityContextHolder.clearContext();
+    }
+
+    @Test
+    void saveWithDetailsUsesItemCodeAndItemNameForProductFields() {
+        when(jobIdService.getId("RKD")).thenReturn("RKD001");
+        SysDept dept = new SysDept();
+        dept.setDeptName("测试部门");
+        when(sysDeptMapper.selectDeptById(20L)).thenReturn(dept);
+
+        InStockinDetail detail = new InStockinDetail();
+        detail.setProductId("测试物料名称");
+        detail.setProductName("测试物料名称");
+        detail.setItemCod("MAT001");
+        detail.setItemNam("测试物料名称");
+        detail.setQuantity(new BigDecimal("6"));
+
+        InStockinSaveDTO saveDTO = new InStockinSaveDTO();
+        saveDTO.setWarehouseId("WH01");
+        saveDTO.setWarehouseName("一号仓");
+        saveDTO.setDetails(List.of(detail));
+
+        String stockinId = service.saveInStockinWithDetails(saveDTO);
+
+        assertThat(stockinId).isEqualTo("RKD001");
+        verify(inStockinMapper).insertInStockin(saveDTO);
+        ArgumentCaptor<InStockinDetail> detailCaptor = ArgumentCaptor.forClass(InStockinDetail.class);
+        verify(inStockinDetailMapper).insertInStockinDetail(detailCaptor.capture());
+        InStockinDetail insertedDetail = detailCaptor.getValue();
+        assertThat(insertedDetail.getStockinDetailId()).isEqualTo("RKD001-1");
+        assertThat(insertedDetail.getStockinId()).isEqualTo("RKD001");
+        assertThat(insertedDetail.getProductId()).isEqualTo("MAT001");
+        assertThat(insertedDetail.getProductName()).isEqualTo("测试物料名称");
+        assertThat(insertedDetail.getItemCod()).isEqualTo("MAT001");
+        assertThat(insertedDetail.getItemNam()).isEqualTo("测试物料名称");
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/kpi/service/impl/KpiServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/kpi/service/impl/KpiServiceImplTest.java
new file mode 100644
index 0000000..06f74e1
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/kpi/service/impl/KpiServiceImplTest.java
@@ -0,0 +1,109 @@
+package com.ruoyi.kpi.service.impl;
+
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
+import com.ruoyi.bas.stock.mapper.BasStockDetailMapper;
+import com.ruoyi.in.job.mapper.MydoJobMapper;
+import com.ruoyi.kpi.domain.InAnalysisData;
+import com.ruoyi.kpi.domain.InAnalysisDataQuery;
+import com.ruoyi.kpi.domain.OutAnalysisData;
+import com.ruoyi.kpi.domain.OutAnalysisDataQuery;
+import com.ruoyi.kpi.mapper.KpiMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class KpiServiceImplTest {
+
+    @Mock
+    private KpiMapper kpiMapper;
+
+    @Mock
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
+    @Mock
+    private BasStockDetailMapper basStockDetailMapper;
+
+    @Mock
+    private MydoJobMapper mydoJobMapper;
+
+    @InjectMocks
+    private KpiServiceImpl service;
+
+    @Test
+    void inboundTrendGroupsNullRoadwayAsUnassignedAndSumsDuplicateDates() {
+        InAnalysisData nullRoadway = new InAnalysisData();
+        nullRoadway.setDateDay("2026-06-24");
+        nullRoadway.setRoadwayId(null);
+        nullRoadway.setCount(2L);
+
+        InAnalysisData blankRoadway = new InAnalysisData();
+        blankRoadway.setDateDay("2026-06-24");
+        blankRoadway.setRoadwayId(" ");
+        blankRoadway.setCount(3L);
+
+        InAnalysisData roadwayA = new InAnalysisData();
+        roadwayA.setDateDay("2026-06-25");
+        roadwayA.setRoadwayId("A");
+        roadwayA.setCount(4L);
+
+        InAnalysisData roadwayADuplicate = new InAnalysisData();
+        roadwayADuplicate.setDateDay("2026-06-25");
+        roadwayADuplicate.setRoadwayId("A");
+        roadwayADuplicate.setCount(6L);
+
+        InAnalysisDataQuery query = new InAnalysisDataQuery();
+        query.setStartTime("2026-06-24");
+        query.setEndTime("2026-06-25");
+        when(mydoJobMapper.selectInMydoJobFinishListGroupByWarehouseId(query))
+            .thenReturn(List.of(nullRoadway, blankRoadway, roadwayA, roadwayADuplicate));
+
+        Map<String, Object> result = service.selectInboundTrend(query);
+
+        assertThat(result.get("xAxis")).isEqualTo(List.of("2026-06-24", "2026-06-25"));
+        assertThat(result.get("series")).asList()
+            .anySatisfy(series -> {
+                Map<?, ?> item = (Map<?, ?>) series;
+                assertThat(item.get("name")).isEqualTo("巷道未分配");
+                assertThat(item.get("data")).isEqualTo(List.of(5L, 0L));
+            })
+            .anySatisfy(series -> {
+                Map<?, ?> item = (Map<?, ?>) series;
+                assertThat(item.get("name")).isEqualTo("巷道A");
+                assertThat(item.get("data")).isEqualTo(List.of(0L, 10L));
+            });
+    }
+
+    @Test
+    void outboundTrendGroupsNullRoadwayAsUnassigned() {
+        OutAnalysisData data = new OutAnalysisData();
+        data.setDateDay("2026-06-25");
+        data.setRoadwayId(null);
+        data.setCount(7L);
+
+        OutAnalysisDataQuery query = new OutAnalysisDataQuery();
+        query.setStartTime("2026-06-25");
+        query.setEndTime("2026-06-25");
+        when(mydoJobMapper.selectOutMydoJobFinishListGroupByWarehouseId(query))
+            .thenReturn(List.of(data));
+
+        Map<String, Object> result = service.selectOutboundTrend(query);
+
+        assertThat(result.get("xAxis")).isEqualTo(List.of("2026-06-25"));
+        assertThat(result.get("series")).asList()
+            .singleElement()
+            .satisfies(series -> {
+                Map<?, ?> item = (Map<?, ?>) series;
+                assertThat(item.get("name")).isEqualTo("巷道未分配");
+                assertThat(item.get("data")).isEqualTo(List.of(7L));
+            });
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/out/location/service/impl/LocationOutboundServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/out/location/service/impl/LocationOutboundServiceImplTest.java
new file mode 100644
index 0000000..b54754d
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/out/location/service/impl/LocationOutboundServiceImplTest.java
@@ -0,0 +1,199 @@
+package com.ruoyi.out.location.service.impl;
+
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
+import com.ruoyi.bas.id.job.service.JobIdService;
+import com.ruoyi.bas.id.taskno.service.TaskNoService;
+import com.ruoyi.bas.stationpoint.domain.BasStationPoint;
+import com.ruoyi.bas.stationpoint.service.IBasStationPointService;
+import com.ruoyi.bas.stock.domain.BasStockDetail;
+import com.ruoyi.bas.stock.mapper.BasStockMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.in.job.domain.MydoJob;
+import com.ruoyi.in.job.service.IMydoJobService;
+import com.ruoyi.in.jobdetail.domain.MydoJobDetail;
+import com.ruoyi.in.jobdetail.service.IMydoJobDetailService;
+import com.ruoyi.out.location.domain.LocationOutboundGenerateRequest;
+import com.ruoyi.out.location.domain.LocationOutboundStock;
+import com.ruoyi.out.location.mapper.LocationOutboundMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class LocationOutboundServiceImplTest {
+
+    @Mock
+    private LocationOutboundMapper locationOutboundMapper;
+
+    @Mock
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
+    @Mock
+    private BasStockMapper basStockMapper;
+
+    @Mock
+    private IBasStationPointService basStationPointService;
+
+    @Mock
+    private IMydoJobService mydoJobService;
+
+    @Mock
+    private IMydoJobDetailService mydoJobDetailService;
+
+    @Mock
+    private JobIdService jobIdService;
+
+    @Mock
+    private TaskNoService taskNoService;
+
+    @InjectMocks
+    private LocationOutboundServiceImpl service;
+
+    @Test
+    void generateWholeTrayOutboundJobReservesEveryAvailableStockDetailAndLocksCargoSpace() {
+        LocationOutboundStock stock = new LocationOutboundStock();
+        stock.setStockId("KC001");
+        stock.setCargoSpaceId("CS001");
+        stock.setCargoSpaceName("01排001列01层");
+        stock.setCargoSpaceStatus("2");
+        stock.setTrayCode("A001");
+        stock.setTrayType("A");
+        stock.setWarehouseId("WH01");
+        stock.setWarehouseName("一号仓");
+        stock.setRoadwayId("R01");
+        stock.setSupplierId("S001");
+        stock.setSupplierName("供应商1");
+        stock.setAvailableQuantity(new BigDecimal("12"));
+        when(locationOutboundMapper.selectLocationOutboundStockForUpdate("KC001")).thenReturn(stock);
+
+        BasStockDetail detailA = stockDetail("SD001", "MAT001", "物料1", "L001", "8");
+        BasStockDetail detailB = stockDetail("SD002", "MAT002", "物料2", "L002", "4");
+        when(locationOutboundMapper.selectAvailableDetailsForUpdate("KC001")).thenReturn(List.of(detailA, detailB));
+
+        BasStationPoint exitPoint = new BasStationPoint();
+        exitPoint.setPointId("OUT01");
+        exitPoint.setWarehouseId("WH01");
+        exitPoint.setPointType("2");
+        exitPoint.setStatus("0");
+        exitPoint.setPointStatus("0");
+        exitPoint.setTrayType("A,B");
+        when(basStationPointService.selectBasStationPointByPointId("OUT01")).thenReturn(exitPoint);
+        when(jobIdService.getId("CK")).thenReturn("CK001");
+        when(taskNoService.getTaskNo("20")).thenReturn("50001");
+        when(mydoJobService.insertMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(mydoJobDetailService.insertMydoJobDetail(any(MydoJobDetail.class))).thenReturn(1);
+        when(locationOutboundMapper.reserveStockDetailForOutbound(any(HashMap.class))).thenReturn(1);
+        when(basStockMapper.refreshBasStockSummary("KC001")).thenReturn(1);
+        when(basCargoSpaceMapper.markOutboundAssignedByStockId("KC001")).thenReturn(1);
+        when(mydoJobService.pushOutJobToWcs("CK001")).thenReturn(AjaxResult.success("WCS出库作业下发成功：OK"));
+
+        LocationOutboundGenerateRequest request = new LocationOutboundGenerateRequest();
+        request.setStockId("KC001");
+        request.setExitId("OUT01");
+        String result = service.generateWholeTrayOutboundJob(request);
+
+        assertThat(result).contains("CK001").contains("WCS出库作业下发成功");
+
+        ArgumentCaptor<MydoJob> jobCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).insertMydoJob(jobCaptor.capture());
+        MydoJob job = jobCaptor.getValue();
+        assertThat(job.getJobId()).isEqualTo("CK001");
+        assertThat(job.getTaskNo()).isEqualTo("50001");
+        assertThat(job.getInOrOut()).isEqualTo(20L);
+        assertThat(job.getStatus()).isEqualTo("1");
+        assertThat(job.getCargoSpaceId()).isEqualTo("CS001");
+        assertThat(job.getExitId()).isEqualTo("OUT01");
+
+        ArgumentCaptor<MydoJobDetail> detailCaptor = ArgumentCaptor.forClass(MydoJobDetail.class);
+        verify(mydoJobDetailService, org.mockito.Mockito.times(2)).insertMydoJobDetail(detailCaptor.capture());
+        List<MydoJobDetail> jobDetails = detailCaptor.getAllValues();
+        assertThat(jobDetails).extracting(MydoJobDetail::getJobDetailId).containsExactly("CK001-1", "CK001-2");
+        assertThat(jobDetails).extracting(MydoJobDetail::getProductId).containsExactly("MAT001", "MAT002");
+        assertThat(jobDetails).extracting(MydoJobDetail::getOutQuantity)
+            .containsExactly(new BigDecimal("8"), new BigDecimal("4"));
+        assertThat(jobDetails).extracting(MydoJobDetail::getStockinDetailId).containsExactly("SD001", "SD002");
+
+        ArgumentCaptor<HashMap> reserveCaptor = ArgumentCaptor.forClass(HashMap.class);
+        verify(locationOutboundMapper, org.mockito.Mockito.times(2)).reserveStockDetailForOutbound(reserveCaptor.capture());
+        assertThat(reserveCaptor.getAllValues()).extracting(map -> map.get("stockDetailId"))
+            .containsExactly("SD001", "SD002");
+        verify(basStockMapper).refreshBasStockSummary("KC001");
+        verify(basCargoSpaceMapper).markOutboundAssignedByStockId("KC001");
+        verify(mydoJobService).pushOutJobToWcs("CK001");
+    }
+
+    @Test
+    void generateWholeTrayOutboundJobAllowsEmptyAbnormalLocationWithoutStockDetails() {
+        LocationOutboundStock location = new LocationOutboundStock();
+        location.setCargoSpaceId("CS-EMPTY");
+        location.setCargoSpaceName("02排001列01层");
+        location.setCargoSpaceStatus("6");
+        location.setWarehouseId("WH01");
+        location.setWarehouseName("一号仓");
+        location.setRoadwayId("R01");
+        when(locationOutboundMapper.selectLocationOutboundLocationForUpdate("CS-EMPTY")).thenReturn(location);
+
+        BasStationPoint exitPoint = new BasStationPoint();
+        exitPoint.setPointId("OUT01");
+        exitPoint.setWarehouseId("WH01");
+        exitPoint.setPointType("2");
+        exitPoint.setStatus("0");
+        exitPoint.setPointStatus("0");
+        when(basStationPointService.selectBasStationPointByPointId("OUT01")).thenReturn(exitPoint);
+        when(jobIdService.getId("CK")).thenReturn("CK002");
+        when(taskNoService.getTaskNo("20")).thenReturn("50002");
+        when(mydoJobService.insertMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(basCargoSpaceMapper.markOutboundAssignedByCargoSpaceId("CS-EMPTY")).thenReturn(1);
+        when(mydoJobService.pushOutJobToWcs("CK002")).thenReturn(AjaxResult.success("WCS出库作业下发成功：OK"));
+
+        LocationOutboundGenerateRequest request = new LocationOutboundGenerateRequest();
+        request.setCargoSpaceId("CS-EMPTY");
+        request.setExitId("OUT01");
+        String result = service.generateWholeTrayOutboundJob(request);
+
+        assertThat(result).contains("CK002").contains("WCS出库作业下发成功");
+
+        ArgumentCaptor<MydoJob> jobCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).insertMydoJob(jobCaptor.capture());
+        MydoJob job = jobCaptor.getValue();
+        assertThat(job.getJobId()).isEqualTo("CK002");
+        assertThat(job.getTaskNo()).isEqualTo("50002");
+        assertThat(job.getInOrOut()).isEqualTo(20L);
+        assertThat(job.getCargoSpaceId()).isEqualTo("CS-EMPTY");
+        assertThat(job.getCargoSpaceName()).isEqualTo("02排001列01层");
+        assertThat(job.getTrayCode()).isNull();
+
+        verify(locationOutboundMapper, never()).selectAvailableDetailsForUpdate(any());
+        verify(mydoJobDetailService, never()).insertMydoJobDetail(any(MydoJobDetail.class));
+        verify(locationOutboundMapper, never()).reserveStockDetailForOutbound(any(HashMap.class));
+        verify(basStockMapper, never()).refreshBasStockSummary(any());
+        verify(basCargoSpaceMapper).markOutboundAssignedByCargoSpaceId("CS-EMPTY");
+        verify(mydoJobService).pushOutJobToWcs("CK002");
+    }
+
+    private BasStockDetail stockDetail(String detailId, String productId, String productName, String lotNo, String availableQuantity) {
+        BasStockDetail detail = new BasStockDetail();
+        detail.setDetailId(detailId);
+        detail.setStockId("KC001");
+        detail.setProductId(productId);
+        detail.setProductName(productName);
+        detail.setLotNo(lotNo);
+        detail.setAvailableQuantity(new BigDecimal(availableQuantity));
+        detail.setQuantity(new BigDecimal(availableQuantity));
+        detail.setOutQuantity(BigDecimal.ZERO);
+        return detail;
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/out/stockout/mapper/OutStockoutMapperSqlTest.java b/ruoyi-admin/src/test/java/com/ruoyi/out/stockout/mapper/OutStockoutMapperSqlTest.java
new file mode 100644
index 0000000..1a924ed
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/out/stockout/mapper/OutStockoutMapperSqlTest.java
@@ -0,0 +1,213 @@
+package com.ruoyi.out.stockout.mapper;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class OutStockoutMapperSqlTest {
+
+    @Test
+    void allocationProcedureCallsPassExitPointParameter() throws Exception {
+        String xml = Files.readString(resolvePath(
+            "src/main/resources/mapper/out/OutStockoutMapper.xml",
+            "ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml"));
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+
+        String autoCall = section(xml, "<select id=\"autoAssignOutStockoutByProc\"", "</select>");
+        String manualCall = section(xml, "<select id=\"manualAssignOutStockoutByProc\"", "</select>");
+        String autoProc = section(script, "CREATE PROCEDURE dbo.proc_out_auto_allocation", "AS");
+        String manualProc = section(script, "CREATE PROCEDURE dbo.proc_out_hand_allocation", "AS");
+
+        assertThat(autoCall)
+            .contains("proc_out_auto_allocation")
+            .contains("#{v_exit_id,mode=IN,jdbcType=VARCHAR}");
+        assertThat(manualCall)
+            .contains("proc_out_hand_allocation")
+            .contains("#{v_exit_id,mode=IN,jdbcType=VARCHAR}");
+        assertThat(autoProc).contains("@v_exit_id varchar(80)");
+        assertThat(manualProc).contains("@v_exit_id varchar(80)");
+    }
+
+    @Test
+    void manualAllocationStockDetailListOnlyShowsNormalCargoSpaceStock() throws Exception {
+        String xml = Files.readString(resolvePath(
+            "src/main/resources/mapper/bas/BasStockDetailMapper.xml",
+            "ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml"));
+        String selectList = section(xml, "<select id=\"selectBasStockDetailList\"", "</select>");
+
+        assertThat(selectList).contains("bcs.status = '2'");
+    }
+
+    @Test
+    void stockListAndStockDetailListFallbackToWarehouseTableName() throws Exception {
+        String stockXml = Files.readString(resolvePath(
+            "src/main/resources/mapper/bas/BasStockMapper.xml",
+            "ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml"));
+        String stockDetailXml = Files.readString(resolvePath(
+            "src/main/resources/mapper/bas/BasStockDetailMapper.xml",
+            "ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml"));
+
+        String stockSelect = section(stockXml, "<select id=\"selectBasStockList\"", "</select>");
+        String detailSelectVo = section(stockDetailXml, "<sql id=\"selectBasStockDetailVo\">", "</sql>");
+
+        assertThat(stockSelect)
+            .contains("left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id")
+            .contains("ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name");
+        assertThat(detailSelectVo)
+            .contains("left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id")
+            .contains("ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name) as warehouse_name");
+    }
+
+    @Test
+    void outboundAllocationProcedureChecksExitTrayType() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String manualProc = section(script, "CREATE PROCEDURE dbo.proc_out_hand_allocation", "IF OBJECT_ID(N'dbo.proc_out_auto_allocation'");
+
+        assertThat(manualProc)
+            .contains("@tray_type nvarchar(80)")
+            .contains("bas_barcode_format")
+            .contains("charindex(',' + @tray_type + ',', ',' + sp.tray_type + ',') > 0")
+            .contains("出库口不支持当前托盘类型");
+    }
+
+    @Test
+    void outboundAllocationProcedureReusesExistingTrayJobForSameStockout() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String manualProc = section(script, "CREATE PROCEDURE dbo.proc_out_hand_allocation", "IF OBJECT_ID(N'dbo.proc_out_auto_allocation'");
+
+        assertThat(manualProc)
+            .contains("@existing_job_id nvarchar(80)")
+            .contains("OR EXISTS (")
+            .contains("INNER JOIN dbo.mydo_job_detail ejd ON ej.job_id = ejd.job_id")
+            .contains("AND ejd.in_or_out_id = @stockout_id")
+            .contains("SET @job_id = @existing_job_id")
+            .contains("SET @job_detail_id = @job_id + '-' + CONVERT(nvarchar(10), @row_idx)");
+    }
+
+    @Test
+    void outboundAllocationMarksPickingJobWhenAllocatedQuantityIsLessThanTrayStock() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String manualProc = section(script, "CREATE PROCEDURE dbo.proc_out_hand_allocation", "IF OBJECT_ID(N'dbo.proc_out_auto_allocation'");
+
+        assertThat(manualProc)
+            .contains("@job_type int")
+            .contains("SET @job_type = CASE WHEN @alloc_qty < @available_qty THEN 21 ELSE 20 END")
+            .contains("@job_id, '1', @task_no, @job_type")
+            .contains("SET in_or_out = CASE WHEN @job_type = 21 THEN 21 ELSE in_or_out END");
+    }
+
+    @Test
+    void outboundAllocationOnlyTreatsActiveOutboundJobDetailAsReserved() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String manualProc = section(script, "CREATE PROCEDURE dbo.proc_out_hand_allocation", "IF OBJECT_ID(N'dbo.proc_out_auto_allocation'");
+        String autoProc = section(script, "CREATE PROCEDURE dbo.proc_out_auto_allocation", "IF OBJECT_ID(N'dbo.proc_out_makesure'");
+
+        assertThat(manualProc)
+            .contains("OR NOT EXISTS (")
+            .contains("INNER JOIN dbo.mydo_job lock_j ON lock_j.job_id = lock_jd.job_id")
+            .contains("WHERE lock_jd.job_detail_id = bsd.job_detail_id")
+            .contains("AND lock_j.in_or_out >= 20")
+            .contains("AND lock_j.status IN ('1', '2', '3')");
+        assertThat(autoProc)
+            .contains("OR NOT EXISTS (")
+            .contains("WHERE lock_jd.job_detail_id = bsd.job_detail_id")
+            .contains("AND lock_j.in_or_out >= 20")
+            .contains("OR EXISTS (")
+            .contains("AND ejd.in_or_out_id = @stockout_id");
+    }
+
+    @Test
+    void outboundConfirmationArchivesDeletedStockIntoFinishTables() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String makeSureProc = section(script, "CREATE PROCEDURE dbo.proc_out_makesure", "IF OBJECT_ID(N'dbo.proc_hand_delete_out_job'");
+
+        assertThat(script)
+            .contains("CREATE TABLE dbo.bas_stock_finish")
+            .contains("CREATE TABLE dbo.bas_stock_detail_finish")
+            .contains("delete_time datetime2(7)");
+        assertThat(makeSureProc)
+            .contains("INSERT INTO dbo.bas_stock_detail_finish")
+            .contains("INSERT INTO dbo.bas_stock_finish")
+            .contains("SYSDATETIME() AS delete_time");
+    }
+
+    @Test
+    void outboundConfirmationDoesNotReoccupyOriginalCargoSpaceAfterWcsRelease() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String makeSureProc = section(script, "CREATE PROCEDURE dbo.proc_out_makesure", "IF OBJECT_ID(N'dbo.proc_hand_delete_out_job'");
+        String residualBranch = section(makeSureProc,
+            "IF EXISTS (SELECT 1 FROM dbo.bas_stock_detail WHERE stock_id = @stock_id)",
+            "INSERT INTO dbo.bas_stock_finish");
+
+        assertThat(residualBranch)
+            .doesNotContain("UPDATE dbo.bas_cargo_space")
+            .doesNotContain("SET status = '2'")
+            .doesNotContain("tray_code = @tray_code");
+    }
+
+    @Test
+    void outboundAllocationAndCancelDoNotChangeManualLockedFlag() throws Exception {
+        String script = Files.readString(resolvePath(
+            "../sql/out_stockout_flow.sql",
+            "sql/out_stockout_flow.sql"));
+        String manualProc = section(script, "CREATE PROCEDURE dbo.proc_out_hand_allocation", "IF OBJECT_ID(N'dbo.proc_out_auto_allocation'");
+        String cancelProc = section(script, "CREATE PROCEDURE dbo.proc_hand_delete_out_job", "END\nGO");
+
+        assertThat(manualProc)
+            .contains("UPDATE dbo.bas_cargo_space")
+            .contains("SET status = '4'")
+            .doesNotContain("locked = 'Y'")
+            .doesNotContain("locked = 'N'");
+        assertThat(cancelProc)
+            .contains("UPDATE dbo.bas_cargo_space")
+            .contains("SET status = '2'")
+            .doesNotContain("locked = 'Y'")
+            .doesNotContain("locked = 'N'");
+    }
+
+    @Test
+    void locationOutboundListOnlyTreatsOccupiedCargoSpacesAsInStock() throws Exception {
+        String xml = Files.readString(resolvePath(
+            "src/main/resources/mapper/out/LocationOutboundMapper.xml",
+            "ruoyi-admin/src/main/resources/mapper/out/LocationOutboundMapper.xml"));
+        String selectList = section(xml, "<select id=\"selectLocationOutboundStockList\"", "</select>");
+
+        assertThat(selectList)
+            .contains("left join bas_stock bs on bs.cargo_space_id = bcs.cargo_space_id\n            and bcs.status in ('2', '4')")
+            .contains("and bcs.status = '2'")
+            .contains("and bs.stock_id is not null");
+    }
+
+    private Path resolvePath(String modulePath, String rootPath) {
+        return Stream.of(Path.of(modulePath), Path.of(rootPath))
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private String section(String text, String startMarker, String endMarker) {
+        int start = text.indexOf(startMarker);
+        assertThat(start).isGreaterThanOrEqualTo(0);
+        int end = text.indexOf(endMarker, start);
+        assertThat(end).isGreaterThan(start);
+        return text.substring(start, end);
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImplTest.java
new file mode 100644
index 0000000..f1b4f08
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImplTest.java
@@ -0,0 +1,105 @@
+package com.ruoyi.out.stockout.service.impl;
+
+import com.ruoyi.bas.id.job.service.JobIdService;
+import com.ruoyi.bas.cargospace.mapper.BasCargoSpaceMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.in.job.service.IMydoJobService;
+import com.ruoyi.out.stockout.mapper.OutStockoutMapper;
+import com.ruoyi.out.stockoutdetail.domain.OutStockoutDetail;
+import com.ruoyi.out.stockoutdetail.mapper.OutStockoutDetailMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class OutStockoutServiceImplTest {
+
+    @Mock
+    private OutStockoutMapper outStockoutMapper;
+
+    @Mock
+    private OutStockoutDetailMapper outStockoutDetailMapper;
+
+    @Mock
+    private SysDeptMapper sysDeptMapper;
+
+    @Mock
+    private JobIdService jobIdService;
+
+    @Mock
+    private IMydoJobService mydoJobService;
+
+    @Mock
+    private BasCargoSpaceMapper basCargoSpaceMapper;
+
+    @InjectMocks
+    private OutStockoutServiceImpl service;
+
+    @Test
+    void autoAssignReturnsErrorWhenProcedureReportsFailure() {
+        OutStockoutDetail detail = new OutStockoutDetail();
+        detail.setStockoutDetailId("CKD-1");
+        when(outStockoutDetailMapper.selectOutStockoutDetailListByStockoutId("CKD"))
+            .thenReturn(List.of(detail));
+        doAnswer(invocation -> {
+            @SuppressWarnings("unchecked")
+            HashMap<String, Object> map = invocation.getArgument(0);
+            map.put("v_result", 2);
+            map.put("v_resultString", "没有可分配库存明细");
+            return null;
+        }).when(outStockoutMapper).autoAssignOutStockoutByProc(any());
+
+        AjaxResult result = service.autoAssignOutStockout("CKD", "02-AU-01");
+
+        assertThat(result.isError()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG).toString())
+            .contains("CKD-1")
+            .contains("没有可分配库存明细");
+        verify(mydoJobService, never()).selectPendingOutMydoJobsByStockoutDetailId(any());
+    }
+
+    @Test
+    void autoAssignDoesNotPushAnyJobUntilAllDetailsAreAllocated() {
+        OutStockoutDetail first = new OutStockoutDetail();
+        first.setStockoutDetailId("CKD-1");
+        OutStockoutDetail second = new OutStockoutDetail();
+        second.setStockoutDetailId("CKD-2");
+        when(outStockoutDetailMapper.selectOutStockoutDetailListByStockoutId("CKD"))
+            .thenReturn(List.of(first, second));
+        AtomicInteger callCount = new AtomicInteger();
+        doAnswer(invocation -> {
+            @SuppressWarnings("unchecked")
+            HashMap<String, Object> map = invocation.getArgument(0);
+            if (callCount.incrementAndGet() == 1) {
+                map.put("v_result", 10);
+                map.put("v_resultString", "自动分配完成");
+            } else {
+                map.put("v_result", 2);
+                map.put("v_resultString", "没有可分配库存明细");
+            }
+            return null;
+        }).when(outStockoutMapper).autoAssignOutStockoutByProc(any());
+
+        AjaxResult result = service.autoAssignOutStockout("CKD", "02-AU-01");
+
+        assertThat(result.isError()).isTrue();
+        assertThat(result.get(AjaxResult.MSG_TAG).toString())
+            .contains("CKD-2")
+            .contains("没有可分配库存明细");
+        verify(mydoJobService, never()).selectPendingOutMydoJobsByStockoutDetailId(any());
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/pda/mapper/PdaMapperSqlTest.java b/ruoyi-admin/src/test/java/com/ruoyi/pda/mapper/PdaMapperSqlTest.java
new file mode 100644
index 0000000..b44d527
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/pda/mapper/PdaMapperSqlTest.java
@@ -0,0 +1,112 @@
+package com.ruoyi.pda.mapper;
+
+import org.junit.jupiter.api.Test;
+import org.apache.ibatis.annotations.Param;
+
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PdaMapperSqlTest {
+
+    @Test
+    void emptyTrayOutboundCountWarehouseParameterIsNamedForMyBatisXml() throws Exception {
+        Method method = PdaMapper.class.getMethod("selectAvailableEmptyTrayTypeCounts", String.class);
+
+        Param param = method.getParameters()[0].getAnnotation(Param.class);
+
+        assertThat(param).isNotNull();
+        assertThat(param.value()).isEqualTo("warehouseId");
+    }
+
+    @Test
+    void trayStockQueryTrayCodeParameterIsNamedForMyBatisXml() throws Exception {
+        Method method = PdaMapper.class.getMethod("selectTrayStockMaterials", String.class);
+
+        Param param = method.getParameters()[0].getAnnotation(Param.class);
+
+        assertThat(param).isNotNull();
+        assertThat(param.value()).isEqualTo("trayCode");
+    }
+
+    @Test
+    void trayStockQueryUsesTrayCodeOnlyAndReturnsMaterialRows() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String trayStockSql = section(xml, "<select id=\"selectTrayStockMaterials\"", "</select>");
+
+        assertThat(trayStockSql)
+            .contains("bs.tray_code = #{trayCode}")
+            .contains("bsd.product_id as materialCode")
+            .contains("bsd.product_name as materialName")
+            .contains("isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) as availableQuantity")
+            .doesNotContain("#{warehouseId}");
+    }
+
+    @Test
+    void emptyTrayOutboundCountsGroupByBarcodeFormatPrefix() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String typeCountSql = section(xml, "<select id=\"selectAvailableEmptyTrayTypeCounts\"", "</select>");
+        String countSql = section(xml, "<select id=\"countAvailableEmptyTrays\"", "</select>");
+        String stockSql = section(xml, "<select id=\"selectAvailableEmptyTrayStocks\"", "</select>");
+
+        assertThat(typeCountSql)
+            .contains("inner join bas_barcode_format bbf")
+            .contains("bbf.prefix as barcodePrefix")
+            .contains("left(bs.tray_code, len(bbf.prefix)) = bbf.prefix")
+            .contains("not exists")
+            .doesNotContain("bsd.job_detail_id is null");
+        assertThat(countSql)
+            .contains("isnull(bsd.quantity, 0) - isnull(bsd.out_quantity, 0) &gt; 0")
+            .doesNotContain("bsd.job_detail_id is null");
+        assertThat(stockSql)
+            .contains("left(bs.tray_code, len(#{barcodePrefix})) = #{barcodePrefix}")
+            .doesNotContain("bsd.job_detail_id is null");
+    }
+
+    @Test
+    void inboundCargoSpaceLockChoosesPlatoonWithMostEmptySpacesFirst() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String lockSql = section(xml, "<update id=\"lockInboundCargoSpace\"", "</update>");
+
+        assertThat(lockSql)
+            .contains("count(1) over (partition by bcs.the_platoon) as platoon_empty_count")
+            .contains("order by platoon_empty_count desc");
+    }
+
+    @Test
+    void outboundTaskListShowsExecutionPhaseFiveAsWaitingForPdaScan() throws Exception {
+        String xml = Files.readString(resolveMapperXml());
+        String taskListSql = section(xml, "<select id=\"outboundTaskList\"", "</select>");
+        String detailSql = section(xml, "<select id=\"selectOutboundDetail\"", "</select>");
+
+        assertThat(taskListSql)
+            .contains("j.execution_phase as executionPhase")
+            .contains("when j.execution_phase = '5' then '待扫码确认'")
+            .contains("and j.status in ('1', '2', '3')")
+            .contains("group by j.job_id, j.task_no, j.exit_id, j.create_time, j.status, j.execution_phase");
+        assertThat(detailSql)
+            .contains("j.execution_phase as executionPhase")
+            .contains("and j.status in ('1', '2', '3')");
+    }
+
+    private Path resolveMapperXml() {
+        return Stream.of(
+                Path.of("src/main/resources/mapper/pda/PdaMapper.xml"),
+                Path.of("ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml")
+            )
+            .filter(Files::exists)
+            .findFirst()
+            .orElseThrow();
+    }
+
+    private String section(String text, String startMarker, String endMarker) {
+        int start = text.indexOf(startMarker);
+        assertThat(start).isGreaterThanOrEqualTo(0);
+        int end = text.indexOf(endMarker, start);
+        assertThat(end).isGreaterThan(start);
+        return text.substring(start, end);
+    }
+}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/pda/service/impl/PdaServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/pda/service/impl/PdaServiceImplTest.java
new file mode 100644
index 0000000..d85ce47
--- /dev/null
+++ b/ruoyi-admin/src/test/java/com/ruoyi/pda/service/impl/PdaServiceImplTest.java
@@ -0,0 +1,483 @@
+package com.ruoyi.pda.service.impl;
+
+import com.ruoyi.api.client.WcsClient;
+import com.ruoyi.api.domain.ApiResponse;
+import com.ruoyi.bas.id.job.service.JobIdService;
+import com.ruoyi.bas.id.taskno.service.TaskNoService;
+import com.ruoyi.bas.stationpoint.domain.BasStationPoint;
+import com.ruoyi.bas.stationpoint.service.IBasStationPointService;
+import com.ruoyi.bas.warehouse.domain.BasWarehouse;
+import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.in.job.domain.MydoJob;
+import com.ruoyi.in.job.service.IMydoJobService;
+import com.ruoyi.in.jobdetail.domain.MydoJobDetail;
+import com.ruoyi.in.jobdetail.service.IMydoJobDetailService;
+import com.ruoyi.in.stockin.mapper.InStockinMapper;
+import com.ruoyi.in.sotckindetail.mapper.InStockinDetailMapper;
+import com.ruoyi.pda.domain.AddInJobRequest;
+import com.ruoyi.pda.domain.EmptyTrayOutboundRequest;
+import com.ruoyi.pda.mapper.PdaMapper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class PdaServiceImplTest {
+
+    @Mock
+    private PdaMapper pdaMapper;
+
+    @Mock
+    private InStockinDetailMapper inStockinDetailMapper;
+
+    @Mock
+    private InStockinMapper inStockinMapper;
+
+    @Mock
+    private IBasWarehouseService basWarehouseService;
+
+    @Mock
+    private IBasStationPointService basStationPointService;
+
+    @Mock
+    private IMydoJobService mydoJobService;
+
+    @Mock
+    private IMydoJobDetailService mydoJobDetailService;
+
+    @Mock
+    private WcsClient wcsClient;
+
+    @Mock
+    private JobIdService jobIdService;
+
+    @Mock
+    private TaskNoService taskNoService;
+
+    @InjectMocks
+    private PdaServiceImpl service;
+
+    @BeforeEach
+    void setUpSecurityContext() {
+        SysUser user = new SysUser();
+        user.setUserName("tester");
+        LoginUser loginUser = new LoginUser(10L, 20L, user, Collections.emptySet());
+        SecurityContextHolder.getContext().setAuthentication(
+            new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities()));
+    }
+
+    @AfterEach
+    void clearSecurityContext() {
+        SecurityContextHolder.clearContext();
+    }
+
+    @Test
+    void addInJobMarksJobDispatchedAfterWcsAcceptsIt() {
+        AddInJobRequest request = new AddInJobRequest();
+        request.setTrayCode("A001");
+        request.setWarehouseId("WH01");
+        request.setStationPointId("IN01");
+        MydoJob job = stubSuccessfulInboundJobSetup();
+        when(wcsClient.sendPutawayTask(job)).thenReturn(ApiResponse.ok("OK"));
+
+        String result = service.addInJob(request);
+
+        assertThat(result).contains("WCS入库作业下发成功");
+        verify(wcsClient).sendPutawayTask(job);
+        ArgumentCaptor<MydoJob> updateCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService, org.mockito.Mockito.times(2)).updateMydoJob(updateCaptor.capture());
+        List<MydoJob> updates = updateCaptor.getAllValues();
+        assertThat(updates.get(0).getStatus()).isEqualTo("1");
+        assertThat(updates.get(0).getExecutionPhase()).isEqualTo("0");
+        assertThat(updates.get(1).getJobId()).isEqualTo("RK001");
+        assertThat(updates.get(1).getStatus()).isEqualTo("3");
+        assertThat(updates.get(1).getExecutionPhase()).isEqualTo("1");
+        assertThat(updates.get(1).getStartTime()).isNotBlank();
+    }
+
+    @Test
+    void addInJobDoesNotMarkDispatchedWhenWcsRejectsIt() {
+        AddInJobRequest request = new AddInJobRequest();
+        request.setTrayCode("A001");
+        request.setWarehouseId("WH01");
+        request.setStationPointId("IN01");
+        MydoJob job = stubSuccessfulInboundJobSetup();
+        when(wcsClient.sendPutawayTask(job)).thenReturn(ApiResponse.fail("WCS_NG", "下发失败"));
+
+        assertThatThrownBy(() -> service.addInJob(request))
+            .isInstanceOf(RuntimeException.class)
+            .hasMessage("WCS入库作业下发失败：下发失败");
+
+        verify(wcsClient).sendPutawayTask(job);
+        ArgumentCaptor<MydoJob> updateCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).updateMydoJob(updateCaptor.capture());
+        assertThat(updateCaptor.getValue().getStatus()).isEqualTo("1");
+        verify(mydoJobService, never()).updateMydoJob(
+            org.mockito.ArgumentMatchers.argThat(update -> "3".equals(update.getStatus())));
+    }
+
+    @Test
+    void addEmptyTrayInboundJobCreatesEmptyContainerDetailAndDispatchesToWcs() {
+        AddInJobRequest request = new AddInJobRequest();
+        request.setTrayCode("A001");
+        request.setWarehouseId("WH01");
+        request.setStationPointId("IN01");
+        stubInboundStationAndRoadway();
+        when(jobIdService.getId("RK")).thenReturn("RK_EMPTY_1");
+        when(taskNoService.getTaskNo("6")).thenReturn("1008");
+        BasWarehouse warehouse = new BasWarehouse();
+        warehouse.setWarehouseName("一号仓");
+        when(basWarehouseService.selectBasWarehouseByWarehouseId("WH01")).thenReturn(warehouse);
+        when(mydoJobService.insertMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(mydoJobDetailService.insertMydoJobDetail(any(MydoJobDetail.class))).thenReturn(1);
+        when(mydoJobService.updateMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(wcsClient.sendPutawayTask(any(MydoJob.class))).thenReturn(ApiResponse.ok("OK"));
+
+        String result = service.addEmptyTrayInboundJob(request);
+
+        assertThat(result).contains("空托入库作业生成成功").contains("WCS入库作业下发成功");
+        verify(pdaMapper, never()).addInJob(any(HashMap.class));
+        ArgumentCaptor<MydoJob> jobCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).insertMydoJob(jobCaptor.capture());
+        MydoJob insertedJob = jobCaptor.getValue();
+        assertThat(insertedJob.getJobId()).isEqualTo("RK_EMPTY_1");
+        assertThat(insertedJob.getTaskNo()).isEqualTo("1008");
+        assertThat(insertedJob.getInOrOut()).isEqualTo(3L);
+        assertThat(insertedJob.getStatus()).isEqualTo("1");
+        assertThat(insertedJob.getExecutionPhase()).isEqualTo("0");
+        assertThat(insertedJob.getTrayCode()).isEqualTo("A001");
+        assertThat(insertedJob.getWarehouseId()).isEqualTo("WH01");
+        assertThat(insertedJob.getWarehouseName()).isEqualTo("一号仓");
+        assertThat(insertedJob.getEntranceId()).isEqualTo("IN01");
+        assertThat(insertedJob.getRoadwayId()).isEqualTo("R01");
+
+        ArgumentCaptor<MydoJobDetail> detailCaptor = ArgumentCaptor.forClass(MydoJobDetail.class);
+        verify(mydoJobDetailService).insertMydoJobDetail(detailCaptor.capture());
+        MydoJobDetail detail = detailCaptor.getValue();
+        assertThat(detail.getJobDetailId()).isEqualTo("RK_EMPTY_1-1");
+        assertThat(detail.getJobId()).isEqualTo("RK_EMPTY_1");
+        assertThat(detail.getProductId()).isEqualTo("KTP0001");
+        assertThat(detail.getProductName()).isEqualTo("空容器");
+        assertThat(detail.getInQuantity()).isEqualByComparingTo("1");
+
+        verify(wcsClient).sendPutawayTask(insertedJob);
+        ArgumentCaptor<MydoJob> updateCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).updateMydoJob(updateCaptor.capture());
+        assertThat(updateCaptor.getValue().getStatus()).isEqualTo("3");
+        assertThat(updateCaptor.getValue().getExecutionPhase()).isEqualTo("1");
+    }
+
+    @Test
+    void emptyTrayOutboundCountRequiresWarehouseAndReturnsTrayTypeCounts() {
+        HashMap<String, Object> typeA = new HashMap<>();
+        typeA.put("formatName", "A型托盘");
+        typeA.put("barcodePrefix", "A-");
+        typeA.put("quantity", 3);
+        HashMap<String, Object> typeB = new HashMap<>();
+        typeB.put("formatName", "B型托盘");
+        typeB.put("barcodePrefix", "B-");
+        typeB.put("quantity", 2);
+        when(pdaMapper.selectAvailableEmptyTrayTypeCounts("WH01")).thenReturn(List.of(typeA, typeB));
+
+        assertThat(service.emptyTrayOutboundCount("WH01"))
+            .containsExactly(typeA, typeB);
+        assertThatThrownBy(() -> service.emptyTrayOutboundCount(""))
+            .isInstanceOf(RuntimeException.class)
+            .hasMessage("仓库编码不能为空");
+    }
+
+    @Test
+    void trayStockRequiresTrayCodeAndReturnsMaterialsForTrimmedTrayCode() {
+        HashMap<String, Object> material = new HashMap<>();
+        material.put("stockId", "KC001");
+        material.put("stockDetailId", "SD001");
+        material.put("trayCode", "A001");
+        material.put("materialCode", "MAT001");
+        material.put("materialName", "物料1");
+        material.put("quantity", "6");
+        when(pdaMapper.selectTrayStockMaterials("A001")).thenReturn(List.of(material));
+
+        List<HashMap<String, Object>> result = service.trayStock(" A001 ");
+
+        assertThat(result).containsExactly(material);
+        verify(pdaMapper).selectTrayStockMaterials("A001");
+        assertThatThrownBy(() -> service.trayStock(" "))
+            .isInstanceOf(RuntimeException.class)
+            .hasMessage("托盘码不能为空");
+    }
+
+    @Test
+    void addEmptyTrayOutboundJobCreatesOneJobPerRequestedTrayAndPushesWcs() {
+        EmptyTrayOutboundRequest request = new EmptyTrayOutboundRequest();
+        request.setWarehouseId("WH01");
+        request.setBarcodePrefix("A-");
+        request.setQuantity(2);
+        BasWarehouse warehouse = new BasWarehouse();
+        warehouse.setWarehouseName("一号仓");
+        when(basWarehouseService.selectBasWarehouseByWarehouseId("WH01")).thenReturn(warehouse);
+        when(pdaMapper.countAvailableEmptyTrays(any(HashMap.class))).thenReturn(2);
+        BasStationPoint exitPoint = new BasStationPoint();
+        exitPoint.setPointId("OUT01");
+        exitPoint.setPointType("2");
+        exitPoint.setStatus("0");
+        exitPoint.setPointStatus("0");
+        when(basStationPointService.selectBasStationPointList(any(BasStationPoint.class))).thenReturn(List.of(exitPoint));
+        when(pdaMapper.selectAvailableEmptyTrayStocks(any(HashMap.class))).thenReturn(List.of(
+            emptyTrayStock("SD001", "KC001", "A001", "CS001", "货位1"),
+            emptyTrayStock("SD002", "KC002", "A002", "CS002", "货位2")
+        ));
+        when(jobIdService.getId("CK")).thenReturn("CK_EMPTY_1", "CK_EMPTY_2");
+        when(taskNoService.getTaskNo("20")).thenReturn("50001", "50002");
+        when(mydoJobService.insertMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(mydoJobDetailService.insertMydoJobDetail(any(MydoJobDetail.class))).thenReturn(1);
+        when(pdaMapper.reserveEmptyTrayStockDetail(any(HashMap.class))).thenReturn(1);
+        when(mydoJobService.pushOutJobToWcs(anyString())).thenReturn(AjaxResult.success("WCS出库作业下发成功：OK"));
+
+        String result = service.addEmptyTrayOutboundJob(request);
+
+        assertThat(result).contains("空托出库作业生成成功").contains("CK_EMPTY_1").contains("CK_EMPTY_2");
+        ArgumentCaptor<MydoJob> jobCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService, times(2)).insertMydoJob(jobCaptor.capture());
+        assertThat(jobCaptor.getAllValues()).extracting(MydoJob::getInOrOut).containsExactly(22L, 22L);
+        assertThat(jobCaptor.getAllValues()).extracting(MydoJob::getStatus).containsExactly("1", "1");
+        assertThat(jobCaptor.getAllValues()).extracting(MydoJob::getExecutionPhase).containsExactly("0", "0");
+        assertThat(jobCaptor.getAllValues()).extracting(MydoJob::getExitId).containsExactly("OUT01", "OUT01");
+
+        ArgumentCaptor<MydoJobDetail> detailCaptor = ArgumentCaptor.forClass(MydoJobDetail.class);
+        verify(mydoJobDetailService, times(2)).insertMydoJobDetail(detailCaptor.capture());
+        assertThat(detailCaptor.getAllValues()).extracting(MydoJobDetail::getProductId).containsExactly("KTP0001", "KTP0001");
+        assertThat(detailCaptor.getAllValues()).extracting(MydoJobDetail::getOutQuantity)
+            .containsExactly(new BigDecimal("1"), new BigDecimal("1"));
+        assertThat(detailCaptor.getAllValues()).extracting(MydoJobDetail::getStockinDetailId).containsExactly("SD001", "SD002");
+        verify(mydoJobService).pushOutJobToWcs("CK_EMPTY_1");
+        verify(mydoJobService).pushOutJobToWcs("CK_EMPTY_2");
+        ArgumentCaptor<HashMap> stockQueryCaptor = ArgumentCaptor.forClass(HashMap.class);
+        verify(pdaMapper).selectAvailableEmptyTrayStocks(stockQueryCaptor.capture());
+        assertThat(stockQueryCaptor.getValue())
+            .containsEntry("warehouseId", "WH01")
+            .containsEntry("barcodePrefix", "A-")
+            .containsEntry("limit", 2);
+    }
+
+    @Test
+    void confirmOutboundCreatesReturnInboundJobWithOutboundExitAsEntranceWhenTrayHasResidualMaterial() {
+        HashMap<String, Object> outboundDetail = new HashMap<>();
+        outboundDetail.put("jobId", "CK001");
+        outboundDetail.put("taskNo", "TASK001");
+        outboundDetail.put("trayCode", "A001");
+        outboundDetail.put("quantity", "5");
+        when(pdaMapper.selectOutboundDetail(any(HashMap.class))).thenReturn(outboundDetail);
+        when(pdaMapper.selectOutboundTrayMaterials(any(HashMap.class))).thenReturn(Collections.emptyList());
+
+        MydoJob outboundJob = new MydoJob();
+        outboundJob.setJobId("CK001");
+        outboundJob.setTrayCode("A001");
+        outboundJob.setWarehouseId("WH01");
+        outboundJob.setWarehouseName("一号仓");
+        outboundJob.setCargoSpaceId("CS01");
+        outboundJob.setCargoSpaceName("一层一列");
+        outboundJob.setExitId("EXIT01");
+        when(mydoJobService.selectMydoJobByJobId("CK001")).thenReturn(outboundJob);
+        when(mydoJobService.completeJob("CK001", "2")).thenReturn(AjaxResult.success());
+
+        HashMap<String, Object> residualMaterial = new HashMap<>();
+        residualMaterial.put("stockId", "KC001");
+        residualMaterial.put("stockDetailId", "SD001");
+        residualMaterial.put("productId", "MAT001");
+        residualMaterial.put("productName", "物料1");
+        residualMaterial.put("lotNo", "L001");
+        residualMaterial.put("quantity", "3");
+        when(pdaMapper.selectResidualTrayMaterials(any(HashMap.class))).thenReturn(List.of(residualMaterial));
+        when(jobIdService.getId("HL")).thenReturn("HL001");
+        when(taskNoService.getTaskNo("5")).thenReturn("80001");
+        BasStationPoint exitPoint = new BasStationPoint();
+        exitPoint.setRoadwayId("R02");
+        when(basStationPointService.selectBasStationPointByPointId("EXIT01")).thenReturn(exitPoint);
+        when(wcsClient.sendPutawayTask(any(MydoJob.class))).thenReturn(ApiResponse.ok("OK"));
+        when(mydoJobService.updateMydoJob(any(MydoJob.class))).thenReturn(1);
+
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("taskNo", "TASK001");
+        data.put("barcode", "A001");
+        data.put("quantity", "5");
+        service.confirmOutbound(data);
+
+        ArgumentCaptor<MydoJob> jobCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).insertMydoJob(jobCaptor.capture());
+        MydoJob returnJob = jobCaptor.getValue();
+        assertThat(returnJob.getJobId()).isEqualTo("HL001");
+        assertThat(returnJob.getTaskNo()).isEqualTo("80001");
+        assertThat(returnJob.getInOrOut()).isEqualTo(5L);
+        assertThat(returnJob.getEntranceId()).isEqualTo("EXIT01");
+        assertThat(returnJob.getRoadwayId()).isEqualTo("R02");
+        assertThat(returnJob.getCargoSpaceId()).isNull();
+        assertThat(returnJob.getCargoSpaceName()).isNull();
+        verify(wcsClient).sendPutawayTask(returnJob);
+
+        ArgumentCaptor<MydoJobDetail> detailCaptor = ArgumentCaptor.forClass(MydoJobDetail.class);
+        verify(mydoJobDetailService).insertMydoJobDetail(detailCaptor.capture());
+        assertThat(detailCaptor.getValue().getJobId()).isEqualTo("HL001");
+        assertThat(detailCaptor.getValue().getStockQuantity()).isEqualByComparingTo("3");
+
+        ArgumentCaptor<MydoJob> updateCaptor = ArgumentCaptor.forClass(MydoJob.class);
+        verify(mydoJobService).updateMydoJob(updateCaptor.capture());
+        assertThat(updateCaptor.getValue().getJobId()).isEqualTo("HL001");
+        assertThat(updateCaptor.getValue().getStatus()).isEqualTo("3");
+        assertThat(updateCaptor.getValue().getExecutionPhase()).isEqualTo("1");
+        assertThat(updateCaptor.getValue().getStartTime()).isNotBlank();
+    }
+
+    @Test
+    void confirmOutboundUpdatesEachJobDetailWithActualMaterialQuantityBeforeCompletion() {
+        HashMap<String, Object> outboundDetail = new HashMap<>();
+        outboundDetail.put("jobId", "CK002");
+        outboundDetail.put("taskNo", "TASK002");
+        outboundDetail.put("trayCode", "A002");
+        outboundDetail.put("quantity", "7");
+        when(pdaMapper.selectOutboundDetail(any(HashMap.class))).thenReturn(outboundDetail);
+
+        HashMap<String, Object> materialA = new HashMap<>();
+        materialA.put("jobDetailId", "CK002-1");
+        materialA.put("stockDetailId", "SD001");
+        materialA.put("stockQuantity", "6");
+        materialA.put("quantity", "6");
+        HashMap<String, Object> materialB = new HashMap<>();
+        materialB.put("jobDetailId", "CK002-2");
+        materialB.put("stockDetailId", "SD002");
+        materialB.put("stockQuantity", "2");
+        materialB.put("quantity", "1");
+        when(pdaMapper.selectOutboundTrayMaterials(any(HashMap.class))).thenReturn(List.of(materialA, materialB));
+
+        MydoJob outboundJob = new MydoJob();
+        outboundJob.setJobId("CK002");
+        outboundJob.setTrayCode("A002");
+        outboundJob.setWarehouseId("WH01");
+        when(mydoJobService.selectMydoJobByJobId("CK002")).thenReturn(outboundJob);
+        when(mydoJobService.completeJob("CK002", "2")).thenReturn(AjaxResult.success());
+        when(pdaMapper.selectResidualTrayMaterials(any(HashMap.class))).thenReturn(Collections.emptyList());
+        when(mydoJobDetailService.updateMydoJobDetail(any(MydoJobDetail.class))).thenReturn(1);
+
+        HashMap<String, Object> requestMaterialA = new HashMap<>();
+        requestMaterialA.put("jobDetailId", "CK002-1");
+        requestMaterialA.put("stockDetailId", "SD001");
+        requestMaterialA.put("quantity", "5");
+        HashMap<String, Object> requestMaterialB = new HashMap<>();
+        requestMaterialB.put("jobDetailId", "CK002-2");
+        requestMaterialB.put("stockDetailId", "SD002");
+        requestMaterialB.put("quantity", "2");
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("taskNo", "TASK002");
+        data.put("barcode", "A002");
+        data.put("quantity", "7");
+        data.put("materials", List.of(requestMaterialA, requestMaterialB));
+
+        service.confirmOutbound(data);
+
+        ArgumentCaptor<MydoJobDetail> detailCaptor = ArgumentCaptor.forClass(MydoJobDetail.class);
+        verify(mydoJobDetailService, times(2)).updateMydoJobDetail(detailCaptor.capture());
+        assertThat(detailCaptor.getAllValues()).extracting(MydoJobDetail::getJobDetailId)
+            .containsExactly("CK002-1", "CK002-2");
+        assertThat(detailCaptor.getAllValues()).extracting(MydoJobDetail::getOutQuantity)
+            .containsExactly(new BigDecimal("5"), new BigDecimal("2"));
+        verify(mydoJobService).completeJob("CK002", "2");
+    }
+
+    private void stubInboundStationAndRoadway() {
+        BasStationPoint point = new BasStationPoint();
+        point.setPointId("IN01");
+        point.setWarehouseId("WH01");
+        point.setPointType("1");
+        point.setStatus("0");
+        point.setPointStatus("0");
+        point.setTrayType("A");
+        point.setRoadwayId("R01");
+        when(basStationPointService.selectBasStationPointByPointId("IN01")).thenReturn(point);
+        when(basStationPointService.occupyBasStationPoint("IN01")).thenReturn(1);
+
+        HashMap<String, Object> trayRule = new HashMap<>();
+        trayRule.put("allowed_cargo_type", "A");
+        when(pdaMapper.selectMatchedTrayRule(any(HashMap.class))).thenReturn(trayRule);
+        HashMap<String, Object> roadway = new HashMap<>();
+        roadway.put("roadway_id", "R01");
+        when(pdaMapper.selectAvailableInboundRoadway(any(HashMap.class))).thenReturn(roadway);
+    }
+
+    private HashMap<String, Object> emptyTrayStock(String detailId, String stockId, String trayCode, String cargoSpaceId, String cargoSpaceName) {
+        HashMap<String, Object> stock = new HashMap<>();
+        stock.put("stockDetailId", detailId);
+        stock.put("stockId", stockId);
+        stock.put("trayCode", trayCode);
+        stock.put("warehouseId", "WH01");
+        stock.put("warehouseName", "一号仓");
+        stock.put("cargoSpaceId", cargoSpaceId);
+        stock.put("cargoSpaceName", cargoSpaceName);
+        stock.put("roadwayId", "R01");
+        stock.put("availableQuantity", "1");
+        return stock;
+    }
+
+    private MydoJob stubSuccessfulInboundJobSetup() {
+        BasStationPoint point = new BasStationPoint();
+        point.setPointId("IN01");
+        point.setWarehouseId("WH01");
+        point.setPointType("1");
+        point.setStatus("0");
+        point.setPointStatus("0");
+        point.setTrayType("A");
+        point.setRoadwayId("R01");
+        when(basStationPointService.selectBasStationPointByPointId("IN01")).thenReturn(point);
+        when(basStationPointService.occupyBasStationPoint("IN01")).thenReturn(1);
+
+        HashMap<String, Object> trayRule = new HashMap<>();
+        trayRule.put("allowed_cargo_type", "A");
+        when(pdaMapper.selectMatchedTrayRule(any(HashMap.class))).thenReturn(trayRule);
+        HashMap<String, Object> roadway = new HashMap<>();
+        roadway.put("roadway_id", "R01");
+        when(pdaMapper.selectAvailableInboundRoadway(any(HashMap.class))).thenReturn(roadway);
+        doAnswer(invocation -> {
+            @SuppressWarnings("unchecked")
+            HashMap<String, Object> map = invocation.getArgument(0);
+            map.put("v_result", "1");
+            map.put("v_resultmsg", "生成作业成功");
+            return null;
+        }).when(pdaMapper).addInJob(any(HashMap.class));
+
+        MydoJob job = new MydoJob();
+        job.setJobId("RK001");
+        job.setTaskNo("TASK001");
+        job.setTrayCode("A001");
+        job.setWarehouseId("WH01");
+        when(mydoJobService.selectLatestInMydoJobByTrayCodeAndWarehouseId("A001", "WH01")).thenReturn(job);
+        BasWarehouse warehouse = new BasWarehouse();
+        warehouse.setWarehouseName("一号仓");
+        when(basWarehouseService.selectBasWarehouseByWarehouseId("WH01")).thenReturn(warehouse);
+        when(mydoJobService.updateMydoJob(any(MydoJob.class))).thenReturn(1);
+        when(mydoJobDetailService.selectMydoJobDetailList(any())).thenReturn(Collections.emptyList());
+        return job;
+    }
+}
diff --git a/ruoyi-ui/src/api/out/locationOutbound.js b/ruoyi-ui/src/api/out/locationOutbound.js
new file mode 100644
index 0000000..417894f
--- /dev/null
+++ b/ruoyi-ui/src/api/out/locationOutbound.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询指定货位出库库存列表
+export function listLocationOutbound(query) {
+  return request({
+    url: '/out/locationOutbound/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 按货位整托生成出库作业
+export function generateLocationOutbound(data) {
+  return request({
+    url: '/out/locationOutbound/generate',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/ruoyi-ui/src/api/out/stockout.js b/ruoyi-ui/src/api/out/stockout.js
index 340bf4e..b9b1d16 100644
--- a/ruoyi-ui/src/api/out/stockout.js
+++ b/ruoyi-ui/src/api/out/stockout.js
@@ -68,10 +68,11 @@ export function finishStockout(stockoutId) {
 }
 
 // 自动分配出库单据
-export function autoAssignStockout(stockoutId) {
+export function autoAssignStockout(stockoutId, data) {
   return request({
     url: '/out/stockout/autoAssign/' + stockoutId,
-    method: 'put'
+    method: 'put',
+    data: data
   })
 }
 
diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png
index e263760..eb0a9c4 100644
Binary files a/ruoyi-ui/src/assets/logo/logo.png and b/ruoyi-ui/src/assets/logo/logo.png differ
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
index 966e656..b52d975 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -7,7 +7,7 @@
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' && navType !== 3 ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' && navType !== 3 ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>
   </div>
@@ -64,14 +64,21 @@ export default {
   overflow: hidden;
 
   & .sidebar-logo-link {
+    display: flex;
+    align-items: center;
+    justify-content: center;
     height: 100%;
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 142px;
+      max-width: calc(100% - 24px);
+      height: 36px;
+      padding: 4px 8px;
+      box-sizing: border-box;
+      object-fit: contain;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 0;
     }
 
     & .sidebar-title {
@@ -88,6 +95,8 @@ export default {
 
   &.collapse {
     .sidebar-logo {
+      width: 36px;
+      padding: 6px;
       margin-right: 0px;
     }
   }
diff --git a/ruoyi-ui/src/views/bas/barcodeData/index.vue b/ruoyi-ui/src/views/bas/barcodeData/index.vue
index ebf2aba..810d33d 100644
--- a/ruoyi-ui/src/views/bas/barcodeData/index.vue
+++ b/ruoyi-ui/src/views/bas/barcodeData/index.vue
@@ -455,29 +455,38 @@ export default {
       hidden.style.cssText = 'position:fixed;left:-9999px;top:0;'
       const svgs = []
 
-      rows.forEach(row => {
-        const fmt = this.getFormatById(row.formatId)
-        const barcodeType = (fmt && fmt.barcodeType) ? fmt.barcodeType : 'CODE128'
-        const lineWidth = (fmt && fmt.width) ? Number(fmt.width) : 2
-        const barHeight = (fmt && fmt.height) ? Number(fmt.height) : 60
-        const displayValue = fmt ? Number(fmt.showText) === 1 : true
-        const fontSize = (fmt && fmt.fontSize) ? Number(fmt.fontSize) : 14
-        const printNum = Math.max(1, Number(row.printNum || 1))
+      try {
+        rows.forEach(row => {
+          const fmt = this.getFormatById(row.formatId)
+          const barcodeType = this.normalizeBarcodeType(fmt && fmt.barcodeType)
+          const lineWidth = this.getBarcodeOptionNumber(fmt && fmt.width, 2, 1, 10)
+          const barHeight = this.getBarcodeOptionNumber(fmt && fmt.height, 60, 20, 300)
+          const displayValue = fmt ? Number(fmt.showText) !== 0 : true
+          const fontSize = this.getBarcodeOptionNumber(fmt && fmt.fontSize, 14, 8, 72)
+          const printNum = Math.max(1, Number(row.printNum || 1))
 
-        for (let i = 0; i < printNum; i++) {
-          const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
-          hidden.appendChild(svg)
-          JsBarcode(svg, row.barcodeNo, {
-            format: barcodeType,
-            width: lineWidth,
-            height: barHeight,
-            displayValue: displayValue,
-            fontSize: fontSize,
-            margin: 0
-          })
-          svgs.push(svg.outerHTML)
+          for (let i = 0; i < printNum; i++) {
+            const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
+            hidden.appendChild(svg)
+            JsBarcode(svg, String(row.barcodeNo), {
+              format: barcodeType,
+              width: lineWidth,
+              height: barHeight,
+              displayValue: displayValue,
+              fontSize: fontSize,
+              margin: 0
+            })
+            svgs.push(svg.outerHTML)
+          }
+        })
+      } catch (error) {
+        if (hidden.parentNode) {
+          hidden.parentNode.removeChild(hidden)
         }
-      })
+        console.error('生成条码打印内容失败', error)
+        this.$modal.msgError('生成条码打印内容失败，请检查条码类型和打印值')
+        return
+      }
 
       document.body.appendChild(hidden)
       document.body.removeChild(hidden)
@@ -488,6 +497,29 @@ export default {
       return this.formatOptions.find(item => String(item.id) === String(formatId)) || null
     },
 
+    normalizeBarcodeType(type) {
+      const barcodeTypes = {
+        '1': 'CODE128',
+        CODE128: 'CODE128',
+        CODE39: 'CODE39',
+        EAN13: 'EAN13',
+        EAN8: 'EAN8',
+        UPC: 'UPC',
+        UPCA: 'UPC',
+        'UPC-A': 'UPC'
+      }
+      const value = type == null ? '' : String(type).trim().toUpperCase()
+      return barcodeTypes[value] || 'CODE128'
+    },
+
+    getBarcodeOptionNumber(value, fallback, min, max) {
+      const numberValue = Number(value)
+      if (!Number.isFinite(numberValue) || numberValue < min || numberValue > max) {
+        return fallback
+      }
+      return numberValue
+    },
+
     buildPrintHtml(svgs) {
       return `<!DOCTYPE html>
 <html>
diff --git a/ruoyi-ui/src/views/bas/stationpoint/index.vue b/ruoyi-ui/src/views/bas/stationpoint/index.vue
index 4424d78..8deeee2 100644
--- a/ruoyi-ui/src/views/bas/stationpoint/index.vue
+++ b/ruoyi-ui/src/views/bas/stationpoint/index.vue
@@ -28,6 +28,7 @@
         <el-select v-model="queryParams.pointSize" placeholder="请选择点位大小" clearable>
           <el-option label="大点位" value="1" />
           <el-option label="小点位" value="2" />
+          <el-option label="通用点位" value="3" />
         </el-select>
       </el-form-item>
       <el-form-item label="托盘类型" prop="trayType">
@@ -130,7 +131,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="点位类型" prop="pointType">
-          <el-select v-model="form.pointType" placeholder="请选择点位类型">
+          <el-select v-model="form.pointType" placeholder="请选择点位类型" style="width:100%">
             <el-option label="入库" value="1" />
             <el-option label="出库" value="2" />
             <el-option label="入出库" value="3" />
@@ -140,6 +141,7 @@
           <el-select v-model="form.pointSize" placeholder="请选择点位大小" style="width:100%">
             <el-option label="大点位" value="1" />
             <el-option label="小点位" value="2" />
+            <el-option label="通用点位" value="3" />
           </el-select>
         </el-form-item>
         <el-form-item label="托盘类型" prop="trayType">
@@ -249,6 +251,7 @@ export default {
     formatPointSize(size) {
       if (size === '1') return '大点位'
       if (size === '2') return '小点位'
+      if (size === '3') return '通用点位'
       return size || '-'
     },
     getList() {
diff --git a/ruoyi-ui/src/views/bas/stock/index.vue b/ruoyi-ui/src/views/bas/stock/index.vue
index 4ec61f5..38e5551 100644
--- a/ruoyi-ui/src/views/bas/stock/index.vue
+++ b/ruoyi-ui/src/views/bas/stock/index.vue
@@ -242,9 +242,9 @@
           <dict-tag :options="dict.type.in_stockin_in_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip/>
-      <el-table-column label="部门名称" align="center" prop="deptName" show-overflow-tooltip/>
-      <el-table-column label="供应商名称" align="center" prop="suplierName" width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip/>-->
+<!--      <el-table-column label="部门名称" align="center" prop="deptName" show-overflow-tooltip/>-->
+<!--      <el-table-column label="供应商名称" align="center" prop="suplierName" width="100" show-overflow-tooltip/>-->
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index a1da2f0..57aa3e0 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -37,13 +37,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库名称" prop="warehouseName">
-        <el-input
-          v-model="queryParams.warehouseName"
-          placeholder="请输入仓库名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="仓库名称" prop="warehouseId">
+        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable filterable>
+          <el-option
+            v-for="warehouse in warehouseOptions"
+            :key="warehouse.warehouseId"
+            :label="warehouse.warehouseName"
+            :value="warehouse.warehouseId"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="巷道ID" prop="roadwayId">
         <el-input
@@ -82,7 +84,7 @@
           plain
           icon="el-icon-close"
           size="mini"
-          :disabled="single"
+          :disabled="!canOperateSelectedJob"
           @click="handleCancel"
           v-hasPermi="['in:job:cancel']"
         >手动作废</el-button>
@@ -93,7 +95,7 @@
           plain
           icon="el-icon-check"
           size="mini"
-          :disabled="single"
+          :disabled="!canOperateSelectedJob"
           @click="handleComplete"
           v-hasPermi="['in:job:complete']"
         >手动完成</el-button>
@@ -104,11 +106,15 @@
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务ID" align="center" prop="jobId" />
-      <el-table-column label="任务状态" align="center" prop="status" />
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="任务号" align="center" prop="taskNo" />
       <el-table-column label="任务类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
       <el-table-column label="执行阶段" align="center" prop="executionPhase">
@@ -203,16 +209,18 @@
 <script>
 import { listJob, cancelJob, completeJob } from "@/api/in/job"
 import { listJobdetail } from "@/api/in/jobdetail"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "Job",
-  dicts: ['mydo_job_execution_phase', 'mydo_job_status'],
+  dicts: ['mydo_job_execution_phase', 'mydo_job_status', 'in_job_type'],
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+      selectedRows: [],
       // 非单个禁用
       single: true,
       // 显示搜索条件
@@ -221,6 +229,8 @@ export default {
       total: 0,
       // 作业信息表格数据
       jobList: [],
+      // 仓库下拉选项
+      warehouseOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -230,6 +240,7 @@ export default {
         inOrOut: null,
         executionPhase: null,
         trayCode: null,
+        warehouseId: null,
         warehouseName: null,
         roadwayId: null,
         cargoSpaceId: null,
@@ -254,8 +265,14 @@ export default {
     }
   },
   created() {
+    this.getWarehouseOptions()
     this.getList()
   },
+  computed: {
+    canOperateSelectedJob() {
+      return this.selectedRows.length === 1 && !this.isFinalJobStatus(this.selectedRows[0].status)
+    }
+  },
   methods: {
     /** 查询作业信息列表 */
     getList() {
@@ -266,6 +283,13 @@ export default {
         this.loading = false
       })
     },
+    getWarehouseOptions() {
+      listWarehouse({ pageNum: 1, pageSize: 1000 }).then(response => {
+        this.warehouseOptions = response.rows || []
+      }).catch(() => {
+        this.warehouseOptions = []
+      })
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -287,10 +311,15 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.jobId)
+      this.selectedRows = selection
       this.single = selection.length !== 1
     },
+    isFinalJobStatus(status) {
+      return ['4', '5'].includes(String(status))
+    },
     /** 手动作废按钮操作 */
     handleCancel() {
+      if (!this.canOperateSelectedJob) return
       const jobId = this.ids[0]
       this.$modal.confirm('是否确认作废选中的作业任务？').then(() => {
         return cancelJob(jobId)
@@ -301,6 +330,7 @@ export default {
     },
     /** 手动完成按钮操作 */
     handleComplete() {
+      if (!this.canOperateSelectedJob) return
       const jobId = this.ids[0]
       this.$modal.confirm('是否确认手动完成选中的作业任务？').then(() => {
         return completeJob(jobId)
diff --git a/ruoyi-ui/src/views/out/job/index.vue b/ruoyi-ui/src/views/out/job/index.vue
index 5ac0863..2422c4d 100644
--- a/ruoyi-ui/src/views/out/job/index.vue
+++ b/ruoyi-ui/src/views/out/job/index.vue
@@ -9,10 +9,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+          <el-option
+            v-for="dict in dict.type.mydo_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="任务类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
           <el-option
-            v-for="dict in dict.type.mydo_job_status"
+            v-for="dict in dict.type.out_job_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -115,11 +125,15 @@
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务ID" align="center" prop="jobId" />
-      <el-table-column label="任务状态" align="center" prop="status" />
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="任务号" align="center" prop="taskNo" />
       <el-table-column label="任务类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
       <el-table-column label="执行阶段" align="center" prop="executionPhase">
@@ -137,7 +151,7 @@
 <!--      <el-table-column label="重量" align="center" prop="weight" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="160">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime" width="160">
@@ -218,7 +232,7 @@ import { listJobdetail } from "@/api/out/jobdetail"
 
 export default {
   name: "Job",
-  dicts: ['mydo_job_execution_phase', 'mydo_job_status'],
+  dicts: ['mydo_job_execution_phase', 'mydo_job_status', 'out_job_type'],
   data() {
     return {
       // 遮罩层
@@ -260,7 +274,8 @@ export default {
       detailQueryParams: {
         pageNum: 1,
         pageSize: 10,
-        jobId: null
+        jobId: null,
+        status: null
       }
     }
   },
@@ -334,6 +349,7 @@ export default {
     handleRowClick(row) {
       this.currentJob = row
       this.detailQueryParams.jobId = row.jobId
+      this.detailQueryParams.status = row.status
       this.detailQueryParams.pageNum = 1
       this.getJobDetailList()
     },
diff --git a/ruoyi-ui/src/views/out/locationOutbound/index.vue b/ruoyi-ui/src/views/out/locationOutbound/index.vue
new file mode 100644
index 0000000..77ff144
--- /dev/null
+++ b/ruoyi-ui/src/views/out/locationOutbound/index.vue
@@ -0,0 +1,472 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="仓库名称" prop="warehouseId">
+        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable filterable>
+          <el-option
+            v-for="warehouse in warehouseOptions"
+            :key="warehouse.warehouseId"
+            :label="warehouse.warehouseName"
+            :value="warehouse.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="货位编码" prop="cargoSpaceId">
+        <el-input
+          v-model="queryParams.cargoSpaceId"
+          placeholder="请输入货位编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位名称" prop="cargoSpaceName">
+        <el-input
+          v-model="queryParams.cargoSpaceName"
+          placeholder="请输入货位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位状态" prop="cargoSpaceStatus">
+        <el-select v-model="queryParams.cargoSpaceStatus" placeholder="请选择货位状态" clearable>
+          <el-option
+            v-for="dict in dict.type.bas_cargo_space_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input
+          v-model="queryParams.lotNo"
+          placeholder="请输入批次号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位范围" prop="showEmpty">
+        <el-switch v-model="queryParams.showEmpty" active-text="所有货位" inactive-text="有库存" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-position"
+          size="mini"
+          :disabled="multiple"
+          @click="openBatchGenerateDialog"
+          v-hasPermi="['out:locationOutbound:generate']"
+        >批量生成作业</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="locationList"
+      border
+      stripe
+      highlight-current-row
+      row-key="cargoSpaceId"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column type="selection" width="55" align="center" :selectable="canGenerate" />
+      <el-table-column label="货位编码" align="center" prop="cargoSpaceId" width="150" show-overflow-tooltip />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" min-width="150" show-overflow-tooltip />
+      <el-table-column label="货位状态" align="center" prop="cargoSpaceStatus" width="110">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bas_cargo_space_status" :value="scope.row.cargoSpaceStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="仓库" align="center" prop="warehouseName" width="120" show-overflow-tooltip />
+      <el-table-column label="巷道" align="center" prop="roadwayId" width="80" />
+      <el-table-column label="排" align="center" prop="thePlatoon" width="70" />
+      <el-table-column label="列" align="center" prop="theColumn" width="70" />
+      <el-table-column label="层" align="center" prop="theFloor" width="70" />
+      <el-table-column label="库存ID" align="center" prop="stockId" width="160" show-overflow-tooltip />
+      <el-table-column label="托盘条码" align="center" prop="trayCode" width="140" show-overflow-tooltip />
+      <el-table-column label="托盘类型" align="center" prop="trayType" width="90" />
+      <el-table-column label="明细数" align="center" prop="detailCount" width="80" />
+      <el-table-column label="总库存" align="center" prop="quantity" width="90" />
+      <el-table-column label="已分配" align="center" prop="outQuantity" width="90" />
+      <el-table-column label="可用库存" align="center" prop="availableQuantity" width="100" />
+      <el-table-column label="入库时间" align="center" prop="inDate" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-position"
+            :disabled="!canGenerate(scope.row)"
+            @click="openGenerateDialog(scope.row)"
+            v-hasPermi="['out:locationOutbound:generate']"
+          >生成作业</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <div class="detail-panel">
+      <div class="detail-header">
+        <span class="detail-title">库存明细</span>
+        <el-tag v-if="currentLocation" type="primary" size="small">
+          货位：{{ currentLocation.cargoSpaceName || currentLocation.cargoSpaceId }}
+        </el-tag>
+        <span v-else class="detail-hint">（请点击上方货位行查看明细）</span>
+      </div>
+      <el-table
+        :data="locationDetailList"
+        border
+        stripe
+        size="small"
+        style="width: 100%;"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+      >
+        <el-table-column label="库存明细ID" align="center" prop="detailId" width="180" show-overflow-tooltip />
+        <el-table-column label="物料编码" align="center" prop="productId" width="130" show-overflow-tooltip />
+        <el-table-column label="物料名称" align="center" prop="productName" min-width="160" show-overflow-tooltip />
+        <el-table-column label="批次号" align="center" prop="lotNo" width="130" show-overflow-tooltip />
+        <el-table-column label="库存数量" align="center" prop="quantity" width="100" />
+        <el-table-column label="已分配" align="center" prop="outQuantity" width="100" />
+        <el-table-column label="可用库存" align="center" prop="availableQuantity" width="110" />
+        <el-table-column label="入库时间" align="center" prop="inDate" width="160">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <template slot="empty">
+          <div class="detail-empty">
+            {{ currentLocation ? (currentLocation.stockId ? '暂无库存明细' : '当前货位无库存') : '请先选择上方货位行' }}
+          </div>
+        </template>
+      </el-table>
+    </div>
+
+    <el-dialog
+      title="指定货位出库"
+      :visible.sync="generateDialogVisible"
+      width="520px"
+      append-to-body
+    >
+      <el-descriptions v-if="currentRow" :column="1" size="small" border class="mb12">
+        <el-descriptions-item label="货位">{{ currentRow.cargoSpaceName || currentRow.cargoSpaceId }}</el-descriptions-item>
+        <el-descriptions-item label="托盘">{{ currentRow.trayCode || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="可用库存">{{ currentRow.availableQuantity || 0 }}</el-descriptions-item>
+      </el-descriptions>
+      <el-form label-width="90px" size="small">
+        <el-form-item label="出库口" required>
+          <el-select
+            v-model="selectedExitId"
+            placeholder="请选择出库口"
+            filterable
+            clearable
+            style="width: 100%;"
+            :loading="exitLoading"
+          >
+            <el-option
+              v-for="point in exitOptions"
+              :key="point.pointId"
+              :label="formatExitLabel(point)"
+              :value="point.pointId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="generateDialogVisible = false">取消</el-button>
+        <el-button type="primary" :loading="generating" @click="confirmGenerate">确认生成</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLocationOutbound, generateLocationOutbound } from '@/api/out/locationOutbound'
+import { listStationPoint } from '@/api/bas/stationpoint'
+import { listWarehouse } from '@/api/bas/warehouse'
+
+export default {
+  name: 'LocationOutbound',
+  dicts: ['bas_cargo_space_status'],
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      locationList: [],
+      currentLocation: null,
+      locationDetailList: [],
+      selectedRows: [],
+      multiple: true,
+      isBatchGenerate: false,
+      batchGenerating: false,
+      warehouseOptions: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        warehouseId: null,
+        warehouseName: null,
+        cargoSpaceId: null,
+        cargoSpaceName: null,
+        cargoSpaceStatus: null,
+        trayCode: null,
+        productId: null,
+        productName: null,
+        lotNo: null,
+        showEmpty: false
+      },
+      generateDialogVisible: false,
+      generating: false,
+      exitLoading: false,
+      currentRow: null,
+      selectedExitId: null,
+      exitOptions: []
+    }
+  },
+  created() {
+    this.loadWarehouseOptions()
+    this.getList()
+  },
+  methods: {
+    loadWarehouseOptions() {
+      listWarehouse({ pageNum: 1, pageSize: 1000 }).then(response => {
+        this.warehouseOptions = response.rows || []
+      }).catch(() => {
+        this.warehouseOptions = []
+      })
+    },
+    getList() {
+      this.loading = true
+      listLocationOutbound(this.queryParams).then(response => {
+        this.locationList = response.rows || []
+        this.total = response.total || 0
+        this.refreshCurrentLocation()
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.queryParams.showEmpty = false
+      this.resetDetailQuery()
+      this.handleQuery()
+    },
+    resetDetailQuery() {
+      this.currentLocation = null
+      this.locationDetailList = []
+    },
+    refreshCurrentLocation() {
+      if (!this.currentLocation) {
+        this.locationDetailList = []
+        return
+      }
+      const current = this.locationList.find(row => row.cargoSpaceId === this.currentLocation.cargoSpaceId)
+      if (!current) {
+        this.resetDetailQuery()
+        return
+      }
+      this.handleRowClick(current)
+    },
+    handleRowClick(row) {
+      this.currentLocation = row
+      this.locationDetailList = row && row.details ? row.details : []
+    },
+    handleSelectionChange(selection) {
+      this.selectedRows = selection
+      this.multiple = selection.length === 0
+    },
+    canGenerate(row) {
+      if (!row) {
+        return false
+      }
+      if (!row.stockId) {
+        return ['1', '6'].includes(String(row.cargoSpaceStatus))
+      }
+      const availableQuantity = Number(row.availableQuantity || 0)
+      return String(row.cargoSpaceStatus) === '2' && availableQuantity > 0
+    },
+    openGenerateDialog(row) {
+      if (!this.canGenerate(row)) {
+        this.$modal.msgWarning('当前货位不能生成出库作业')
+        return
+      }
+      this.isBatchGenerate = false
+      this.currentRow = row
+      this.selectedExitId = null
+      this.generateDialogVisible = true
+      this.loadExitOptions(row)
+    },
+    openBatchGenerateDialog() {
+      if (this.selectedRows.length === 0) {
+        this.$modal.msgWarning('请选择可生成作业的货位')
+        return
+      }
+      const invalidRow = this.selectedRows.find(row => !this.canGenerate(row))
+      if (invalidRow) {
+        this.$modal.msgWarning('选中货位包含无可用库存或已生成出库作业的记录')
+        return
+      }
+      const rows = this.selectedRows
+      const warehouseIds = Array.from(new Set(rows.map(row => row.warehouseId).filter(Boolean)))
+      if (warehouseIds.length > 1) {
+        this.$modal.msgWarning('批量生成作业请选择同一仓库的货位')
+        return
+      }
+      this.isBatchGenerate = true
+      this.currentRow = rows[0]
+      this.selectedExitId = null
+      this.generateDialogVisible = true
+      this.loadExitOptions(rows[0])
+    },
+    loadExitOptions(row) {
+      this.exitLoading = true
+      listStationPoint({
+        warehouseId: row.warehouseId,
+        status: '0'
+      }).then(response => {
+        const rows = response.rows || response.data || []
+        this.exitOptions = rows.filter(point => {
+          return ['2', '3'].includes(String(point.pointType)) &&
+            String(point.pointStatus || '0') === '0' &&
+            this.pointSupportsTrayType(point, row.trayType)
+        })
+        if (this.exitOptions.length === 1) {
+          this.selectedExitId = this.exitOptions[0].pointId
+        }
+        this.exitLoading = false
+      }).catch(() => {
+        this.exitOptions = []
+        this.exitLoading = false
+      })
+    },
+    pointSupportsTrayType(point, trayType) {
+      if (!trayType || !point.trayType) {
+        return true
+      }
+      return String(point.trayType).split(',').map(item => item.trim()).includes(String(trayType))
+    },
+    formatExitLabel(point) {
+      const typeName = String(point.pointType) === '3' ? '入出库' : '出库'
+      const trayType = point.trayType ? `，${point.trayType}类托盘` : ''
+      return `${point.pointName || point.pointId}（${point.pointId}，${typeName}${trayType}）`
+    },
+    confirmGenerate() {
+      if (!this.currentRow || !this.currentRow.cargoSpaceId) {
+        this.$modal.msgWarning('请选择要出库的货位')
+        return
+      }
+      if (!this.selectedExitId) {
+        this.$modal.msgWarning('请选择出库口')
+        return
+      }
+      const rows = this.isBatchGenerate ? this.selectedRows.filter(row => this.canGenerate(row)) : [this.currentRow]
+      const confirmText = this.isBatchGenerate
+        ? `确认将选中的 ${rows.length} 个货位生成出库作业？`
+        : this.currentRow.stockId
+          ? `确认将货位 ${this.currentRow.cargoSpaceName || this.currentRow.cargoSpaceId} 的整托库存生成出库作业？`
+          : `确认将空货位 ${this.currentRow.cargoSpaceName || this.currentRow.cargoSpaceId} 生成出库作业？`
+      this.$modal.confirm(confirmText).then(() => {
+        this.generating = true
+        return Promise.all(rows.map(row => generateLocationOutbound({
+          stockId: row.stockId,
+          cargoSpaceId: row.cargoSpaceId,
+          exitId: this.selectedExitId
+        })))
+      }).then(response => {
+        const first = Array.isArray(response) && response.length > 0 ? response[0] : response
+        const message = this.isBatchGenerate ? '批量生成成功' : (first.msg || '生成成功')
+        this.$modal.msgSuccess(message)
+        this.generateDialogVisible = false
+        this.generating = false
+        this.getList()
+      }).catch(() => {
+        this.generating = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.detail-panel {
+  margin-top: 20px;
+}
+
+.detail-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 10px;
+}
+
+.detail-title {
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.detail-hint {
+  margin-left: 4px;
+  color: #909399;
+  font-size: 12px;
+}
+
+.detail-empty {
+  padding: 18px 24px;
+  color: #909399;
+  background: #f8fafc;
+}
+
+.mb12 {
+  margin-bottom: 12px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/out/stockout/index.vue b/ruoyi-ui/src/views/out/stockout/index.vue
index ab16a0f..94c2d66 100644
--- a/ruoyi-ui/src/views/out/stockout/index.vue
+++ b/ruoyi-ui/src/views/out/stockout/index.vue
@@ -155,7 +155,7 @@
           icon="el-icon-magic-stick"
           size="mini"
           :disabled="single"
-          @click="handleAutoAssign"
+          @click="openAutoAssignDialog"
           v-hasPermi="['out:stockout:autoAssign']"
         >自动分配
         </el-button>
@@ -251,8 +251,9 @@
         <el-table-column label="物料编码" align="center" prop="productId" width="150"/>
         <el-table-column label="物料名称" align="center" prop="productName" min-width="150" show-overflow-tooltip/>
         <el-table-column label="库存明细" align="center" prop="stockDetailId" width="160" show-overflow-tooltip/>
+        <el-table-column label="托盘类型" align="center" prop="trayType" width="90"/>
         <el-table-column label="计划数量" align="center" prop="quantity" width="100"/>
-        <el-table-column label="扫码数量" align="center" prop="allotNum" width="100"/>
+        <el-table-column label="分配数量" align="center" prop="allotNum" width="100"/>
         <el-table-column label="实际数量" align="center" prop="assignNum" width="100"/>
         <el-table-column label="备注" align="center" prop="remark" min-width="120" show-overflow-tooltip/>
         <template slot="empty">
@@ -273,12 +274,72 @@
     </div>
 
     <!-- ===================== 手动分配弹窗 ===================== -->
+    <el-dialog
+      title="选择出库口"
+      :visible.sync="exitDialogVisible"
+      width="420px"
+      append-to-body
+    >
+      <el-form label-width="110px" size="small">
+        <el-form-item
+          v-for="trayType in autoAssignTrayTypes"
+          :key="trayType"
+          :label="formatTrayTypeLabel(trayType)"
+          required
+        >
+          <el-select
+            v-model="selectedExitByTrayType[trayType]"
+            placeholder="请选择出库口"
+            clearable
+            filterable
+            style="width: 100%;"
+            :loading="exitLoading"
+          >
+            <el-option
+              v-for="point in getExitOptionsByTrayType(trayType)"
+              :key="point.pointId"
+              :label="formatExitLabel(point)"
+              :value="point.pointId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="exitDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmAutoAssign">确认分配</el-button>
+      </div>
+    </el-dialog>
+
     <el-dialog
       title="选择出库库存"
       :visible.sync="assignDialogVisible"
       width="80%"
       append-to-body
     >
+      <el-form v-if="manualAssignTrayTypes.length > 0" label-width="110px" size="small" style="margin-bottom: 12px;">
+        <el-form-item
+          v-for="trayType in manualAssignTrayTypes"
+          :key="trayType"
+          :label="formatTrayTypeLabel(trayType)"
+          required
+        >
+          <el-select
+            v-model="selectedExitByTrayType[trayType]"
+            placeholder="请选择出库口"
+            clearable
+            filterable
+            style="width: 320px;"
+            :loading="exitLoading"
+          >
+            <el-option
+              v-for="point in getExitOptionsByTrayType(trayType)"
+              :key="point.pointId"
+              :label="formatExitLabel(point)"
+              :value="point.pointId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
       <el-table
         v-loading="stockLoading"
         :data="stockList"
@@ -295,6 +356,7 @@
         <el-table-column label="批次" prop="lotNo" align="center"/>
         <el-table-column label="货位" prop="cargoSpaceName" align="center"/>
         <el-table-column label="托盘号" prop="trayCode" align="center"/>
+        <el-table-column label="托盘类型" prop="trayType" align="center" width="90"/>
         <el-table-column label="可用数量" prop="availableQuantity" align="center"/>
       </el-table>
 
@@ -317,6 +379,7 @@ import {
 } from "@/api/out/stockout"
 import { listStockoutdetail } from "@/api/out/stockoutdetail"
 import { listStockDetail } from "@/api/bas/stock"
+import { listStationPoint } from "@/api/bas/stationpoint"
 
 export default {
   name: "Stockout",
@@ -325,6 +388,7 @@ export default {
     return {
       loading: true,
       ids: [],
+      selectedRows: [],
       single: true,
       multiple: true,
       showSearch: true,
@@ -356,17 +420,33 @@ export default {
       detailQueryParams: {
         pageNum: 1,
         pageSize: 10,
-        stockoutId: null
+        stockoutId: null,
+        status: null
       },
       // 子单选中ID
       detailIds: [],
       detailSingle: true,
 
       // 手动分配弹窗
+      exitDialogVisible: false,
       assignDialogVisible: false,
+      exitLoading: false,
       stockLoading: false,
+      exitOptions: [],
       stockList: [],
-      selectedStockList: []
+      selectedExitId: null,
+      selectedExitByTrayType: {},
+      selectedStockList: [],
+      autoAssignDetails: [],
+      defaultTrayTypeKey: '__DEFAULT__'
+    }
+  },
+  computed: {
+    autoAssignTrayTypes() {
+      return this.collectTrayTypes(this.autoAssignDetails)
+    },
+    manualAssignTrayTypes() {
+      return this.collectTrayTypes(this.selectedStockList)
     }
   },
   created() {
@@ -409,16 +489,19 @@ export default {
     resetDetailList() {
       this.detailList = []
       this.detailQueryParams.stockoutId = null
+      this.detailQueryParams.status = null
       this.currentStockout = null
       this.detailTotal = 0
     },
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.stockoutId)
+      this.selectedRows = selection
       this.single = selection.length !== 1
     },
     handleRowClick(row) {
       this.currentStockout = row
       this.detailQueryParams.stockoutId = row.stockoutId
+      this.detailQueryParams.status = row.status
       this.detailQueryParams.pageNum = 1
       this.getDetailList()
     },
@@ -444,23 +527,126 @@ export default {
         this.$modal.msgWarning("请选择子单")
         return
       }
+      if (!this.currentStockout) {
+        this.$modal.msgWarning("请先选择出库主单")
+        return
+      }
       const detail = this.detailList.find(item => item.stockoutDetailId === this.detailIds[0])
+      this.selectedExitId = null
+      this.selectedExitByTrayType = {}
+      this.selectedStockList = []
       this.assignDialogVisible = true
       this.stockLoading = true
+      this.loadExitOptions(this.currentStockout.warehouseId)
       // 根据物料编码查询可用库存明细
       listStockDetail({
         productId: detail.productId,
         warehouseId: this.currentStockout ? this.currentStockout.warehouseId : null,
         stockStatus: '1'
       }).then(res => {
-        this.stockList = res.rows
+        this.stockList = res.rows || []
         this.stockLoading = false
       })
     },
 
+    loadExitOptions(warehouseId) {
+      if (!warehouseId) {
+        this.exitOptions = []
+        return Promise.resolve()
+      }
+      this.exitLoading = true
+      return listStationPoint({
+        warehouseId: warehouseId,
+        status: '0'
+      }).then(res => {
+        const rows = res.rows || res.data || []
+        this.exitOptions = rows.filter(point => {
+          return ['2', '3'].includes(String(point.pointType)) && String(point.pointStatus || '0') === '0'
+        })
+        this.exitLoading = false
+      }).catch(() => {
+        this.exitOptions = []
+        this.exitLoading = false
+      })
+    },
+
+    formatExitLabel(point) {
+      const typeName = String(point.pointType) === '3' ? '入出库' : '出库'
+      const trayType = point.trayType ? `，${point.trayType}类托盘` : ''
+      return `${point.pointName || point.pointId}（${point.pointId}，${typeName}${trayType}）`
+    },
+
+    getTrayTypeKey(row) {
+      return row && row.trayType ? String(row.trayType) : this.defaultTrayTypeKey
+    },
+
+    collectTrayTypes(rows) {
+      const types = []
+      ;(rows || []).forEach(row => {
+        const key = this.getTrayTypeKey(row)
+        if (!types.includes(key)) {
+          types.push(key)
+        }
+      })
+      return types
+    },
+
+    formatTrayTypeLabel(trayType) {
+      return trayType === this.defaultTrayTypeKey ? '默认出库口' : `${trayType}类托盘`
+    },
+
+    pointSupportsTrayType(point, trayType) {
+      if (trayType === this.defaultTrayTypeKey) {
+        return true
+      }
+      if (!point.trayType) {
+        return true
+      }
+      return String(point.trayType).split(',').map(item => item.trim()).includes(trayType)
+    },
+
+    getExitOptionsByTrayType(trayType) {
+      return this.exitOptions.filter(point => this.pointSupportsTrayType(point, trayType))
+    },
+
+    resetExitSelections(trayTypes) {
+      this.selectedExitByTrayType = {}
+      ;(trayTypes || []).forEach(trayType => {
+        this.$set(this.selectedExitByTrayType, trayType, null)
+      })
+    },
+
+    ensureExitSelections(trayTypes) {
+      ;(trayTypes || []).forEach(trayType => {
+        if (!Object.prototype.hasOwnProperty.call(this.selectedExitByTrayType, trayType)) {
+          this.$set(this.selectedExitByTrayType, trayType, null)
+        }
+      })
+    },
+
+    validateExitSelections(trayTypes) {
+      const missingType = (trayTypes || []).find(trayType => !this.selectedExitByTrayType[trayType])
+      if (missingType) {
+        this.$modal.msgWarning(`请选择${this.formatTrayTypeLabel(missingType)}的出库口`)
+        return false
+      }
+      return true
+    },
+
+    buildExitByTrayType(trayTypes) {
+      const exitByTrayType = {}
+      ;(trayTypes || []).forEach(trayType => {
+        if (trayType !== this.defaultTrayTypeKey) {
+          exitByTrayType[trayType] = this.selectedExitByTrayType[trayType]
+        }
+      })
+      return exitByTrayType
+    },
+
     // 库存选中事件
     handleStockSelectionChange(val) {
       this.selectedStockList = val
+      this.ensureExitSelections(this.manualAssignTrayTypes)
     },
 
     // 确认分配
@@ -469,13 +655,25 @@ export default {
         this.$modal.msgWarning("请选择要出库的库存")
         return
       }
+      const trayTypes = this.manualAssignTrayTypes
+      if (!this.validateExitSelections(trayTypes)) {
+        return
+      }
       const stockIdList = Array.from(new Set(this.selectedStockList.map(item => item.detailId || item.stockDetailId || item.stockId)))
+      const exitByStockId = {}
+      this.selectedStockList.forEach(item => {
+        const stockKey = item.detailId || item.stockDetailId || item.stockId
+        exitByStockId[stockKey] = this.selectedExitByTrayType[this.getTrayTypeKey(item)]
+      })
       const detailId = this.detailIds[0]
 
       this.$modal.confirm("确认选中库存进行分配？").then(() => {
         // 调用子单手动分配接口
         return manualAssignStockout({
           stockoutDetailId: detailId,
+          exitId: this.selectedExitByTrayType[this.defaultTrayTypeKey] || null,
+          exitByTrayType: this.buildExitByTrayType(trayTypes),
+          exitByStockId: exitByStockId,
           stockIdList: stockIdList
         })
       }).then(() => {
@@ -503,9 +701,40 @@ export default {
         this.getList()
       })
     },
-    handleAutoAssign() {
-      autoAssignStockout(this.ids[0]).then(() => {
+    openAutoAssignDialog() {
+      const stockout = this.selectedRows[0]
+      if (!stockout) {
+        this.$modal.msgWarning("请选择出库单据")
+        return
+      }
+      this.selectedExitId = null
+      this.selectedExitByTrayType = {}
+      this.autoAssignDetails = []
+      this.exitDialogVisible = true
+      this.loadExitOptions(stockout.warehouseId)
+      const detailPromise = this.currentStockout && this.currentStockout.stockoutId === stockout.stockoutId && this.detailList.length > 0
+        ? Promise.resolve(this.detailList)
+        : listStockoutdetail({ stockoutId: stockout.stockoutId, status: stockout.status, pageNum: 1, pageSize: 9999 }).then(res => res.rows || [])
+      detailPromise.then(rows => {
+        this.autoAssignDetails = rows
+        this.resetExitSelections(this.autoAssignTrayTypes)
+      })
+    },
+    confirmAutoAssign() {
+      const trayTypes = this.autoAssignTrayTypes
+      if (trayTypes.length === 0) {
+        this.$modal.msgWarning("未加载到出库明细")
+        return
+      }
+      if (!this.validateExitSelections(trayTypes)) {
+        return
+      }
+      autoAssignStockout(this.ids[0], {
+        exitId: this.selectedExitByTrayType[this.defaultTrayTypeKey] || null,
+        exitByTrayType: this.buildExitByTrayType(trayTypes)
+      }).then(() => {
         this.$modal.msgSuccess("自动分配成功")
+        this.exitDialogVisible = false
         this.getDetailList()
       })
     }
diff --git a/ruoyi-ui/src/views/search/inJobFlow/index.vue b/ruoyi-ui/src/views/search/inJobFlow/index.vue
new file mode 100644
index 0000000..24b58ef
--- /dev/null
+++ b/ruoyi-ui/src/views/search/inJobFlow/index.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input v-model="queryParams.taskNo" placeholder="请输入任务号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+          <el-option v-for="dict in dict.type.mydo_job_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务类型" prop="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
+          <el-option v-for="dict in dict.type.in_job_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="托盘码" prop="trayCode">
+        <el-input v-model="queryParams.trayCode" placeholder="请输入托盘码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="货位名称" prop="cargoSpaceName">
+        <el-input v-model="queryParams.cargoSpaceName" placeholder="请输入货位名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['in:job:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="jobList" @row-click="handleRowClick" highlight-current-row>
+      <el-table-column label="任务ID" align="center" prop="jobId" width="160" show-overflow-tooltip />
+      <el-table-column label="任务号" align="center" prop="taskNo" width="140" show-overflow-tooltip />
+      <el-table-column label="任务状态" align="center" prop="status" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status" /></template>
+      </el-table-column>
+      <el-table-column label="任务类型" align="center" prop="inOrOut" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut" /></template>
+      </el-table-column>
+      <el-table-column label="托盘码" align="center" prop="trayCode" width="140" show-overflow-tooltip />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" width="120" show-overflow-tooltip />
+      <el-table-column label="巷道ID" align="center" prop="roadwayId" width="100" />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="140" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="finishTime" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.finishTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <div class="detail-panel" style="margin-top: 20px;">
+      <div class="detail-header" style="margin-bottom: 10px; display: flex; align-items: center; gap: 8px;">
+        <span style="font-size: 14px; font-weight: 600; color: #303133;">子作业详情</span>
+        <el-tag v-if="currentJob" type="primary" size="small" style="margin-left: 4px;">
+          主任务：{{ currentJob.taskNo || currentJob.jobId }}
+        </el-tag>
+        <span v-else style="font-size: 12px; color: #909399; margin-left: 4px;">（请点击上方主作业行查看对应子作业数据）</span>
+      </div>
+      <el-table
+        v-loading="detailLoading"
+        :data="jobDetailList"
+        border
+        stripe
+        size="small"
+        style="width: 100%;"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+      >
+        <el-table-column label="子任务ID" align="center" prop="jobDetailId" width="180" show-overflow-tooltip />
+        <el-table-column label="物料编码" align="center" prop="productId" width="120" />
+        <el-table-column label="物料名称" align="center" prop="productName" min-width="150" show-overflow-tooltip />
+        <el-table-column label="批次" align="center" prop="lotNo" width="120" />
+        <el-table-column label="子单编号" align="center" prop="inOrOutDId" width="160" show-overflow-tooltip />
+        <el-table-column label="入库数量" align="center" prop="inQuantity" width="100" />
+        <el-table-column label="库存数量" align="center" prop="stockQuantity" width="100" />
+        <el-table-column label="出库数量" align="center" prop="outQuantity" width="100" />
+        <el-table-column label="供应商名称" align="center" prop="supplierName" width="120" show-overflow-tooltip />
+        <template slot="empty">
+          <div style="padding: 30px 0; color: #909399; font-size: 13px;">
+            <i class="el-icon-document" style="font-size: 28px; display: block; margin-bottom: 8px;"></i>
+            {{ currentJob ? '暂无子作业数据' : '请先选择上方主作业行' }}
+          </div>
+        </template>
+      </el-table>
+      <pagination
+        v-show="detailTotal > 0"
+        :total="detailTotal"
+        :page.sync="detailQueryParams.pageNum"
+        :limit.sync="detailQueryParams.pageSize"
+        @pagination="getJobDetailList"
+        style="margin-top: 0;"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { listJob } from "@/api/in/job"
+import { listJobdetail } from "@/api/in/jobdetail"
+
+export default {
+  name: "SearchInJobFlow",
+  dicts: ['mydo_job_status', 'in_job_type'],
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      jobList: [],
+      currentJob: null,
+      detailLoading: false,
+      detailTotal: 0,
+      jobDetailList: [],
+      daterangeCreateTime: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        status: '4',
+        taskNo: null,
+        inOrOut: null,
+        trayCode: null,
+        warehouseName: null,
+        cargoSpaceName: null
+      },
+      detailQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobId: null,
+        status: null
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    buildQuery() {
+      const query = { ...this.queryParams, params: { history: 'true' } }
+      if (this.daterangeCreateTime && this.daterangeCreateTime.length === 2) {
+        query.params.beginCreateTime = this.daterangeCreateTime[0]
+        query.params.endCreateTime = this.daterangeCreateTime[1]
+      }
+      return query
+    },
+    getList() {
+      this.resetDetailList()
+      this.loading = true
+      listJob(this.buildQuery()).then(response => {
+        this.jobList = response.rows || []
+        this.total = response.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.daterangeCreateTime = []
+      this.resetForm("queryForm")
+      this.queryParams.status = '4'
+      this.handleQuery()
+    },
+    resetDetailList() {
+      this.currentJob = null
+      this.jobDetailList = []
+      this.detailTotal = 0
+      this.detailQueryParams.jobId = null
+      this.detailQueryParams.status = null
+      this.detailQueryParams.pageNum = 1
+    },
+    handleRowClick(row) {
+      this.currentJob = row
+      this.detailQueryParams.jobId = row.jobId
+      this.detailQueryParams.status = row.status
+      this.detailQueryParams.pageNum = 1
+      this.getJobDetailList()
+    },
+    getJobDetailList() {
+      if (!this.detailQueryParams.jobId) return
+      this.detailLoading = true
+      listJobdetail(this.detailQueryParams).then(response => {
+        this.jobDetailList = response.rows || []
+        this.detailTotal = response.total || 0
+        this.detailLoading = false
+      }).catch(() => {
+        this.detailLoading = false
+      })
+    },
+    handleExport() {
+      this.download('in/job/export', this.buildQuery(), `in_job_flow_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/search/inStockinHistory/index.vue b/ruoyi-ui/src/views/search/inStockinHistory/index.vue
new file mode 100644
index 0000000..a13a3ea
--- /dev/null
+++ b/ruoyi-ui/src/views/search/inStockinHistory/index.vue
@@ -0,0 +1,204 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="入库类型" prop="inType">
+        <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
+          <el-option v-for="dict in dict.type.in_stockin_in_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+          <el-option v-for="dict in dict.type.in_stockin_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上位单号" prop="erpBill">
+        <el-input v-model="queryParams.erpBill" placeholder="请输入上位单号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="供应商" prop="supplierName">
+        <el-input v-model="queryParams.supplierName" placeholder="请输入供应商" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="完成时间">
+        <el-date-picker v-model="daterangeFinishDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['in:stockin:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="stockinList" @row-click="handleRowClick" highlight-current-row>
+      <el-table-column label="入库单号" align="center" prop="stockinId" width="160" show-overflow-tooltip />
+      <el-table-column label="入库类型" align="center" prop="inType" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.in_stockin_in_type" :value="scope.row.inType" /></template>
+      </el-table-column>
+      <el-table-column label="单据状态" align="center" prop="status" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.in_stockin_status" :value="scope.row.status" /></template>
+      </el-table-column>
+      <el-table-column label="上位单号" align="center" prop="erpBill" width="140" show-overflow-tooltip />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" width="120" show-overflow-tooltip />
+      <el-table-column label="供应商" align="center" prop="supplierName" min-width="140" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="createDate" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startDate" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.startDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="完成时间" align="center" prop="finishDate" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.finishDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <div class="detail-panel" style="margin-top: 20px;">
+      <div class="detail-header" style="margin-bottom: 10px; display: flex; align-items: center; gap: 8px;">
+        <span style="font-size: 14px; font-weight: 600; color: #303133;">入库子单详情</span>
+        <el-tag v-if="currentStockin" type="primary" size="small" style="margin-left: 4px;">
+          主单：{{ currentStockin.stockinId }}
+        </el-tag>
+        <span v-else style="font-size: 12px; color: #909399; margin-left: 4px;">（请点击上方主单行查看对应子单数据）</span>
+      </div>
+      <el-table
+        v-loading="detailLoading"
+        :data="detailList"
+        border
+        stripe
+        size="small"
+        style="width: 100%;"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+      >
+        <el-table-column label="子单ID" align="center" prop="stockinDetailId" width="180" show-overflow-tooltip />
+        <el-table-column label="批次" align="center" prop="lotNo" width="150" />
+        <el-table-column label="物料编码" align="center" prop="productId" width="150" />
+        <el-table-column label="物料名称" align="center" prop="productName" min-width="150" show-overflow-tooltip />
+        <el-table-column label="计划数量" align="center" prop="quantity" width="100" />
+        <el-table-column label="扫码数量" align="center" prop="scanNum" width="100" />
+        <el-table-column label="实际数量" align="center" prop="assignNum" width="100" />
+        <el-table-column label="备注" align="center" prop="remark" min-width="120" show-overflow-tooltip />
+        <template slot="empty">
+          <div style="padding: 30px 0; color: #909399; font-size: 13px;">
+            <i class="el-icon-document" style="font-size: 28px; display: block; margin-bottom: 8px;"></i>
+            {{ currentStockin ? '暂无子单数据' : '请先选择上侧主单行' }}
+          </div>
+        </template>
+      </el-table>
+      <pagination
+        v-show="detailTotal > 0"
+        :total="detailTotal"
+        :page.sync="detailQueryParams.pageNum"
+        :limit.sync="detailQueryParams.pageSize"
+        @pagination="getDetailList"
+        style="margin-top: 0;"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { listStockin, listStockinDetail } from "@/api/in/stockin"
+
+export default {
+  name: "SearchInStockinHistory",
+  dicts: ['in_stockin_in_type', 'in_stockin_status'],
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      stockinList: [],
+      currentStockin: null,
+      detailLoading: false,
+      detailTotal: 0,
+      detailList: [],
+      daterangeFinishDate: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        inType: null,
+        status: null,
+        erpBill: null,
+        warehouseName: null,
+        supplierName: null
+      },
+      detailQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stockinId: null,
+        status: null
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    buildQuery() {
+      const query = { ...this.queryParams, params: { history: 'true' } }
+      if (this.daterangeFinishDate && this.daterangeFinishDate.length === 2) {
+        query.params.beginFinishDate = this.daterangeFinishDate[0]
+        query.params.endFinishDate = this.daterangeFinishDate[1]
+      }
+      return query
+    },
+    getList() {
+      this.resetDetailList()
+      this.loading = true
+      listStockin(this.buildQuery()).then(response => {
+        this.stockinList = response.rows || []
+        this.total = response.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.daterangeFinishDate = []
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    resetDetailList() {
+      this.currentStockin = null
+      this.detailList = []
+      this.detailTotal = 0
+      this.detailQueryParams.stockinId = null
+      this.detailQueryParams.status = null
+      this.detailQueryParams.pageNum = 1
+    },
+    handleRowClick(row) {
+      this.currentStockin = row
+      this.detailQueryParams.stockinId = row.stockinId
+      this.detailQueryParams.status = row.status
+      this.detailQueryParams.pageNum = 1
+      this.getDetailList()
+    },
+    getDetailList() {
+      if (!this.detailQueryParams.stockinId) return
+      this.detailLoading = true
+      listStockinDetail(this.detailQueryParams).then(response => {
+        this.detailList = response.rows || []
+        this.detailTotal = response.total || 0
+        this.detailLoading = false
+      }).catch(() => {
+        this.detailLoading = false
+      })
+    },
+    handleExport() {
+      this.download('in/stockin/export', this.buildQuery(), `in_stockin_history_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/search/outJobFlow/index.vue b/ruoyi-ui/src/views/search/outJobFlow/index.vue
new file mode 100644
index 0000000..ca3daf2
--- /dev/null
+++ b/ruoyi-ui/src/views/search/outJobFlow/index.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input v-model="queryParams.taskNo" placeholder="请输入任务号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+          <el-option v-for="dict in dict.type.mydo_job_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务类型" prop="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
+          <el-option v-for="dict in dict.type.out_job_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="托盘码" prop="trayCode">
+        <el-input v-model="queryParams.trayCode" placeholder="请输入托盘码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="货位名称" prop="cargoSpaceName">
+        <el-input v-model="queryParams.cargoSpaceName" placeholder="请输入货位名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['out:job:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="jobList">
+      <el-table-column label="任务ID" align="center" prop="jobId" width="160" show-overflow-tooltip />
+      <el-table-column label="任务号" align="center" prop="taskNo" width="140" show-overflow-tooltip />
+      <el-table-column label="任务状态" align="center" prop="status" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status" /></template>
+      </el-table-column>
+      <el-table-column label="任务类型" align="center" prop="inOrOut" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut" /></template>
+      </el-table-column>
+      <el-table-column label="托盘码" align="center" prop="trayCode" width="140" show-overflow-tooltip />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" width="120" show-overflow-tooltip />
+      <el-table-column label="巷道ID" align="center" prop="roadwayId" width="100" />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="140" show-overflow-tooltip />
+      <el-table-column label="出口" align="center" prop="exitId" width="100" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="finishTime" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.finishTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { listJob } from "@/api/out/job"
+
+export default {
+  name: "SearchOutJobFlow",
+  dicts: ['mydo_job_status', 'out_job_type'],
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      jobList: [],
+      daterangeCreateTime: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        status: '4',
+        taskNo: null,
+        inOrOut: null,
+        trayCode: null,
+        warehouseName: null,
+        cargoSpaceName: null
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    buildQuery() {
+      const query = { ...this.queryParams, params: { history: 'true' } }
+      if (this.daterangeCreateTime && this.daterangeCreateTime.length === 2) {
+        query.params.beginCreateTime = this.daterangeCreateTime[0]
+        query.params.endCreateTime = this.daterangeCreateTime[1]
+      }
+      return query
+    },
+    getList() {
+      this.loading = true
+      listJob(this.buildQuery()).then(response => {
+        this.jobList = response.rows || []
+        this.total = response.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.daterangeCreateTime = []
+      this.resetForm("queryForm")
+      this.queryParams.status = '4'
+      this.handleQuery()
+    },
+    handleExport() {
+      this.download('out/job/export', this.buildQuery(), `out_job_flow_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/search/outStockoutHistory/index.vue b/ruoyi-ui/src/views/search/outStockoutHistory/index.vue
new file mode 100644
index 0000000..215e40f
--- /dev/null
+++ b/ruoyi-ui/src/views/search/outStockoutHistory/index.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="出库类型" prop="outType">
+        <el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
+          <el-option v-for="dict in dict.type.out_stockout_out_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+          <el-option v-for="dict in dict.type.out_stockout_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上位单号" prop="erpBill">
+        <el-input v-model="queryParams.erpBill" placeholder="请输入上位单号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="完成时间">
+        <el-date-picker v-model="daterangeFinishDate" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['out:stockout:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="stockoutList">
+      <el-table-column label="出库单号" align="center" prop="stockoutId" width="160" show-overflow-tooltip />
+      <el-table-column label="出库类型" align="center" prop="outType" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.out_stockout_out_type" :value="scope.row.outType" /></template>
+      </el-table-column>
+      <el-table-column label="单据状态" align="center" prop="status" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.out_stockout_status" :value="scope.row.status" /></template>
+      </el-table-column>
+      <el-table-column label="上位单号" align="center" prop="erpBill" width="140" show-overflow-tooltip />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" width="120" show-overflow-tooltip />
+      <el-table-column label="客户名称" align="center" prop="customerName" min-width="140" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="createDate" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startDate" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.startDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+      <el-table-column label="完成时间" align="center" prop="finishDate" width="160">
+        <template slot-scope="scope">{{ parseTime(scope.row.finishDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { listStockout } from "@/api/out/stockout"
+
+export default {
+  name: "SearchOutStockoutHistory",
+  dicts: ['out_stockout_out_type', 'out_stockout_status'],
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      stockoutList: [],
+      daterangeFinishDate: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        outType: null,
+        status: null,
+        erpBill: null,
+        warehouseName: null,
+        customerName: null
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    buildQuery() {
+      const query = { ...this.queryParams, params: { history: 'true' } }
+      if (this.daterangeFinishDate && this.daterangeFinishDate.length === 2) {
+        query.params.beginFinishDate = this.daterangeFinishDate[0]
+        query.params.endFinishDate = this.daterangeFinishDate[1]
+      }
+      return query
+    },
+    getList() {
+      this.loading = true
+      listStockout(this.buildQuery()).then(response => {
+        this.stockoutList = response.rows || []
+        this.total = response.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.daterangeFinishDate = []
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    handleExport() {
+      this.download('out/stockout/export', this.buildQuery(), `out_stockout_history_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/search/stockDetail/index.vue b/ruoyi-ui/src/views/search/stockDetail/index.vue
new file mode 100644
index 0000000..b2853c0
--- /dev/null
+++ b/ruoyi-ui/src/views/search/stockDetail/index.vue
@@ -0,0 +1,139 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="货位ID" prop="cargoSpaceId">
+        <el-input v-model="queryParams.cargoSpaceId" placeholder="请输入货位ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode">
+        <el-input v-model="queryParams.trayCode" placeholder="请输入托盘条码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="库存状态" prop="stockStatus">
+        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
+          <el-option v-for="dict in dict.type.bas_stock_stock_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物料状态" prop="productStatus">
+        <el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
+          <el-option v-for="dict in dict.type.bas_stock_product_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input v-model="queryParams.lotNo" placeholder="请输入批次号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="productId">
+        <el-input v-model="queryParams.productId" placeholder="请输入物料编码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="productName">
+        <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="入库时间">
+        <el-date-picker v-model="daterangeInDate" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['bas:stock:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="detailList">
+      <el-table-column label="明细ID" align="center" prop="detailId" width="160" show-overflow-tooltip />
+      <el-table-column label="库存ID" align="center" prop="stockId" width="160" show-overflow-tooltip />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" width="120" show-overflow-tooltip />
+      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" width="120" />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120" show-overflow-tooltip />
+      <el-table-column label="托盘条码" align="center" prop="trayCode" width="140" show-overflow-tooltip />
+      <el-table-column label="库存状态" align="center" prop="stockStatus" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.bas_stock_stock_status" :value="scope.row.stockStatus" /></template>
+      </el-table-column>
+      <el-table-column label="物料状态" align="center" prop="productStatus" width="100">
+        <template slot-scope="scope"><dict-tag :options="dict.type.bas_stock_product_status" :value="scope.row.productStatus" /></template>
+      </el-table-column>
+      <el-table-column label="批次号" align="center" prop="lotNo" width="120" show-overflow-tooltip />
+      <el-table-column label="物料编码" align="center" prop="productId" width="130" show-overflow-tooltip />
+      <el-table-column label="物料名称" align="center" prop="productName" min-width="160" show-overflow-tooltip />
+      <el-table-column label="库存数量" align="center" prop="quantity" width="90" />
+      <el-table-column label="出库数量" align="center" prop="outQuantity" width="90" />
+      <el-table-column label="可用库存" align="center" prop="availableQuantity" width="90" />
+      <el-table-column label="入库时间" align="center" prop="inDate" width="120">
+        <template slot-scope="scope">{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { listStockDetail } from "@/api/bas/stock"
+
+export default {
+  name: "SearchStockDetail",
+  dicts: ['bas_stock_stock_status', 'bas_stock_product_status'],
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      detailList: [],
+      daterangeInDate: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cargoSpaceId: null,
+        trayCode: null,
+        warehouseName: null,
+        stockStatus: null,
+        productStatus: null,
+        lotNo: null,
+        productId: null,
+        productName: null
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    buildQuery() {
+      const query = { ...this.queryParams, params: {} }
+      if (this.daterangeInDate && this.daterangeInDate.length === 2) {
+        query.params.beginInDate = this.daterangeInDate[0]
+        query.params.endInDate = this.daterangeInDate[1]
+      }
+      return query
+    },
+    getList() {
+      this.loading = true
+      listStockDetail(this.buildQuery()).then(response => {
+        this.detailList = response.rows || []
+        this.total = response.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.daterangeInDate = []
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    handleExport() {
+      this.download('bas/stock/detail/export', this.buildQuery(), `stock_detail_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue
index 889422b..23ab0a4 100644
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -618,8 +618,11 @@ $lighterBlue: #409EFF;
   font-size: 17px;
   white-space: nowrap;
   > img{
-    width: 30px;
+    width: 110px;
     height: 30px;
+    padding: 4px 6px;
+    box-sizing: border-box;
+    object-fit: contain;
     vertical-align: top;
   }
   .github{
diff --git a/scripts/verify-history-query-and-barcode-print.js b/scripts/verify-history-query-and-barcode-print.js
new file mode 100644
index 0000000..b2d1b54
--- /dev/null
+++ b/scripts/verify-history-query-and-barcode-print.js
@@ -0,0 +1,92 @@
+const fs = require('fs')
+const path = require('path')
+
+const root = path.resolve(__dirname, '..')
+
+function read(file) {
+  return fs.readFileSync(path.join(root, file), 'utf8')
+}
+
+function assertMatch(name, content, pattern) {
+  if (!pattern.test(content)) {
+    throw new Error(name)
+  }
+}
+
+const barcodeData = read('ruoyi-ui/src/views/bas/barcodeData/index.vue')
+assertMatch(
+  '条码打印必须规范化历史条码类型值',
+  barcodeData,
+  /normalizeBarcodeType\s*\([\s\S]*['"]1['"]\s*:\s*['"]CODE128['"]/
+)
+assertMatch(
+  '条码打印必须通过安全数值方法处理宽度和高度',
+  barcodeData,
+  /getBarcodeOptionNumber\s*\(/
+)
+assertMatch(
+  '条码打印宽度必须使用安全数值方法',
+  barcodeData,
+  /const lineWidth\s*=\s*this\.getBarcodeOptionNumber/
+)
+assertMatch(
+  '条码打印失败时必须显示明确错误信息',
+  barcodeData,
+  /生成条码打印内容失败/
+)
+
+const inStockinHistory = read('ruoyi-ui/src/views/search/inStockinHistory/index.vue')
+assertMatch(
+  '入库历史单据查询必须支持点击主单行加载明细',
+  inStockinHistory,
+  /@row-click="handleRowClick"[\s\S]*highlight-current-row/
+)
+assertMatch(
+  '入库历史单据查询必须调用入库子单明细接口',
+  inStockinHistory,
+  /import\s+\{\s*listStockin\s*,\s*listStockinDetail\s*\}/
+)
+assertMatch(
+  '入库历史单据明细必须传递父单状态以查询完成明细表',
+  inStockinHistory,
+  /this\.detailQueryParams\.status\s*=\s*row\.status/
+)
+assertMatch(
+  '入库历史单据明细必须有独立分页查询参数',
+  inStockinHistory,
+  /detailQueryParams:\s*\{[\s\S]*stockinId:\s*null/
+)
+assertMatch(
+  '入库历史单据明细必须调用 listStockinDetail',
+  inStockinHistory,
+  /listStockinDetail\(this\.detailQueryParams\)/
+)
+
+const inJobFlow = read('ruoyi-ui/src/views/search/inJobFlow/index.vue')
+assertMatch(
+  '入库流水查询必须支持点击主作业行加载明细',
+  inJobFlow,
+  /@row-click="handleRowClick"[\s\S]*highlight-current-row/
+)
+assertMatch(
+  '入库流水查询必须调用子作业明细接口',
+  inJobFlow,
+  /import\s+\{\s*listJobdetail\s*\}/
+)
+assertMatch(
+  '入库流水查询明细必须传递父任务状态以查询完成明细表',
+  inJobFlow,
+  /this\.detailQueryParams\.status\s*=\s*row\.status/
+)
+assertMatch(
+  '入库流水查询明细必须有独立分页查询参数',
+  inJobFlow,
+  /detailQueryParams:\s*\{[\s\S]*jobId:\s*null/
+)
+assertMatch(
+  '入库流水查询明细必须调用 listJobdetail',
+  inJobFlow,
+  /listJobdetail\(this\.detailQueryParams\)/
+)
+
+console.log('History query and barcode print checks passed')
diff --git a/scripts/verify-inbound-job-fixes.js b/scripts/verify-inbound-job-fixes.js
new file mode 100644
index 0000000..b413236
--- /dev/null
+++ b/scripts/verify-inbound-job-fixes.js
@@ -0,0 +1,119 @@
+const fs = require('fs')
+const path = require('path')
+
+const root = path.resolve(__dirname, '..')
+
+function read(file) {
+  return fs.readFileSync(path.join(root, file), 'utf8')
+}
+
+function assertMatch(name, content, pattern) {
+  if (!pattern.test(content)) {
+    throw new Error(name)
+  }
+}
+
+function assertOrder(name, content, markers) {
+  let cursor = -1
+  for (const marker of markers) {
+    const index = content.indexOf(marker)
+    if (index === -1 || index <= cursor) {
+      throw new Error(name)
+    }
+    cursor = index
+  }
+}
+
+const inJob = read('ruoyi-ui/src/views/in/job/index.vue')
+assertMatch(
+  '入库作业页面必须加载入库任务类型字典',
+  inJob,
+  /dicts:\s*\[[^\]]*['"]in_job_type['"][^\]]*\]/
+)
+assertMatch(
+  '任务状态列必须使用任务状态字典渲染',
+  inJob,
+  /label="任务状态"[\s\S]*dict\.type\.mydo_job_status[\s\S]*scope\.row\.status/
+)
+assertMatch(
+  '任务类型列必须使用入库任务类型字典渲染',
+  inJob,
+  /label="任务类型"[\s\S]*dict\.type\.in_job_type[\s\S]*scope\.row\.inOrOut/
+)
+assertMatch(
+  '手动作废和手动完成按钮必须按选中作业终态统一禁用',
+  inJob,
+  /:disabled="!canOperateSelectedJob"[\s\S]*:disabled="!canOperateSelectedJob"/
+)
+assertMatch(
+  '终态状态必须包含已完成和已作废',
+  inJob,
+  /return\s+\['4',\s*'5'\]\.includes\(String\(status\)\)/
+)
+
+const stationPoint = read('ruoyi-ui/src/views/bas/stationpoint/index.vue')
+assertMatch(
+  '点位配置弹窗点位类型下拉必须与其他控件等宽',
+  stationPoint,
+  /v-model="form\.pointType"[^>]*style="width:\s*100%"/
+)
+
+const bindTray = read('pda/pages/warehouse/inbound/bindTray.vue')
+assertOrder(
+  'PDA 入库点位选择必须放在托盘号下面',
+  bindTray,
+  ['<text class="form-label">仓库</text>', '<text class="form-label">托盘号</text>', '<text class="form-label">入库点位</text>']
+)
+assertMatch(
+  'PDA 必须在仓库和托盘号不完整时提示先选择仓库并扫描托盘号',
+  bindTray,
+  /请先选择仓库和扫描托盘号/
+)
+assertMatch(
+  'PDA 仓库和托盘号完整后必须提示扫描入库点位',
+  bindTray,
+  /请扫描入库点位/
+)
+assertMatch(
+  'PDA 绑盘并生成作业成功后必须清空托盘号和已绑定物料',
+  bindTray,
+  /resetBindPayload\(\)[\s\S]*this\.trayCode\s*=\s*''[\s\S]*this\.items\s*=\s*\[\]/
+)
+
+const pdaService = read('ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java')
+assertMatch(
+  '入库作业生成后必须兜底写入初始状态 1 和执行阶段 0',
+  pdaService,
+  /setStatus\("1"\)[\s\S]*setExecutionPhase\("0"\)/
+)
+assertMatch(
+  '入库 WCS 下发成功后必须写入状态 3 和执行阶段 1',
+  pdaService,
+  /setStatus\("3"\)[\s\S]*setExecutionPhase\("1"\)/
+)
+assertMatch(
+  '入库作业生成后必须补写仓库名称',
+  pdaService,
+  /selectBasWarehouseByWarehouseId[\s\S]*setWarehouseName/
+)
+
+const mydoJobMapper = read('ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml')
+assertMatch(
+  '作业列表查询必须在 warehouse_name 为空时按 warehouse_id 兜底显示仓库名称',
+  mydoJobMapper,
+  /isnull\(nullif\(warehouse_name,\s*''\),\s*\(select top 1 bw\.warehouse_name/
+)
+
+const mydoJobService = read('ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java')
+assertMatch(
+  '共用 WCS 推送成功后必须写入状态 3 和执行阶段 1',
+  mydoJobService,
+  /pushOutJobToWcs[\s\S]*setStatus\("3"\)[\s\S]*setExecutionPhase\("1"\)/
+)
+
+const sql = read('sql/20260624_update_job_dicts.sql')
+assertMatch('SQL 脚本必须包含正执行状态字典', sql, /正执行/)
+assertMatch('SQL 脚本必须包含生成作业执行阶段字典', sql, /生成作业/)
+assertMatch('SQL 脚本必须包含下发到WCS执行阶段字典', sql, /下发到WCS/)
+
+console.log('Inbound job fix checks passed')
diff --git a/scripts/verify-outbound-stock-fixes.js b/scripts/verify-outbound-stock-fixes.js
new file mode 100644
index 0000000..0cf9c37
--- /dev/null
+++ b/scripts/verify-outbound-stock-fixes.js
@@ -0,0 +1,208 @@
+const fs = require('fs');
+const path = require('path');
+
+const root = path.resolve(__dirname, '..');
+
+function read(relativePath) {
+  return fs.readFileSync(path.join(root, relativePath), 'utf8');
+}
+
+function assertContains(file, needle, message) {
+  const content = read(file);
+  if (!content.includes(needle)) {
+    throw new Error(`${message}\nMissing in ${file}: ${needle}`);
+  }
+}
+
+function assertMatches(file, pattern, message) {
+  const content = read(file);
+  if (!pattern.test(content)) {
+    throw new Error(`${message}\nPattern not found in ${file}: ${pattern}`);
+  }
+}
+
+assertMatches(
+  'ruoyi-admin/src/main/java/com/ruoyi/bas/stock/service/impl/BasStockServiceImpl.java',
+  /"KC"\s*\+\s*STOCK_ID_FORMATTER\.format/,
+  'Manual stock creation must generate KC + millisecond timestamp IDs.'
+);
+
+assertContains(
+  'sql/bas_stock_master_detail.sql',
+  "in_type",
+  'Inbound completion stock generation must persist the real inbound type.'
+);
+assertMatches(
+  'sql/bas_stock_master_detail.sql',
+  /'KC'\s*\+\s*FORMAT\(@now,\s*'yyyyMMddHHmmssfff'\)/,
+  'Inbound completion procedure must generate KC + millisecond timestamp stock IDs.'
+);
+assertContains(
+  'sql/bas_stock_master_detail.sql',
+  "@stock_id + N'-' + CONVERT",
+  'Inbound completion stock detail IDs must use stock ID plus detail sequence.'
+);
+assertContains(
+  'ruoyi-admin/src/main/resources/mapper/bas/BasStockDetailMapper.xml',
+  'bsd.product_id, bsd.product_name',
+  'Stock detail queries must keep material code and material name in separate columns.'
+);
+assertContains(
+  'ruoyi-ui/src/views/bas/stock/index.vue',
+  'label="物料编码" align="center" prop="productId"',
+  'Stock detail UI must render material code from productId.'
+);
+assertContains(
+  'ruoyi-ui/src/views/bas/stock/index.vue',
+  'label="物料名称" align="center" prop="productName"',
+  'Stock detail UI must render material name from productName.'
+);
+
+const outJob = read('ruoyi-ui/src/views/out/job/index.vue');
+if (!outJob.includes('prop="status"') || !outJob.includes('dict.type.mydo_job_status')) {
+  throw new Error('Outbound job page must filter/render task status with mydo_job_status.');
+}
+if (!outJob.includes('dict.type.out_job_type') || !outJob.includes("dicts: ['mydo_job_execution_phase', 'mydo_job_status', 'out_job_type']")) {
+  throw new Error('Outbound job page must render task type with out_job_type.');
+}
+if (!outJob.includes("parseTime(scope.row.createTime")) {
+  throw new Error('Outbound job page must render createTime from createTime, not createDate.');
+}
+if (!outJob.includes('this.detailQueryParams.status = row.status')) {
+  throw new Error('Finished outbound jobs must pass parent status when loading child job details.');
+}
+
+assertContains(
+  'ruoyi-ui/src/views/out/stockout/index.vue',
+  'selectedExitId',
+  'Outbound allocation UI must require an exit selection.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/stockout/index.vue',
+  'listStationPoint',
+  'Outbound allocation UI must load warehouse exit/entry-exit station points.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/stockout/index.vue',
+  'this.detailQueryParams.status = row.status',
+  'Finished outbound bills must pass the parent status when loading child details.'
+);
+assertContains(
+  'ruoyi-admin/src/main/java/com/ruoyi/out/stockout/domain/OutStockoutManualAssignDTO.java',
+  'private String exitId;',
+  'Manual outbound allocation DTO must carry the selected exit.'
+);
+assertContains(
+  'ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml',
+  '#{v_exit_id,mode=IN,jdbcType=VARCHAR}',
+  'Outbound allocation mapper must pass the selected exit to procedures.'
+);
+assertContains(
+  'sql/out_stockout_flow.sql',
+  '@v_exit_id varchar(80)',
+  'Outbound allocation procedures must accept a selected exit.'
+);
+assertContains(
+  'sql/out_stockout_flow.sql',
+  '@exit_id = @v_exit_id',
+  'Outbound allocation procedure must store the selected exit on generated jobs.'
+);
+
+assertContains(
+  'ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java',
+  'requestWcsCancelBeforeManualCancel',
+  'Manual job cancellation must reserve a WCS cancellation check.'
+);
+
+assertContains(
+  'pda/pages/warehouse/outbound/confirm.vue',
+  '扫描托盘条码',
+  'PDA outbound confirmation must scan tray barcodes.'
+);
+assertContains(
+  'pda/pages/warehouse/outbound/confirm.vue',
+  'materials',
+  'PDA outbound confirmation must render tray material details.'
+);
+assertContains(
+  'pda/pages/warehouse/outbound/confirm.vue',
+  'v-model="item.actualQuantity"',
+  'PDA outbound confirmation must capture actual outbound quantity per material.'
+);
+assertContains(
+  'pda/pages/warehouse/outbound/confirm.vue',
+  'materials: this.outboundInfo.materials.map',
+  'PDA outbound confirmation must submit actual quantities per material.'
+);
+assertContains(
+  'ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java',
+  'createReturnInboundJobIfNeeded',
+  'PDA outbound confirmation must create return inbound jobs for residual tray materials.'
+);
+assertContains(
+  'ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java',
+  'jobIdService.getId("HL")',
+  'Residual tray return jobs must use the 回流作业 job-id prefix.'
+);
+assertContains(
+  'ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java',
+  'taskNoService.getTaskNo("5")',
+  'Residual tray return jobs must use the 回流入库 task-number type.'
+);
+assertContains(
+  'sql/20260624_update_job_dicts.sql',
+  "N'回流入库'",
+  'Inbound job dictionaries must render 回流入库 return jobs.'
+);
+assertContains(
+  'ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml',
+  'selectResidualTrayMaterials',
+  'PDA mapper must query residual tray materials after outbound confirmation.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/locationOutbound/index.vue',
+  'active-text="所有货位"',
+  'Specified-location outbound filter switch must be labelled 所有货位.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/locationOutbound/index.vue',
+  'listWarehouse',
+  'Specified-location outbound page must load warehouse dropdown options.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/locationOutbound/index.vue',
+  'v-model="queryParams.warehouseId"',
+  'Specified-location outbound page must filter by warehouse id dropdown.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/locationOutbound/index.vue',
+  '@selection-change="handleSelectionChange"',
+  'Specified-location outbound table must support selecting locations.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/locationOutbound/index.vue',
+  '批量生成作业',
+  'Specified-location outbound page must provide a batch generation action.'
+);
+assertContains(
+  'ruoyi-ui/src/views/out/locationOutbound/index.vue',
+  'Promise.all(rows.map',
+  'Specified-location outbound page must generate outbound jobs for selected locations.'
+);
+const locationOutbound = read('ruoyi-ui/src/views/out/locationOutbound/index.vue');
+if (locationOutbound.includes('type="expand"')) {
+  throw new Error('Specified-location outbound page must use a lower child-detail table instead of expand rows.');
+}
+if (!locationOutbound.includes('@row-click="handleRowClick"') ||
+    !locationOutbound.includes('currentLocation') ||
+    !locationOutbound.includes('locationDetailList')) {
+  throw new Error('Specified-location outbound page must click a parent location row and show child details below.');
+}
+if (!locationOutbound.includes('cargoSpaceId: row.cargoSpaceId')) {
+  throw new Error('Specified-location outbound generation must send cargoSpaceId so empty locations can generate jobs.');
+}
+if (!locationOutbound.includes("['1', '6'].includes(String(row.cargoSpaceStatus))")) {
+  throw new Error('Specified-location outbound must allow empty and no-stock abnormal locations to generate jobs.');
+}
+
+console.log('Outbound and stock regression checks passed.');
diff --git a/sql/20260624_update_job_dicts.sql b/sql/20260624_update_job_dicts.sql
new file mode 100644
index 0000000..f75c940
--- /dev/null
+++ b/sql/20260624_update_job_dicts.sql
@@ -0,0 +1,133 @@
+-- Align job status/type display dictionaries for inbound job workflow.
+-- status: 1=未执行, 2=正执行, 4=已完成, 5=已作废
+-- execution_phase: 0=生成作业, 1=下发到WCS, 5=等待扫码确认
+
+SET NOCOUNT ON;
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_status' AND dict_value = N'1')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'未执行',
+           dict_sort = 0,
+           list_class = N'default',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_status'
+       AND dict_value = N'1';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (0, N'未执行', N'1', N'mydo_job_status', N'default', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_status' AND dict_value = N'2')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'正执行',
+           dict_sort = 1,
+           list_class = N'primary',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_status'
+       AND dict_value = N'2';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (1, N'正执行', N'2', N'mydo_job_status', N'primary', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_status' AND dict_value = N'4')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'已完成',
+           dict_sort = 3,
+           list_class = N'success',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_status'
+       AND dict_value = N'4';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (3, N'已完成', N'4', N'mydo_job_status', N'success', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_status' AND dict_value = N'5')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'已作废',
+           dict_sort = 4,
+           list_class = N'danger',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_status'
+       AND dict_value = N'5';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (4, N'已作废', N'5', N'mydo_job_status', N'danger', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_execution_phase' AND dict_value = N'0')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'生成作业',
+           dict_sort = 0,
+           list_class = N'default',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_execution_phase'
+       AND dict_value = N'0';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (0, N'生成作业', N'0', N'mydo_job_execution_phase', N'default', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_execution_phase' AND dict_value = N'1')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'下发到WCS',
+           dict_sort = 1,
+           list_class = N'primary',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_execution_phase'
+       AND dict_value = N'1';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (1, N'下发到WCS', N'1', N'mydo_job_execution_phase', N'primary', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'mydo_job_execution_phase' AND dict_value = N'5')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'等待扫码确认',
+           dict_sort = 5,
+           list_class = N'warning',
+           status = N'0'
+     WHERE dict_type = N'mydo_job_execution_phase'
+       AND dict_value = N'5';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (5, N'等待扫码确认', N'5', N'mydo_job_execution_phase', N'warning', N'N', N'0', N'admin', GETDATE());
+END
+
+IF EXISTS (SELECT 1 FROM sys_dict_data WHERE dict_type = N'in_job_type' AND dict_value = N'5')
+BEGIN
+    UPDATE sys_dict_data
+       SET dict_label = N'回流入库',
+           dict_sort = 4,
+           list_class = N'warning',
+           status = N'0'
+     WHERE dict_type = N'in_job_type'
+       AND dict_value = N'5';
+END
+ELSE
+BEGIN
+    INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (4, N'回流入库', N'5', N'in_job_type', N'warning', N'N', N'0', N'admin', GETDATE());
+END
diff --git a/sql/bas_station_point.sql b/sql/bas_station_point.sql
index 9b9c24f..edc3587 100644
--- a/sql/bas_station_point.sql
+++ b/sql/bas_station_point.sql
@@ -35,6 +35,7 @@ GO
 IF COL_LENGTH('dbo.bas_station_point', 'point_size') IS NULL
     ALTER TABLE dbo.bas_station_point ADD point_size varchar(8) COLLATE Chinese_PRC_CI_AS NULL CONSTRAINT DF_bas_station_point_point_size DEFAULT '1';
 GO
+-- point_size：1=大点位，2=小点位，3=通用点位。
 IF COL_LENGTH('dbo.bas_station_point', 'tray_type') IS NULL
     ALTER TABLE dbo.bas_station_point ADD tray_type varchar(128) COLLATE Chinese_PRC_CI_AS NULL CONSTRAINT DF_bas_station_point_tray_type DEFAULT '';
 GO
diff --git a/sql/bas_stock_master_detail.sql b/sql/bas_stock_master_detail.sql
index f81ea84..27f8dfb 100644
--- a/sql/bas_stock_master_detail.sql
+++ b/sql/bas_stock_master_detail.sql
@@ -1,7 +1,7 @@
 IF OBJECT_ID(N'dbo.bas_stock_detail', N'U') IS NULL
 BEGIN
     CREATE TABLE dbo.bas_stock_detail (
-        detail_id nvarchar(32) NOT NULL,
+        detail_id nvarchar(80) NOT NULL,
         stock_id nvarchar(32) NOT NULL,
         product_status nvarchar(2) NULL,
         lot_no nvarchar(80) NULL,
@@ -19,6 +19,12 @@ BEGIN
 END
 GO
 
+IF COL_LENGTH('dbo.bas_stock_detail', 'detail_id') < 160
+BEGIN
+    ALTER TABLE dbo.bas_stock_detail ALTER COLUMN detail_id nvarchar(80) NOT NULL;
+END
+GO
+
 IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = N'IX_bas_stock_detail_stock_id' AND object_id = OBJECT_ID(N'dbo.bas_stock_detail'))
 BEGIN
     CREATE INDEX IX_bas_stock_detail_stock_id ON dbo.bas_stock_detail(stock_id);
@@ -43,7 +49,7 @@ INSERT INTO dbo.bas_stock_detail (
     quantity, out_quantity, job_detail_id, stockin_detail_id, create_time
 )
 SELECT
-    LEFT(REPLACE(CONVERT(varchar(36), NEWID()), '-', ''), 32),
+    bs.stock_id + N'-1',
     bs.stock_id,
     bs.product_status,
     bs.lot_no,
@@ -82,6 +88,14 @@ LEFT JOIN (
 ) bsa ON bsa.stock_id = bs.stock_id;
 GO
 
+UPDATE bs
+SET bs.warehouse_name = bw.warehouse_name
+FROM dbo.bas_stock bs
+INNER JOIN dbo.bas_warehouse bw ON bs.warehouse_id = bw.warehouse_id
+WHERE (bs.warehouse_name IS NULL OR bs.warehouse_name = '')
+  AND bw.warehouse_name IS NOT NULL;
+GO
+
 IF OBJECT_ID(N'[dbo].[proc_complete_in_job]', N'P') IS NOT NULL
 BEGIN
     DROP PROCEDURE [dbo].[proc_complete_in_job];
@@ -100,12 +114,15 @@ BEGIN
     SET XACT_ABORT ON;
 
     DECLARE
-        @now DATETIME = GETDATE(),
+        @now DATETIME2(3) = SYSDATETIME(),
         @tray_code NVARCHAR(255),
         @warehouse_id NVARCHAR(80),
+        @warehouse_name NVARCHAR(255),
         @cargo_space_id NVARCHAR(80),
         @stock_id NVARCHAR(32),
-        @detail_id NVARCHAR(32);
+        @detail_id NVARCHAR(80),
+        @detail_index INT = 0,
+        @in_type NVARCHAR(5);
 
     DECLARE
         @job_detail_id NVARCHAR(80),
@@ -133,7 +150,12 @@ BEGIN
     SELECT
         @cargo_space_id = cargo_space_id,
         @tray_code = tray_code,
-        @warehouse_id = warehouse_id
+        @warehouse_id = warehouse_id,
+        @warehouse_name = ISNULL(NULLIF(warehouse_name, ''), (
+            SELECT TOP 1 bw.warehouse_name
+            FROM bas_warehouse bw
+            WHERE bw.warehouse_id = mydo_job.warehouse_id
+        ))
     FROM mydo_job WHERE job_id = @job_id;
 
     IF NOT EXISTS (SELECT 1 FROM bas_cargo_space WHERE cargo_space_id = @cargo_space_id)
@@ -163,22 +185,27 @@ BEGIN
             SET assign_num = ISNULL(assign_num, 0) + @in_quantity
             WHERE stockin_detail_id = @stockin_detail_id;
 
-            SET @detail_id = LEFT(REPLACE(CONVERT(varchar(36), NEWID()), '-', ''), 32);
-
             IF @stock_id IS NULL
             BEGIN
-                SET @stock_id = LEFT(REPLACE(CONVERT(varchar(36), NEWID()), '-', ''), 32);
+                SELECT TOP 1 @in_type = in_type
+                FROM in_stockin
+                WHERE stockin_id = @stockin_id;
+
+                SET @stock_id = 'KC' + FORMAT(@now, 'yyyyMMddHHmmssfff');
 
                 INSERT INTO bas_stock (
                     stock_id, cargo_space_id, stock_status, in_date, quantity,
-                    job_id, tray_code, out_quantity, stockin_id, warehouse_id
+                    job_id, tray_code, out_quantity, stockin_id, in_type, warehouse_id, warehouse_name
                 )
                 VALUES (
                     @stock_id, @cargo_space_id, '1', @now, 0,
-                    @job_id, @tray_code, 0, @stockin_id, @warehouse_id
+                    @job_id, @tray_code, 0, @stockin_id, @in_type, @warehouse_id, @warehouse_name
                 );
             END;
 
+            SET @detail_index = @detail_index + 1;
+            SET @detail_id = @stock_id + N'-' + CONVERT(NVARCHAR(10), @detail_index);
+
             INSERT INTO bas_stock_detail (
                 detail_id, stock_id, product_status, lot_no, product_id, product_name,
                 quantity, out_quantity, job_detail_id, stockin_detail_id, create_time
@@ -197,7 +224,7 @@ BEGIN
         DEALLOCATE cur_finish_job_detail;
 
         UPDATE bas_cargo_space
-        SET status = '2', tray_code = @tray_code, locked = 'N'
+        SET status = '2', tray_code = @tray_code
         WHERE cargo_space_id = @cargo_space_id;
 
         UPDATE bs
diff --git a/sql/location_outbound.sql b/sql/location_outbound.sql
new file mode 100644
index 0000000..b76848f
--- /dev/null
+++ b/sql/location_outbound.sql
@@ -0,0 +1,170 @@
+-- 指定货位出库菜单与货位状态字典补丁
+-- 目标库：FTC25009-WMS
+
+SET NOCOUNT ON;
+
+IF EXISTS (SELECT 1 FROM dbo.sys_dict_data WHERE dict_type = N'bas_cargo_space_status' AND dict_value = N'4')
+BEGIN
+    UPDATE dbo.sys_dict_data
+       SET dict_label = N'出库已分配',
+           dict_sort = 4,
+           list_class = N'warning',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE dict_type = N'bas_cargo_space_status'
+       AND dict_value = N'4';
+END
+ELSE
+BEGIN
+    INSERT INTO dbo.sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (4, N'出库已分配', N'4', N'bas_cargo_space_status', N'warning', N'N', N'0', N'admin', GETDATE());
+END
+
+DECLARE @outMenuId bigint = 2001;
+DECLARE @preferredLocationOutboundMenuId bigint = 2220;
+DECLARE @locationOutboundMenuId bigint;
+DECLARE @queryButtonMenuId bigint;
+DECLARE @generateButtonMenuId bigint;
+DECLARE @menuIdIsIdentity bit = COLUMNPROPERTY(OBJECT_ID(N'dbo.sys_menu'), 'menu_id', 'IsIdentity');
+
+SELECT TOP 1 @locationOutboundMenuId = menu_id
+FROM dbo.sys_menu
+WHERE menu_type = N'C'
+  AND (
+      perms = N'out:locationOutbound:list'
+      OR (path = N'locationOutbound' AND component = N'out/locationOutbound/index')
+  )
+ORDER BY menu_id;
+
+IF @locationOutboundMenuId IS NULL
+BEGIN
+    SET @locationOutboundMenuId = @preferredLocationOutboundMenuId;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @locationOutboundMenuId)
+        SET @locationOutboundMenuId = @locationOutboundMenuId + 1;
+END
+
+SELECT TOP 1 @queryButtonMenuId = menu_id
+FROM dbo.sys_menu
+WHERE parent_id = @locationOutboundMenuId
+  AND menu_type = N'F'
+  AND perms = N'out:locationOutbound:list'
+ORDER BY menu_id;
+
+IF @queryButtonMenuId IS NULL
+BEGIN
+    SET @queryButtonMenuId = @locationOutboundMenuId + 1;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @queryButtonMenuId)
+        SET @queryButtonMenuId = @queryButtonMenuId + 1;
+END
+
+SELECT TOP 1 @generateButtonMenuId = menu_id
+FROM dbo.sys_menu
+WHERE parent_id = @locationOutboundMenuId
+  AND menu_type = N'F'
+  AND perms = N'out:locationOutbound:generate'
+ORDER BY menu_id;
+
+IF @generateButtonMenuId IS NULL
+BEGIN
+    SET @generateButtonMenuId = @queryButtonMenuId + 1;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @generateButtonMenuId)
+        SET @generateButtonMenuId = @generateButtonMenuId + 1;
+END
+
+IF @menuIdIsIdentity = 1
+    SET IDENTITY_INSERT dbo.sys_menu ON;
+
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @locationOutboundMenuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @locationOutboundMenuId, N'指定货位出库', @outMenuId, 4, N'locationOutbound', N'out/locationOutbound/index', NULL, N'',
+        1, 0, N'C', N'0', N'0', N'out:locationOutbound:list', N'guide',
+        N'admin', GETDATE(), N'', NULL, N''
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'指定货位出库',
+           parent_id = @outMenuId,
+           order_num = 4,
+           path = N'locationOutbound',
+           component = N'out/locationOutbound/index',
+           perms = N'out:locationOutbound:list',
+           icon = N'guide',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @locationOutboundMenuId;
+END
+
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @queryButtonMenuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @queryButtonMenuId, N'指定货位出库查询', @locationOutboundMenuId, 1, N'#', N'', NULL, N'',
+        1, 0, N'F', N'0', N'0', N'out:locationOutbound:list', N'#',
+        N'admin', GETDATE(), N'', NULL, N''
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'指定货位出库查询',
+           parent_id = @locationOutboundMenuId,
+           order_num = 1,
+           path = N'#',
+           component = N'',
+           perms = N'out:locationOutbound:list',
+           icon = N'#',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @queryButtonMenuId;
+END
+
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @generateButtonMenuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @generateButtonMenuId, N'生成出库作业', @locationOutboundMenuId, 2, N'#', N'', NULL, N'',
+        1, 0, N'F', N'0', N'0', N'out:locationOutbound:generate', N'#',
+        N'admin', GETDATE(), N'', NULL, N''
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'生成出库作业',
+           parent_id = @locationOutboundMenuId,
+           order_num = 2,
+           path = N'#',
+           component = N'',
+           perms = N'out:locationOutbound:generate',
+           icon = N'#',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @generateButtonMenuId;
+END
+
+IF @menuIdIsIdentity = 1
+    SET IDENTITY_INSERT dbo.sys_menu OFF;
+GO
diff --git a/sql/out_stockout_flow.sql b/sql/out_stockout_flow.sql
index 131e668..13a051c 100644
--- a/sql/out_stockout_flow.sql
+++ b/sql/out_stockout_flow.sql
@@ -46,6 +46,78 @@ BEGIN
 END
 GO
 
+IF OBJECT_ID(N'dbo.bas_stock_finish', N'U') IS NULL
+BEGIN
+    CREATE TABLE dbo.bas_stock_finish (
+        stock_id nvarchar(32) NOT NULL,
+        cargo_space_id nvarchar(80) NULL,
+        stock_status nvarchar(2) NULL,
+        product_status nvarchar(2) NULL,
+        lot_no nvarchar(80) NULL,
+        in_date datetime2(7) NULL,
+        back_date datetime2(7) NULL,
+        product_id nvarchar(80) NULL,
+        product_name nvarchar(255) NULL,
+        quantity decimal(18, 0) NULL,
+        job_id nvarchar(80) NULL,
+        job_detail_id nvarchar(255) NULL,
+        tray_code nvarchar(225) NULL,
+        out_quantity decimal(18, 0) NULL,
+        stockin_detail_id nvarchar(80) NULL,
+        stockin_id nvarchar(80) NULL,
+        in_type nvarchar(5) NULL,
+        warehouse_id nvarchar(80) NULL,
+        warehouse_name nvarchar(255) NULL,
+        user_id int NULL,
+        user_name nvarchar(255) NULL,
+        dept_id int NULL,
+        dept_name nvarchar(255) NULL,
+        supplier_id nvarchar(255) NULL,
+        supplier_name nvarchar(255) NULL,
+        delete_time datetime2(7) NULL
+    );
+END
+GO
+
+IF COL_LENGTH('dbo.bas_stock_finish', 'delete_time') IS NULL
+BEGIN
+    ALTER TABLE dbo.bas_stock_finish ADD delete_time datetime2(7) NULL;
+END
+GO
+
+IF OBJECT_ID(N'dbo.bas_stock_detail_finish', N'U') IS NULL
+BEGIN
+    CREATE TABLE dbo.bas_stock_detail_finish (
+        detail_id nvarchar(80) NOT NULL,
+        stock_id nvarchar(32) NOT NULL,
+        product_status nvarchar(2) NULL,
+        lot_no nvarchar(80) NULL,
+        product_id nvarchar(80) NULL,
+        product_name nvarchar(255) NULL,
+        quantity decimal(18, 0) NULL,
+        out_quantity decimal(18, 0) NULL,
+        job_detail_id nvarchar(255) NULL,
+        stockin_detail_id nvarchar(80) NULL,
+        create_time datetime2(7) NULL,
+        update_time datetime2(7) NULL,
+        remark nvarchar(500) NULL,
+        delete_time datetime2(7) NULL
+    );
+END
+GO
+
+IF COL_LENGTH('dbo.bas_stock_detail_finish', 'delete_time') IS NULL
+BEGIN
+    ALTER TABLE dbo.bas_stock_detail_finish ADD delete_time datetime2(7) NULL;
+END
+GO
+
+IF COL_LENGTH('dbo.bas_stock_detail_finish', 'detail_id') < 160
+BEGIN
+    ALTER TABLE dbo.bas_stock_detail_finish ALTER COLUMN detail_id nvarchar(80) NOT NULL;
+END
+GO
+
 IF OBJECT_ID(N'dbo.proc_update_outbill_status', N'P') IS NOT NULL
     DROP PROCEDURE dbo.proc_update_outbill_status;
 GO
@@ -182,6 +254,7 @@ GO
 CREATE PROCEDURE dbo.proc_out_hand_allocation
     @v_stockout_detail_id varchar(80),
     @v_stock_id varchar(80),
+    @v_exit_id varchar(80),
     @v_result int OUTPUT,
     @v_resultString varchar(100) OUTPUT
 AS
@@ -211,10 +284,12 @@ BEGIN
         @available_qty decimal(18, 0),
         @alloc_qty decimal(18, 0),
         @job_id nvarchar(80),
+        @job_type int,
         @task_no nvarchar(80),
         @job_detail_id nvarchar(80),
         @row_idx int,
         @tray_code nvarchar(255),
+        @tray_type nvarchar(80),
         @cargo_space_id nvarchar(80),
         @cargo_space_name nvarchar(255),
         @roadway_id nvarchar(80),
@@ -223,6 +298,7 @@ BEGIN
         @supplier_id nvarchar(255),
         @supplier_name nvarchar(255),
         @exit_id nvarchar(80),
+        @existing_job_id nvarchar(80),
         @now datetime = GETDATE();
 
     SELECT TOP 1
@@ -257,6 +333,13 @@ BEGIN
         RETURN;
     END
 
+    IF @v_exit_id IS NULL OR LTRIM(RTRIM(@v_exit_id)) = ''
+    BEGIN
+        SET @v_result = 2;
+        SET @v_resultString = '请选择出库口';
+        RETURN;
+    END
+
     SET @remaining = @bill_qty - @allot_qty;
     IF @remaining <= 0
     BEGIN
@@ -288,16 +371,52 @@ BEGIN
             @cargo_space_name = bcs.cargo_space_name,
             @roadway_id = bcs.roadway_id,
             @stock_warehouse_id = bs.warehouse_id,
-            @stock_warehouse_name = bs.warehouse_name,
+            @stock_warehouse_name = ISNULL(NULLIF(bs.warehouse_name, ''), bw.warehouse_name),
+            @tray_type = bbf.tray_type,
             @supplier_id = bs.supplier_id,
             @supplier_name = bs.supplier_name
         FROM dbo.bas_stock_detail bsd WITH (UPDLOCK, HOLDLOCK)
         INNER JOIN dbo.bas_stock bs WITH (UPDLOCK, HOLDLOCK) ON bsd.stock_id = bs.stock_id
         LEFT JOIN dbo.bas_cargo_space bcs WITH (UPDLOCK, HOLDLOCK) ON bs.cargo_space_id = bcs.cargo_space_id
+        LEFT JOIN dbo.bas_warehouse bw ON bs.warehouse_id = bw.warehouse_id
+        OUTER APPLY (
+            SELECT TOP 1 prefix AS tray_type
+            FROM dbo.bas_barcode_format bbf
+            WHERE bbf.prefix IS NOT NULL
+              AND bbf.prefix != ''
+              AND bs.tray_code IS NOT NULL
+              AND LEFT(bs.tray_code, LEN(bbf.prefix)) = bbf.prefix
+            ORDER BY LEN(bbf.prefix) DESC
+        ) bbf
         WHERE bsd.product_id = @product_id
           AND (ISNULL(@lot_no, '') = '' OR ISNULL(bsd.lot_no, '') = ISNULL(@lot_no, ''))
           AND ISNULL(bsd.quantity, 0) - ISNULL(bsd.out_quantity, 0) > 0
-          AND (bsd.job_detail_id IS NULL OR bsd.job_detail_id = '')
+          AND (
+              bsd.job_detail_id IS NULL OR bsd.job_detail_id = ''
+              OR NOT EXISTS (
+                  SELECT 1
+                  FROM dbo.mydo_job_detail lock_jd
+                  INNER JOIN dbo.mydo_job lock_j ON lock_j.job_id = lock_jd.job_id
+                  WHERE lock_jd.job_detail_id = bsd.job_detail_id
+                    AND lock_j.in_or_out >= 20
+                    AND lock_j.status IN ('1', '2', '3')
+              )
+          )
+          AND (
+              bcs.status = '2'
+              OR EXISTS (
+                  SELECT 1
+                  FROM dbo.mydo_job ej
+                  INNER JOIN dbo.mydo_job_detail ejd ON ej.job_id = ejd.job_id
+                  WHERE ej.in_or_out >= 20
+                    AND ej.status IN ('1', '2', '3')
+                    AND ej.cargo_space_id = bs.cargo_space_id
+                    AND ISNULL(ej.tray_code, '') = ISNULL(bs.tray_code, '')
+                    AND ISNULL(ej.exit_id, '') = ISNULL(@v_exit_id, '')
+                    AND ejd.in_or_out_id = @stockout_id
+                    AND ejd.stock_id = bs.stock_id
+              )
+          )
           AND (@warehouse_id IS NULL OR @warehouse_id = '' OR bs.warehouse_id = @warehouse_id)
           AND (@locatio IS NULL OR bs.cargo_space_id = @locatio OR bcs.cargo_space_name = @locatio)
           AND (@preferred_detail_id IS NULL OR bsd.detail_id = @preferred_detail_id)
@@ -317,6 +436,7 @@ BEGIN
         END
 
         SET @alloc_qty = CASE WHEN @available_qty >= @remaining THEN @remaining ELSE @available_qty END;
+        SET @job_type = CASE WHEN @alloc_qty < @available_qty THEN 21 ELSE 20 END;
         IF @alloc_qty <= 0
         BEGIN
             SET @v_result = 2;
@@ -325,30 +445,90 @@ BEGIN
             RETURN;
         END
 
-        SELECT TOP 1 @exit_id = point_id
-        FROM dbo.bas_station_point
-        WHERE warehouse_id = @stock_warehouse_id
-          AND point_type IN ('2', '3')
-          AND status = '0'
-        ORDER BY point_type DESC, point_id;
-
-        EXEC dbo.util_serial_job 'CK', @job_id OUTPUT;
-        EXEC dbo.util_serial_task '20', @task_no OUTPUT;
-
-        INSERT INTO dbo.mydo_job (
-            job_id, status, task_no, in_or_out, execution_phase,
-            tray_code, warehouse_id, warehouse_name, roadway_id,
-            cargo_space_id, cargo_space_name, line_type, priority,
-            height, weight, create_time, exit_id, customer_id, customer_name
+        IF NOT EXISTS (
+            SELECT 1
+            FROM dbo.bas_station_point sp
+            WHERE sp.point_id = @v_exit_id
+              AND sp.warehouse_id = @stock_warehouse_id
+              AND sp.point_type IN ('2', '3')
+              AND sp.status = '0'
+              AND ISNULL(sp.point_status, '0') = '0'
         )
-        VALUES (
-            @job_id, '1', @task_no, 20, '4',
-            @tray_code, @stock_warehouse_id, @stock_warehouse_name, @roadway_id,
-            @cargo_space_id, @cargo_space_name, '1', 10,
-            0.00, 0.00, @now, @exit_id, @customer_id, @customer_name
-        );
+        BEGIN
+            SET @v_result = 2;
+            SET @v_resultString = '出库口不存在、禁用或已占用';
+            ROLLBACK TRANSACTION;
+            RETURN;
+        END
 
-        SET @job_detail_id = @job_id + '-1';
+        IF @tray_type IS NOT NULL
+           AND @tray_type != ''
+           AND NOT EXISTS (
+            SELECT 1
+            FROM dbo.bas_station_point sp
+            WHERE point_id = @v_exit_id
+              AND warehouse_id = @stock_warehouse_id
+              AND point_type IN ('2', '3')
+              AND status = '0'
+              AND ISNULL(point_status, '0') = '0'
+              AND charindex(',' + @tray_type + ',', ',' + sp.tray_type + ',') > 0
+        )
+        BEGIN
+            SET @v_result = 2;
+            SET @v_resultString = '出库口不支持当前托盘类型';
+            ROLLBACK TRANSACTION;
+            RETURN;
+        END
+
+        SET @exit_id = @v_exit_id;
+
+        SELECT TOP 1
+            @existing_job_id = ej.job_id,
+            @task_no = ej.task_no
+        FROM dbo.mydo_job ej
+        INNER JOIN dbo.mydo_job_detail ejd ON ej.job_id = ejd.job_id
+        WHERE ej.in_or_out >= 20
+          AND ej.status IN ('1', '2', '3')
+          AND ej.cargo_space_id = @cargo_space_id
+          AND ISNULL(ej.tray_code, '') = ISNULL(@tray_code, '')
+          AND ISNULL(ej.exit_id, '') = ISNULL(@exit_id, '')
+          AND ejd.in_or_out_id = @stockout_id
+          AND ejd.stock_id = @stock_id
+        ORDER BY ej.create_time DESC, ej.job_id DESC;
+
+        IF @existing_job_id IS NULL
+        BEGIN
+            EXEC dbo.util_serial_job 'CK', @job_id OUTPUT;
+            EXEC dbo.util_serial_task '20', @task_no OUTPUT;
+
+            INSERT INTO dbo.mydo_job (
+                job_id, status, task_no, in_or_out, execution_phase,
+                tray_code, warehouse_id, warehouse_name, roadway_id,
+                cargo_space_id, cargo_space_name, line_type, priority,
+                height, weight, create_time, exit_id, customer_id, customer_name
+            )
+            VALUES (
+                @job_id, '1', @task_no, @job_type, '4',
+                @tray_code, @stock_warehouse_id, @stock_warehouse_name, @roadway_id,
+                @cargo_space_id, @cargo_space_name, '1', 10,
+                0.00, 0.00, @now, @exit_id, @customer_id, @customer_name
+            );
+
+            SET @row_idx = 1;
+        END
+        ELSE
+        BEGIN
+            SET @job_id = @existing_job_id;
+            SELECT @row_idx = COUNT(1) + 1
+            FROM dbo.mydo_job_detail
+            WHERE job_id = @job_id;
+        END
+
+        UPDATE dbo.mydo_job
+        SET in_or_out = CASE WHEN @job_type = 21 THEN 21 ELSE in_or_out END
+        WHERE job_id = @job_id;
+
+        SET @job_detail_id = @job_id + '-' + CONVERT(nvarchar(10), @row_idx);
 
         INSERT INTO dbo.mydo_job_detail (
             job_detail_id, job_id, stock_id, lot_no, in_date,
@@ -385,7 +565,6 @@ BEGIN
 
         UPDATE dbo.bas_cargo_space
         SET status = '4',
-            locked = 'Y',
             tray_code = @tray_code
         WHERE cargo_space_id = @cargo_space_id;
 
@@ -422,6 +601,7 @@ GO
 
 CREATE PROCEDURE dbo.proc_out_auto_allocation
     @v_stockout_detail_id varchar(80),
+    @v_exit_id varchar(80),
     @v_result int OUTPUT,
     @v_resultString varchar(100) OUTPUT
 AS
@@ -439,7 +619,8 @@ BEGIN
         @remaining decimal(18, 0),
         @detail_id nvarchar(80),
         @child_result int,
-        @child_msg varchar(100);
+        @child_msg varchar(100),
+        @last_error varchar(100);
 
     SELECT TOP 1
         @stockout_id = d.stockout_id,
@@ -468,7 +649,32 @@ BEGIN
     WHERE bsd.product_id = @product_id
       AND (ISNULL(@lot_no, '') = '' OR ISNULL(bsd.lot_no, '') = ISNULL(@lot_no, ''))
       AND ISNULL(bsd.quantity, 0) - ISNULL(bsd.out_quantity, 0) > 0
-      AND (bsd.job_detail_id IS NULL OR bsd.job_detail_id = '')
+      AND (
+          bsd.job_detail_id IS NULL OR bsd.job_detail_id = ''
+          OR NOT EXISTS (
+              SELECT 1
+              FROM dbo.mydo_job_detail lock_jd
+              INNER JOIN dbo.mydo_job lock_j ON lock_j.job_id = lock_jd.job_id
+              WHERE lock_jd.job_detail_id = bsd.job_detail_id
+                AND lock_j.in_or_out >= 20
+                AND lock_j.status IN ('1', '2', '3')
+          )
+      )
+      AND (
+          bcs.status = '2'
+          OR EXISTS (
+              SELECT 1
+              FROM dbo.mydo_job ej
+              INNER JOIN dbo.mydo_job_detail ejd ON ej.job_id = ejd.job_id
+              WHERE ej.in_or_out >= 20
+                AND ej.status IN ('1', '2', '3')
+                AND ej.cargo_space_id = bs.cargo_space_id
+                AND ISNULL(ej.tray_code, '') = ISNULL(bs.tray_code, '')
+                AND ISNULL(ej.exit_id, '') = ISNULL(@v_exit_id, '')
+                AND ejd.in_or_out_id = @stockout_id
+                AND ejd.stock_id = bs.stock_id
+          )
+      )
       AND (@warehouse_id IS NULL OR @warehouse_id = '' OR bs.warehouse_id = @warehouse_id)
       AND (@locatio IS NULL OR bs.cargo_space_id = @locatio OR bcs.cargo_space_name = @locatio)
       AND (@preferred_stock_id IS NULL OR bs.stock_id = @preferred_stock_id)
@@ -490,9 +696,13 @@ BEGIN
         EXEC dbo.proc_out_hand_allocation
             @v_stockout_detail_id = @v_stockout_detail_id,
             @v_stock_id = @detail_id,
+            @v_exit_id = @v_exit_id,
             @v_result = @child_result OUTPUT,
             @v_resultString = @child_msg OUTPUT;
 
+        IF @child_result <> 10
+            SET @last_error = @child_msg;
+
         FETCH NEXT FROM cur_auto_stock INTO @detail_id;
     END
 
@@ -511,7 +721,7 @@ BEGIN
     ELSE
     BEGIN
         SET @v_result = 2;
-        SET @v_resultString = '自动分配库存不足';
+        SET @v_resultString = COALESCE(@last_error, '自动分配库存不足');
     END
 END
 GO
@@ -615,6 +825,19 @@ BEGIN
             WHERE detail_id = @stock_detail_id
               AND stock_id = @stock_id;
 
+            INSERT INTO dbo.bas_stock_detail_finish (
+                detail_id, stock_id, product_status, lot_no, product_id, product_name,
+                quantity, out_quantity, job_detail_id, stockin_detail_id, create_time,
+                update_time, remark, delete_time
+            )
+            SELECT detail_id, stock_id, product_status, lot_no, product_id, product_name,
+                   quantity, out_quantity, job_detail_id, stockin_detail_id, create_time,
+                   update_time, remark, SYSDATETIME() AS delete_time
+            FROM dbo.bas_stock_detail
+            WHERE detail_id = @stock_detail_id
+              AND stock_id = @stock_id
+              AND ISNULL(quantity, 0) <= 0;
+
             DELETE FROM dbo.bas_stock_detail
             WHERE detail_id = @stock_detail_id
               AND ISNULL(quantity, 0) <= 0;
@@ -664,19 +887,23 @@ BEGIN
                 ) bsa ON bsa.stock_id = bs.stock_id
                 WHERE bs.stock_id = @stock_id;
 
-                UPDATE dbo.bas_cargo_space
-                SET status = '2',
-                    locked = 'N',
-                    tray_code = @tray_code
-                WHERE cargo_space_id = @cargo_space_id;
             END
             ELSE
             BEGIN
-                UPDATE dbo.bas_cargo_space
-                SET status = '1',
-                    locked = 'N',
-                    tray_code = NULL
-                WHERE cargo_space_id = @cargo_space_id;
+                INSERT INTO dbo.bas_stock_finish (
+                    stock_id, cargo_space_id, stock_status, product_status, lot_no,
+                    in_date, back_date, product_id, product_name, quantity, job_id,
+                    job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id,
+                    in_type, warehouse_id, warehouse_name, user_id, user_name, dept_id,
+                    dept_name, supplier_id, supplier_name, delete_time
+                )
+                SELECT stock_id, cargo_space_id, stock_status, product_status, lot_no,
+                       in_date, back_date, product_id, product_name, quantity, job_id,
+                       job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id,
+                       in_type, warehouse_id, warehouse_name, user_id, user_name, dept_id,
+                       dept_name, supplier_id, supplier_name, SYSDATETIME() AS delete_time
+                FROM dbo.bas_stock
+                WHERE stock_id = @stock_id;
 
                 DELETE FROM dbo.bas_stock WHERE stock_id = @stock_id;
             END
@@ -848,7 +1075,6 @@ BEGIN
 
             UPDATE dbo.bas_cargo_space
             SET status = '2',
-                locked = 'N',
                 tray_code = @tray_code
             WHERE cargo_space_id = @cargo_space_id
               AND EXISTS (SELECT 1 FROM dbo.bas_stock WHERE stock_id = @stock_id);
diff --git a/sql/proc_hand_delete_in_job.sql b/sql/proc_hand_delete_in_job.sql
index 6899916..252a3bf 100644
--- a/sql/proc_hand_delete_in_job.sql
+++ b/sql/proc_hand_delete_in_job.sql
@@ -27,7 +27,7 @@ BEGIN
             @v_cargo_space_id = cargo_space_id
         FROM dbo.mydo_job
         WHERE job_id = @v_job_id
-          AND in_or_out = 1;
+          AND in_or_out < 20;
 
         IF @v_tray_code IS NULL AND @v_cargo_space_id IS NULL
         BEGIN
@@ -57,17 +57,16 @@ BEGIN
 
         UPDATE dbo.bas_cargo_space
         SET status = '1',
-            locked = 'N',
             tray_code = NULL
         WHERE cargo_space_id = @v_cargo_space_id
-           OR (tray_code = @v_tray_code AND status = '3' AND locked = 'Y');
+           OR (tray_code = @v_tray_code AND status = '3');
 
         DELETE FROM dbo.mydo_job_detail
         WHERE job_id = @v_job_id;
 
         DELETE FROM dbo.mydo_job
         WHERE job_id = @v_job_id
-          AND in_or_out = 1;
+          AND in_or_out < 20;
 
         COMMIT TRANSACTION;
 
diff --git a/sql/search_statistics.sql b/sql/search_statistics.sql
new file mode 100644
index 0000000..d7e71d3
--- /dev/null
+++ b/sql/search_statistics.sql
@@ -0,0 +1,341 @@
+-- 查询统计菜单与库存异常字典补丁
+-- 目标库：FTC25009-WMS
+
+SET NOCOUNT ON;
+
+IF EXISTS (SELECT 1 FROM dbo.sys_dict_data WHERE dict_type = N'bas_stock_stock_status' AND dict_value = N'3')
+BEGIN
+    UPDATE dbo.sys_dict_data
+       SET dict_label = N'异常',
+           dict_sort = 2,
+           list_class = N'danger',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE dict_type = N'bas_stock_stock_status'
+       AND dict_value = N'3';
+END
+ELSE
+BEGIN
+    INSERT INTO dbo.sys_dict_data (dict_sort, dict_label, dict_value, dict_type, list_class, is_default, status, create_by, create_time)
+    VALUES (2, N'异常', N'3', N'bas_stock_stock_status', N'danger', N'N', N'0', N'admin', GETDATE());
+END
+
+DECLARE @parentMenuId bigint = 2007;
+DECLARE @menuIdIsIdentity bit = COLUMNPROPERTY(OBJECT_ID(N'dbo.sys_menu'), 'menu_id', 'IsIdentity');
+DECLARE @menuId bigint;
+DECLARE @baseMenuId bigint;
+
+IF @menuIdIsIdentity = 1
+    SET IDENTITY_INSERT dbo.sys_menu ON;
+
+-- 库存明细查询
+SET @baseMenuId = 2200;
+SELECT TOP 1 @menuId = menu_id
+FROM dbo.sys_menu
+WHERE menu_type = N'C'
+  AND (path = N'stockDetail' OR component = N'search/stockDetail/index')
+ORDER BY menu_id;
+IF @menuId IS NULL
+BEGIN
+    SET @menuId = @baseMenuId;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+        SET @menuId = @menuId + 1;
+END
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @menuId, N'库存明细查询', @parentMenuId, 1, N'stockDetail', N'search/stockDetail/index', NULL, N'',
+        1, 0, N'C', N'0', N'0', N'bas:stock:list', N'document',
+        N'admin', GETDATE(), N'', NULL, N'查询统计-库存明细查询'
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'库存明细查询',
+           parent_id = @parentMenuId,
+           order_num = 1,
+           path = N'stockDetail',
+           component = N'search/stockDetail/index',
+           perms = N'bas:stock:list',
+           icon = N'document',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @menuId;
+END
+
+-- 入库单据历史查询
+SET @menuId = NULL;
+SET @baseMenuId = 2201;
+SELECT TOP 1 @menuId = menu_id
+FROM dbo.sys_menu
+WHERE menu_type = N'C'
+  AND (path = N'inStockinHistory' OR component = N'search/inStockinHistory/index')
+ORDER BY menu_id;
+IF @menuId IS NULL
+BEGIN
+    SET @menuId = @baseMenuId;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+        SET @menuId = @menuId + 1;
+END
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @menuId, N'入库单据历史查询', @parentMenuId, 2, N'inStockinHistory', N'search/inStockinHistory/index', NULL, N'',
+        1, 0, N'C', N'0', N'0', N'in:stockin:list', N'list',
+        N'admin', GETDATE(), N'', NULL, N'查询统计-入库单据历史查询'
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'入库单据历史查询',
+           parent_id = @parentMenuId,
+           order_num = 2,
+           path = N'inStockinHistory',
+           component = N'search/inStockinHistory/index',
+           perms = N'in:stockin:list',
+           icon = N'list',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @menuId;
+END
+
+-- 出库单历史查询
+SET @menuId = NULL;
+SET @baseMenuId = 2202;
+SELECT TOP 1 @menuId = menu_id
+FROM dbo.sys_menu
+WHERE menu_type = N'C'
+  AND (path = N'outStockoutHistory' OR component = N'search/outStockoutHistory/index')
+ORDER BY menu_id;
+IF @menuId IS NULL
+BEGIN
+    SET @menuId = @baseMenuId;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+        SET @menuId = @menuId + 1;
+END
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @menuId, N'出库单历史查询', @parentMenuId, 3, N'outStockoutHistory', N'search/outStockoutHistory/index', NULL, N'',
+        1, 0, N'C', N'0', N'0', N'out:stockout:list', N'document-copy',
+        N'admin', GETDATE(), N'', NULL, N'查询统计-出库单历史查询'
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'出库单历史查询',
+           parent_id = @parentMenuId,
+           order_num = 3,
+           path = N'outStockoutHistory',
+           component = N'search/outStockoutHistory/index',
+           perms = N'out:stockout:list',
+           icon = N'document-copy',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @menuId;
+END
+
+-- 入库流水查询
+SET @menuId = NULL;
+SET @baseMenuId = 2203;
+SELECT TOP 1 @menuId = menu_id
+FROM dbo.sys_menu
+WHERE menu_type = N'C'
+  AND (path = N'inJobFlow' OR component = N'search/inJobFlow/index')
+ORDER BY menu_id;
+IF @menuId IS NULL
+BEGIN
+    SET @menuId = @baseMenuId;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+        SET @menuId = @menuId + 1;
+END
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @menuId, N'入库流水查询', @parentMenuId, 4, N'inJobFlow', N'search/inJobFlow/index', NULL, N'',
+        1, 0, N'C', N'0', N'0', N'in:job:list', N'receiving',
+        N'admin', GETDATE(), N'', NULL, N'查询统计-入库流水查询'
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'入库流水查询',
+           parent_id = @parentMenuId,
+           order_num = 4,
+           path = N'inJobFlow',
+           component = N'search/inJobFlow/index',
+           perms = N'in:job:list',
+           icon = N'receiving',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @menuId;
+END
+
+-- 出库流水查询
+SET @menuId = NULL;
+SET @baseMenuId = 2204;
+SELECT TOP 1 @menuId = menu_id
+FROM dbo.sys_menu
+WHERE menu_type = N'C'
+  AND (path = N'outJobFlow' OR component = N'search/outJobFlow/index')
+ORDER BY menu_id;
+IF @menuId IS NULL
+BEGIN
+    SET @menuId = @baseMenuId;
+    WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+        SET @menuId = @menuId + 1;
+END
+IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @menuId)
+BEGIN
+    INSERT INTO dbo.sys_menu (
+        menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+        is_frame, is_cache, menu_type, visible, status, perms, icon,
+        create_by, create_time, update_by, update_time, remark
+    )
+    VALUES (
+        @menuId, N'出库流水查询', @parentMenuId, 5, N'outJobFlow', N'search/outJobFlow/index', NULL, N'',
+        1, 0, N'C', N'0', N'0', N'out:job:list', N'release',
+        N'admin', GETDATE(), N'', NULL, N'查询统计-出库流水查询'
+    );
+END
+ELSE
+BEGIN
+    UPDATE dbo.sys_menu
+       SET menu_name = N'出库流水查询',
+           parent_id = @parentMenuId,
+           order_num = 5,
+           path = N'outJobFlow',
+           component = N'search/outJobFlow/index',
+           perms = N'out:job:list',
+           icon = N'release',
+           visible = N'0',
+           status = N'0',
+           update_by = N'admin',
+           update_time = GETDATE()
+     WHERE menu_id = @menuId;
+END
+
+DECLARE @exportButton table(
+    menu_name nvarchar(50),
+    parent_path nvarchar(100),
+    parent_component nvarchar(200),
+    perms nvarchar(100)
+);
+DECLARE @buttonMenuId bigint;
+DECLARE @buttonMenuName nvarchar(50);
+DECLARE @buttonParentPath nvarchar(100);
+DECLARE @buttonParentComponent nvarchar(200);
+DECLARE @buttonPerms nvarchar(100);
+
+INSERT INTO @exportButton(menu_name, parent_path, parent_component, perms)
+VALUES
+    (N'库存明细查询导出', N'stockDetail', N'search/stockDetail/index', N'bas:stock:export'),
+    (N'入库单据历史查询导出', N'inStockinHistory', N'search/inStockinHistory/index', N'in:stockin:export'),
+    (N'出库单历史查询导出', N'outStockoutHistory', N'search/outStockoutHistory/index', N'out:stockout:export'),
+    (N'入库流水查询导出', N'inJobFlow', N'search/inJobFlow/index', N'in:job:export'),
+    (N'出库流水查询导出', N'outJobFlow', N'search/outJobFlow/index', N'out:job:export');
+
+DECLARE export_button_cursor CURSOR LOCAL FAST_FORWARD FOR
+SELECT menu_name, parent_path, parent_component, perms
+FROM @exportButton;
+
+OPEN export_button_cursor;
+FETCH NEXT FROM export_button_cursor INTO @buttonMenuName, @buttonParentPath, @buttonParentComponent, @buttonPerms;
+WHILE @@FETCH_STATUS = 0
+BEGIN
+    SET @menuId = NULL;
+    SELECT TOP 1 @menuId = menu_id
+    FROM dbo.sys_menu
+    WHERE menu_type = N'C'
+      AND (path = @buttonParentPath OR component = @buttonParentComponent)
+    ORDER BY menu_id;
+
+    IF @menuId IS NOT NULL
+    BEGIN
+        SET @buttonMenuId = NULL;
+        SELECT TOP 1 @buttonMenuId = menu_id
+        FROM dbo.sys_menu
+        WHERE parent_id = @menuId
+          AND menu_type = N'F'
+          AND perms = @buttonPerms
+        ORDER BY menu_id;
+
+        IF @buttonMenuId IS NULL
+        BEGIN
+            SET @buttonMenuId = @menuId + 100;
+            WHILE EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @buttonMenuId)
+                SET @buttonMenuId = @buttonMenuId + 1;
+        END
+
+        IF NOT EXISTS (SELECT 1 FROM dbo.sys_menu WHERE menu_id = @buttonMenuId)
+        BEGIN
+            INSERT INTO dbo.sys_menu (
+                menu_id, menu_name, parent_id, order_num, path, component, query, route_name,
+                is_frame, is_cache, menu_type, visible, status, perms, icon,
+                create_by, create_time, update_by, update_time, remark
+            )
+            VALUES (
+                @buttonMenuId, @buttonMenuName, @menuId, 1, N'#', N'', NULL, N'',
+                1, 0, N'F', N'0', N'0', @buttonPerms, N'#',
+                N'admin', GETDATE(), N'', NULL, N''
+            );
+        END
+        ELSE
+        BEGIN
+            UPDATE dbo.sys_menu
+               SET menu_name = @buttonMenuName,
+                   parent_id = @menuId,
+                   order_num = 1,
+                   path = N'#',
+                   component = N'',
+                   perms = @buttonPerms,
+                   icon = N'#',
+                   visible = N'0',
+                   status = N'0',
+                   update_by = N'admin',
+                   update_time = GETDATE()
+             WHERE menu_id = @buttonMenuId;
+        END
+    END
+
+    FETCH NEXT FROM export_button_cursor INTO @buttonMenuName, @buttonParentPath, @buttonParentComponent, @buttonPerms;
+END
+CLOSE export_button_cursor;
+DEALLOCATE export_button_cursor;
+
+IF @menuIdIsIdentity = 1
+    SET IDENTITY_INSERT dbo.sys_menu OFF;
+GO
diff --git a/sql/wms.sql b/sql/wms.sql
index bc9f10c..d03dd05 100644
--- a/sql/wms.sql
+++ b/sql/wms.sql
@@ -12249,8 +12249,7 @@ BEGIN
         UPDATE bas_cargo_space
         SET 
             status = '2',
-            tray_code = @tray_code,
-            locked = 'N'
+            tray_code = @tray_code
         WHERE cargo_space_id = @cargo_space_id;
 
         -- =============================================
diff --git a/tmp-tool-check.txt b/tmp-tool-check.txt
new file mode 100644
index 0000000..c5d0b1c
--- /dev/null
+++ b/tmp-tool-check.txt
@@ -0,0 +1 @@
+tool check