diff --git a/src/api/production/production-inbound.js b/src/api/production/production-inbound.js
new file mode 100644
index 0000000..00334f4
--- /dev/null
+++ b/src/api/production/production-inbound.js
@@ -0,0 +1,22 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 查询处理单元列表
+export const getOrderInfo = data => createAPI(`/production/inbound/getOrderInfo`,'post',data)
+// 创建包装箱
+export const createPackage = data => createAPI(`/production/inbound/createPackage`,'post',data)
+// 打印箱标签
+export const printPackageLabel = data => createAPI(`/production/inbound/printPackageLabel`,'post',data)
+// 装托盘
+export const packToPallet = data => createAPI(`/production/inbound/packToPallet`,'post',data)
+// 扫描包装箱获取信息
+export const scanPackage = data => createAPI(`/production/inbound/scanPackage`,'post',data)
+// 根据包装编码获取包装信息
+export const getPackageInfo = data => createAPI(`/production/inbound/getPackageInfo`,'post',data)
+// 入库登记
+export const inboundRegister = data => createAPI(`/production/inbound/inboundRegister`,'post',data)
+// 查询入库记录
+export const getInboundRecords = data => createAPI(`/production/inbound/getInboundRecords`,'post',data)
+// 生产订单退库
+export const returnStock = data => createAPI(`/production/inbound/returnStock`,'post',data)
+// 扫描单元获取退库信息
+export const scanUnitForReturn = data => createAPI(`/production/inbound/scanUnitForReturn`,'post',data)
diff --git a/src/api/sales-return/sales-return.js b/src/api/sales-return/sales-return.js
new file mode 100644
index 0000000..44cce88
--- /dev/null
+++ b/src/api/sales-return/sales-return.js
@@ -0,0 +1,9 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+
+// 获取采购单信息
+export const processReturn = data => createAPI(`salesreturn/processReturn`,'post',data)
+
+// 接收采购单信息
+export const getRmaList = data => createAPI(`salesreturn/getRmaList`,'post',data)
+
diff --git a/src/i18n/locales/cn.js b/src/i18n/locales/cn.js
index 0ff9a57..4b80b92 100644
--- a/src/i18n/locales/cn.js
+++ b/src/i18n/locales/cn.js
@@ -12,7 +12,8 @@ export default {
     logout: "退出",
     locale: "语言",
     stockIn : "采购入库",
-    greeting: "{name}!"
+    greeting: "{name}!",
+    pdaName:"仓储PDA系统"
   },
   button: {
     login: "登录"
diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.js
index a75a73e..d3a5cf0 100644
--- a/src/i18n/locales/en.js
+++ b/src/i18n/locales/en.js
@@ -12,7 +12,8 @@ export default {
     logout:  "Logout",
     locale:  "Language",
     stockIn:  "Stock In",
-    greeting: "{name}!"  // 支持动态插值
+    greeting: "{name}!" ,
+    pdaName:"Storage PDA System"
   },
   button: {
     login: "Login"
diff --git a/src/router/index.js b/src/router/index.js
index 4f313a3..1b361a1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -39,10 +39,8 @@ const globalRoutes = [
     name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-issue/pick.vue"], resolve),
     meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   // 生产入库
-  {path: "/productionInbound",name: "productionwhse", component: resolve => require(["@/views/modules/production-inbound/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
-  {path: '/production-inbound/receive/:orderNo',
-    name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-inbound/receive.vue"], resolve),
-    meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/productionInbound",name: "productionInbound", component: resolve => require(["@/views/modules/production-inbound/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+
   // 委外
   {path: "/outsource",name: "outsource", component: resolve => require(["@/views/modules/outsourcing-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 
@@ -51,6 +49,8 @@ const globalRoutes = [
 
   // 销售退货
   {path: "/salereturn",name: "salereturn", component: resolve => require(["@/views/modules/sales-return/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/salereturn-inbound",name: "salereturn-inbound", component: resolve => require(["@/views/modules/sales-return/sales-return-inbound.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/salereturn-scrap",name: "salereturn-scrap", component: resolve => require(["@/views/modules/sales-return/sales-return-scrap.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 
   // 其他出入库
   {path: "/otherinout",name: "otherinout", component: resolve => require(["@/views/modules/other-transaction/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index eac7323..c575498 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -1,51 +1,69 @@
-
 <template>
   <div class="pda-login">
     <div class="login-card">
+      <!-- 语言切换 -->
+      <div class="lang-switch">
+        <el-dropdown trigger="click">
+          <span class="lang-text">
+            {{ $t('home.locale') }}<i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="lang in languageList"
+              :key="lang.languageCode"
+              @click.native="switch_the_language(lang.languageCode)"
+            >
+              {{ lang.languageName }}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+
       <div class="logo-area">
         <svg viewBox="0 0 48 48">
           <path fill="#2196F3" d="M24 6L6 24l18 18 18-18z"/>
           <path fill="#1976D2" d="M24 6v36l18-18z"/>
         </svg>
-        <h1>Storage PDA system</h1>
+        <h1>{{ $t('home.pdaName') }}</h1>
       </div>
 
       <el-form class="login-form" @keyup.enter.native="dataFormSubmit()">
+        <!-- 用户名 -->
         <div class="input-group" :class="{focus: usernameFocus}">
-
-          <input placeholder="username"
+          <input placeholder="Username"
                  type="text"
-            v-model="dataForm.userName"
-            @focus="usernameFocus=true"
-            @blur="usernameFocus=false"
-            required
-          >
+                 v-model="dataForm.userName"
+                 @focus="usernameFocus=true"
+                 @blur="handleUsernameBlur"
+                 required />
         </div>
 
+        <!-- 密码 -->
         <div class="input-group" :class="{focus: passwordFocus}">
-
-          <input placeholder="password"
-                 :type="showPassword?'text':'password'"
-            v-model="dataForm.password"
-            @focus="passwordFocus=true"
-            @blur="passwordFocus=false"
-            required
-          >
-          <button
-            type="button"
-            class="pwd-toggle"
-            @click="showPassword=!showPassword"
-          >
-            {{ showPassword ? 'hide' : 'view' }}
-          </button>
+          <input placeholder="Password"
+                 :type="showPassword ? 'text' : 'password'"
+                 v-model="dataForm.password"
+                 @focus="passwordFocus=true"
+                 @blur="passwordFocus=false"
+                 required />
         </div>
 
-        <button
-          type="submit"
-          class="login-btn"
-          :disabled="loading"
-          @click.prevent="dataFormSubmit"
-        >
+        <!-- 工厂下拉框（site） -->
+        <el-select
+          v-if="siteList.length"
+          v-model="selectedSite"
+          placeholder="请选择工厂"
+          style="width: 100%; margin-bottom: 1.5rem"
+          :popper-append-to-body="false">
+          <el-option
+            v-for="item in siteList"
+            :key="item.siteCode"
+            :label="item.siteName"
+            :value="item.siteCode" />
+        </el-select>
+
+        <!-- 登录按钮 -->
+        <button type="submit" class="login-btn" :disabled="loading" @click.prevent="dataFormSubmit">
           <span v-if="!loading">Login</span>
           <span v-else class="loading-dots">•••</span>
         </button>
@@ -54,131 +72,69 @@
   </div>
 </template>
 
+
 <script>
 export default {
   data() {
     return {
-      form: { username: '', password: '' },
-      usernameFocus: false,
-      passwordFocus: false,
-      showPassword: false,
-      loading: false,
-      src: 'http://127.0.0.1/upload/ifs.png',
       dataForm: {
         userName: '',
         password: '',
-        uuid: '',
-        captcha: ''
-      },
-      dataRule: {
-        userName: [
-          { required: true, message: '帐号不能为空', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: '密码不能为空', trigger: 'blur' }
-        ]
-      },
-      captchaPath: ''
-    }
-  },
-  computed: {
-    multiLanguage: {
-      get() {
-        return this.$store.state.user.multiLanguage
-      },
-      set(val) {
-        this.$store.commit('user/updateMultiLanguage', val)
-      }
-    },
-    authControl: {
-      get() {
-        return this.$store.state.user.authControl
+        uuid: ''
       },
-      set(val) {
-        this.$store.commit('user/updateAuthControl', val)
-      }
-    }
-  },
-  mounted() {
-    // 仅当 redirectPath 为空时设置
-    const redirectPath = this.$route.query.redirect || '/home';
-    if (!localStorage.getItem('redirectPath')) {
-      localStorage.setItem('redirectPath', redirectPath);
-    }
-  },
-  created () {
-    this.userName();
-    // 如果 redirectPath 已经存在，不要覆盖它
-    const currentPath = localStorage.getItem('redirectPath');
-    if (!currentPath) {
-      localStorage.setItem('redirectPath', this.$route.fullPath);
-    }
+      usernameFocus: false,
+      passwordFocus: false,
+      showPassword: false,
+      loading: false,
+      siteList: [{ "siteCode": "1", "siteName": "南京工厂" },
+        { "siteCode": "2", "siteName": "苏州工厂" }],
+      languageList: [
+        { languageName: '中文', languageCode: 'cn' },
+        { languageName: 'English', languageCode: 'en' }
+      ],
+      selectedSite: ''
+    };
   },
   methods: {
-    // 获取上次登陆的用户名
-    userName(){
-      this.dataForm.userName = localStorage.getItem('userName')
+    switch_the_language(val) {
+      localStorage.setItem('locale', val)
+      this.$i18n.locale = val; // 修改当前语言
+      location.reload()
     },
-    // 提交表单
-    dataFormSubmit () {
-          this.$http({
-            url: this.$http.adornUrl('/sys/login'),
-            method: 'post',
-            data: this.$http.adornData({
-              'username': this.dataForm.userName,
-              'password': this.dataForm.password,
-              'uuid': this.dataForm.uuid
-            })
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              console.log('跳转前路径:', localStorage.getItem('redirectPath')); // 检查路径是否正确
-              this.$cookie.set('token', data.token)
-              // 动态跳转逻辑
-              const redirectPath = localStorage.getItem('redirectPath') || '';
+    handleUsernameBlur() {
 
-              // 设置需要判断的路径
-              const pathsToRedirect = ['/auth-authQuote', '/auth-authInquiry'];
-
-              if (pathsToRedirect.some(path => redirectPath.indexOf(path) !== -1)) {
-                this.$router.replace(redirectPath);
-              } else {
-                this.$router.replace({ name: 'home' });
-              }
-              console.log('Redirecting to:', redirectPath); // 调试输出
-              this.$i18n.locale=data.language
-              localStorage.setItem('locale', data.language)
-              this.$i18n.locale = data.language; // 修改当前语言
-              localStorage.setItem('refresh', "0")
-              localStorage.setItem('userName', this.dataForm.userName)
-              //this.getConfigParams()
-            } else {
-              this.$alert("用户名或密码错误", '错误', {
-                confirmButtonText: '确定'
-              })
-              //this.$message.error("用户名或密码错误")
-            }
-          })
     },
-
-    // 获取全局参数变量
-    getConfigParams() {
-      getConfigParams().then(({data}) => {
-        if (data && data.code == 0) {
-          localStorage.setItem('configParams', JSON.stringify(data.data))
-          // this.multiLanguage = JSON.parse(localStorage.getItem('configParams')).multiLanguage
-          // this.authControl = JSON.parse(localStorage.getItem('configParams')).authControl
+    dataFormSubmit() {
+      if (!this.selectedSite) {
+        this.$message.error('请选择工厂');
+        return;
+      }
+      this.loading = true;
+      this.$http({
+        url: this.$http.adornUrl('/sys/login'),
+        method: 'post',
+        data: this.$http.adornData({
+          username: this.dataForm.userName,
+          password: this.dataForm.password,
+          uuid: this.dataForm.uuid,
+          site: this.selectedSite
+        })
+      }).then(({ data }) => {
+        this.loading = false;
+        if (data && data.code === 0) {
+          this.$cookie.set('token', data.token);
+          localStorage.setItem('userName', this.dataForm.userName);
+          localStorage.setItem('site', this.selectedSite);
+          this.$router.replace({ name: 'home' });
+        } else {
+          this.$alert("用户名或密码错误", '错误', {
+            confirmButtonText: '确定'
+          });
         }
-      })
-    },
-    handleSubmit() {
-      this.loading = true
-      // 模拟API请求
-      setTimeout(() => {
-        this.$router.push('/dashboard')
-        this.loading = false
-      }, 1500)
+      });
     }
   }
+
 }
 </script>
 
@@ -188,34 +144,43 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: #f0f2f5;
+  background: linear-gradient(to right, #e0f7fa, #f1f8e9);
+  font-family: 'Segoe UI', sans-serif;
 }
 
 .login-card {
+  position: relative;
   width: 90%;
   max-width: 400px;
   padding: 2rem;
   background: white;
-  border-radius: 12px;
-  box-shadow: 0 4px 20px rgba(0,0,0,0.08);
+  border-radius: 16px;
+  box-shadow: 0 6px 24px rgba(0, 0, 0, 0.1);
+}
+
+.lang-switch {
+  position: absolute;
+  top: 18px;
+  right: 20px;
+}
+
+.lang-text {
+  cursor: pointer;
+  font-size: 14px;
+  color: #1890ff;
 }
 
 .logo-area {
   text-align: center;
-  margin-bottom: 2rem;
+  margin-bottom: 1.5rem;
 }
+
 .logo-area svg {
   width: 64px;
   height: 64px;
   filter: drop-shadow(0 2px 4px rgba(33, 150, 243, 0.3));
 }
 
-.logo-icon {
-  width: 60px;
-  height: 60px;
-  fill: #1890ff;
-}
-
 h1 {
   color: #333;
   font-size: 1.5rem;
@@ -224,35 +189,26 @@ h1 {
 
 .input-group {
   position: relative;
-  margin-bottom: 1.5rem;
-  border-bottom: 1px solid #ddd;
-  transition: all 0.3s;
+  margin-bottom: 1.2rem;
+  border-bottom: 1px solid #ccc;
+  transition: all 0.3s ease;
 }
 
 .input-group.focus {
   border-color: #1890ff;
 }
 
-.input-group label {
-  position: absolute;
-  left: 0;
-  top: 8px;
-  color: #999;
-  transition: all 0.3s;
-}
-
-.input-group.focus label {
-  top: -18px;
-  font-size: 12px;
-  color: #1890ff;
-}
-
 .input-group input {
   width: 100%;
-  padding: 8px 0;
+  padding: 10px 0;
   border: none;
   outline: none;
-  font-size: 16px;
+  font-size: 15px;
+}
+
+.input-group.site-select {
+  border: none;
+  padding-top: 8px;
 }
 
 .pwd-toggle {
@@ -264,6 +220,7 @@ h1 {
   border: none;
   color: #1890ff;
   font-size: 12px;
+  cursor: pointer;
 }
 
 .login-btn {
@@ -272,19 +229,23 @@ h1 {
   background: #1890ff;
   color: white;
   border: none;
-  border-radius: 6px;
+  border-radius: 8px;
   font-size: 16px;
-  margin-top: 1rem;
+  margin-top: 1.2rem;
   transition: all 0.3s;
 }
 
+.login-btn:hover {
+  background: #40a9ff;
+}
+
 .login-btn:disabled {
-  background: #bae7ff;
+  background: #a0d4ff;
 }
 
 .loading-dots {
   letter-spacing: 2px;
-  animation: blink 1.5s infinite;
+  animation: blink 1.2s infinite;
 }
 
 @keyframes blink {
diff --git a/src/views/main.vue b/src/views/main.vue
index 910834e..f46efa7 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -12,7 +12,11 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-      <div class="logout-button" @click="logoutHandle()">{{ $t('home.logout') }}</div>
+      <div class="logout-button" @click="logoutHandle()">
+        <i class="el-icon-close"></i>
+        <span class="logout-text">{{ $t('home.logout') }}</span>
+      </div>
+
     </div>
 
     <!-- 功能菜单 -->
@@ -140,7 +144,7 @@ export default {
   flex-direction: column;
   background: #f5f5f5;
   font-family: 'Arial', sans-serif;
-  overflow: auto;
+  overflow-y: auto;
 }
 
 .status-bar {
@@ -157,19 +161,55 @@ export default {
 }
 
 .logout-button {
-  color: #ffffff;
+  background: linear-gradient(135deg, #ff4d4f, #ff7875);
+  color: #fff;
   font-size: 15px;
-  padding: 5px 10px;
-  background: #ff4d4f;
-  border-radius: 5px;
+  font-weight: bold;
+  padding: 6px 16px;
+  border-radius: 20px;
   cursor: pointer;
-  transition: background 0.3s;
+  box-shadow: 0 2px 6px rgba(255, 77, 79, 0.4);
+  transition: all 0.3s ease;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  height: 44px; /* 保证可点击性 */
 }
 
 .logout-button:hover {
-  background: #ff7875;
+  background: linear-gradient(135deg, #ff7875, #ff9c91);
+  box-shadow: 0 4px 12px rgba(255, 77, 79, 0.5);
+  transform: scale(1.05);
+}
+
+.logout-button i {
+  font-size: 18px;
+  margin-right: 8px;
+  display: flex;
+  align-items: center;
 }
 
+.logout-text {
+  display: inline-block;
+  line-height: 1;
+}
+
+/* === 小屏优化 === */
+@media screen and (max-width: 480px) {
+  .logout-button {
+    font-size: 13px;
+    padding: 4px 12px;
+    border-radius: 16px;
+    height: 40px;
+  }
+
+  .logout-button i {
+    font-size: 16px;
+    margin-right: 6px;
+  }
+}
+
+
 .menu-grid {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
diff --git a/src/views/modules/production-inbound/index.vue b/src/views/modules/production-inbound/index.vue
index e3dfde1..615268f 100644
--- a/src/views/modules/production-inbound/index.vue
+++ b/src/views/modules/production-inbound/index.vue
@@ -1,281 +1,1361 @@
 <template>
-  <div class="production-inbound-container">
+  <div class="production-inbound-pda">
     <van-nav-bar title="生产入库" left-arrow @click-left="$router.back()" />
-    
-    <!-- 搜索栏 -->
-    <div class="search-section">
-      <van-search
-        v-model="searchValue"
-        placeholder="请输入生产订单号"
-        @search="handleSearch"
-        @clear="handleClear"
-      />
-    </div>
 
-    <!-- 状态筛选 -->
-    <div class="filter-section">
-      <van-tabs v-model="activeTab" @change="handleTabChange">
-        <van-tab title="全部" name="all" />
-        <van-tab title="待入库" name="0" />
-        <van-tab title="部分入库" name="1" />
-        <van-tab title="已完成" name="2" />
-      </van-tabs>
+    <!-- 功能选择 -->
+    <div class="function-selector" v-if="!selectedFunction">
+      <div class="function-card" @click="selectFunction('package')">
+        <div class="function-icon">📦</div>
+        <div class="function-title">包装创建</div>
+        <div class="function-desc">扫描通知单，创建生产入库包装</div>
+      </div>
+
+      <div class="function-card" @click="selectFunction('pallet')">
+        <div class="function-icon">🏗️</div>
+        <div class="function-title">装托盘</div>
+        <div class="function-desc">扫描包装，装载到托盘</div>
+      </div>
+
+      <div class="function-card" @click="selectFunction('register')">
+        <div class="function-icon">📋</div>
+        <div class="function-title">入库登记</div>
+        <div class="function-desc">扫描包装，完成入库登记</div>
+      </div>
+
+      <div class="function-card" @click="selectFunction('return')">
+        <div class="function-icon">↩️</div>
+        <div class="function-title">退库操作</div>
+        <div class="function-desc">扫描单元，执行退库操作</div>
+      </div>
     </div>
 
-    <!-- 生产订单列表 -->
-    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
-      >
-        <div
-          v-for="item in orderList"
-          :key="item.id"
-          class="order-item"
-          @click="handleOrderClick(item)"
-        >
-          <div class="order-header">
-            <div class="order-no">{{ item.orderNo }}</div>
-            <div class="order-status" :class="getStatusClass(item.status)">
-              {{ getStatusText(item.status) }}
-            </div>
+    <!-- 包装创建 -->
+    <div class="package-create" v-if="selectedFunction === 'package'">
+      <div class="pda-header">
+        <button class="back-btn" @click="goBack">← 返回</button>
+        <h2>包装创建</h2>
+      </div>
+
+      <!-- 通知单输入 -->
+      <div class="input-section" v-if="!notifyInfo.notifyNo">
+        <div class="input-group">
+          <label>通知单号</label>
+          <div class="input-with-scan">
+            <input
+              v-model="packageForm.notifyNo"
+              placeholder="请输入或扫描通知单号"
+              @keyup.enter="loadNotifyInfo"
+            />
+            <button @click="loadNotifyInfo" class="scan-btn">确认</button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 通知单信息 -->
+      <div class="notify-info" v-if="notifyInfo.notifyNo">
+        <div class="section-header">
+          <h3>通知单信息</h3>
+          <button @click="resetNotify" class="reset-btn">重新选择</button>
+        </div>
+        <div class="info-card">
+          <div class="info-row">
+            <span class="label">通知单号:</span>
+            <span class="value">{{ notifyInfo.notifyNo }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">站点:</span>
+            <span class="value">{{ notifyInfo.site }}</span>
           </div>
-          <div class="order-info">
-            <div class="info-row">
-              <span class="label">产品编码：</span>
-              <span class="value">{{ item.productCode }}</span>
+          <div class="info-row">
+            <span class="label">申请人:</span>
+            <span class="value">{{ notifyInfo.userName }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">状态:</span>
+            <span class="value">{{ notifyInfo.status }}</span>
+          </div>
+        </div>
+
+        <!-- 物料清单 -->
+        <div class="materials-section" v-if="materialList.length">
+          <div class="section-header">
+            <h4>物料清单</h4>
+          </div>
+          <div class="material-list">
+            <div v-for="material in materialList" :key="material.partNo" class="material-item">
+              <div class="material-info">
+                <div class="part-no">{{ material.partNo }}</div>
+                <div class="part-desc">{{ material.partDesc }}</div>
+                <div class="qty-info">
+                  需求: {{ material.requireQty }} |
+                  已入库: {{ material.inboundQty }} |
+                  待入库: {{ material.pendingQty }}
+                </div>
+              </div>
             </div>
-            <div class="info-row">
-              <span class="label">产品名称：</span>
-              <span class="value">{{ item.productName }}</span>
+          </div>
+        </div>
+
+        <!-- 包装创建表单 -->
+        <div class="create-form">
+          <div class="section-header">
+            <h4>创建包装</h4>
+          </div>
+          <div class="input-group">
+            <label>物料编码</label>
+            <input v-model="packageForm.partNo" placeholder="请输入物料编码" />
+          </div>
+          <div class="input-group">
+            <label>包装数量</label>
+            <input v-model="packageForm.qty" type="number" placeholder="请输入包装数量" />
+          </div>
+          <div class="input-group">
+            <label>批次号</label>
+            <input v-model="packageForm.batchNo" placeholder="请输入批次号（可选）" />
+          </div>
+          <button @click="createPackage" class="confirm-btn" :disabled="!packageForm.partNo || !packageForm.qty">
+            创建包装
+          </button>
+        </div>
+
+        <!-- 已创建包装列表 -->
+        <div class="created-packages" v-if="createdPackages.length">
+          <div class="section-header">
+            <h4>已创建包装 ({{ createdPackages.length }})</h4>
+          </div>
+          <div class="package-list">
+            <div v-for="pkg in createdPackages" :key="pkg.unitId" class="package-item">
+              <div class="package-info">
+                <div class="unit-id">{{ pkg.unitId }}</div>
+                <div class="part-info">{{ pkg.partNo }} - {{ pkg.partDesc }}</div>
+                <div class="qty-info">数量: {{ pkg.qty }}</div>
+              </div>
+              <div class="package-actions">
+                <button @click="printLabel(pkg)" class="print-btn">打印</button>
+              </div>
             </div>
-            <div class="info-row">
-              <span class="label">计划数量：</span>
-              <span class="value">{{ item.planQuantity }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 装托盘 -->
+    <div class="pallet-pack" v-if="selectedFunction === 'pallet'">
+      <div class="pda-header">
+        <button class="back-btn" @click="goBack">← 返回</button>
+        <h2>装托盘</h2>
+      </div>
+
+      <!-- 托盘输入 -->
+      <div class="input-section">
+        <div class="input-group">
+          <label>托盘编码</label>
+          <div class="input-with-scan">
+            <input
+              v-model="palletForm.palletUnitId"
+              placeholder="请扫描托盘编码"
+            />
+            <button @click="scanPallet" class="scan-btn">扫描</button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 包装扫描 -->
+      <div class="scan-section">
+        <div class="section-header">
+          <h3>扫描包装</h3>
+        </div>
+        <div class="input-group">
+          <label>包装编码</label>
+          <div class="input-with-scan">
+            <input
+              v-model="scannedPackageId"
+              placeholder="请扫描包装编码"
+              @keyup.enter="scanPackageForPallet"
+            />
+            <button @click="scanPackageForPallet" class="scan-btn">扫描</button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 已扫描包装列表 -->
+      <div class="scanned-packages" v-if="scannedPackages.length">
+        <div class="section-header">
+          <h4>已扫描包装 ({{ scannedPackages.length }})</h4>
+        </div>
+        <div class="package-list">
+          <div v-for="(pkg, index) in scannedPackages" :key="pkg.unitId" class="package-item">
+            <div class="package-info">
+              <div class="unit-id">{{ pkg.unitId }}</div>
+              <div class="part-info">{{ pkg.partNo }} - {{ pkg.partDesc }}</div>
+              <div class="qty-info">数量: {{ pkg.qty }}</div>
             </div>
-            <div class="info-row">
-              <span class="label">已完工：</span>
-              <span class="value">{{ item.completedQuantity }}</span>
+            <div class="package-actions">
+              <button @click="removePackage(index)" class="remove-btn">移除</button>
             </div>
-            <div class="info-row">
-              <span class="label">已入库：</span>
-              <span class="value">{{ item.inboundQuantity }}</span>
+          </div>
+        </div>
+
+        <button @click="confirmPackToPallet" class="confirm-btn" :disabled="!palletForm.palletUnitId">
+          确认装托盘
+        </button>
+      </div>
+    </div>
+
+    <!-- 入库登记 -->
+    <div class="inbound-register" v-if="selectedFunction === 'register'">
+      <div class="pda-header">
+        <button class="back-btn" @click="goBack">← 返回</button>
+        <h2>入库登记</h2>
+      </div>
+
+      <!-- 通知单输入 -->
+      <div class="input-section" v-if="!registerForm.notifyNo">
+        <div class="input-group">
+          <label>通知单号</label>
+          <div class="input-with-scan">
+            <input
+              v-model="tempNotifyNo"
+              placeholder="请输入通知单号"
+              @keyup.enter="setNotifyForRegister"
+            />
+            <button @click="setNotifyForRegister" class="scan-btn">确认</button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 库位输入 -->
+      <div class="input-section" v-if="registerForm.notifyNo">
+        <div class="input-group">
+          <label>库位</label>
+          <input v-model="registerForm.locationId" placeholder="请输入库位" />
+        </div>
+      </div>
+
+      <!-- 包装扫描 -->
+      <div class="scan-section" v-if="registerForm.notifyNo">
+        <div class="section-header">
+          <h3>扫描包装</h3>
+        </div>
+        <div class="input-group">
+          <label>包装编码</label>
+          <div class="input-with-scan">
+            <input
+              v-model="scannedPackageId"
+              placeholder="请扫描包装编码"
+              @keyup.enter="scanPackageForRegister"
+            />
+            <button @click="scanPackageForRegister" class="scan-btn">扫描</button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 已扫描包装列表 -->
+      <div class="scanned-packages" v-if="scannedPackages.length">
+        <div class="section-header">
+          <h4>待入库包装 ({{ scannedPackages.length }})</h4>
+        </div>
+        <div class="package-list">
+          <div v-for="(pkg, index) in scannedPackages" :key="pkg.unitId" class="package-item">
+            <div class="package-info">
+              <div class="unit-id">{{ pkg.unitId }}</div>
+              <div class="part-info">{{ pkg.partNo }} - {{ pkg.partDesc }}</div>
+              <div class="qty-info">数量: {{ pkg.qty }}</div>
             </div>
-            <div class="info-row">
-              <span class="label">工作中心：</span>
-              <span class="value">{{ item.workCenter }}</span>
+            <div class="package-actions">
+              <button @click="removePackage(index)" class="remove-btn">移除</button>
             </div>
           </div>
-          <div class="progress-section">
-            <van-progress 
-              :percentage="Math.round((item.inboundQuantity / item.completedQuantity) * 100)" 
-              :stroke-width="6"
-              color="#07c160"
+        </div>
+
+        <button @click="confirmInboundRegister" class="confirm-btn" :disabled="!registerForm.locationId">
+          确认入库
+        </button>
+      </div>
+    </div>
+
+    <!-- 退库操作 -->
+    <div class="return-operation" v-if="selectedFunction === 'return'">
+      <div class="pda-header">
+        <button class="back-btn" @click="goBack">← 返回</button>
+        <h2>退库操作</h2>
+      </div>
+
+      <!-- 通知单输入 -->
+      <div class="input-section" v-if="!returnForm.notifyNo">
+        <div class="input-group">
+          <label>通知单号</label>
+          <div class="input-with-scan">
+            <input
+              v-model="tempNotifyNo"
+              placeholder="请输入通知单号"
+              @keyup.enter="loadInboundRecords"
             />
-            <div class="progress-text">入库进度：{{ item.inboundQuantity }}/{{ item.completedQuantity }}</div>
+            <button @click="loadInboundRecords" class="scan-btn">查询</button>
           </div>
         </div>
-      </van-list>
-    </van-pull-refresh>
+      </div>
+
+      <!-- 入库记录选择 -->
+      <div class="records-section" v-if="inboundRecords.length">
+        <div class="section-header">
+          <h3>选择入库记录</h3>
+        </div>
+        <div class="record-list">
+          <div v-for="record in inboundRecords" :key="record.transNo"
+               class="record-item"
+               :class="{ selected: selectedRecord === record.transNo }"
+               @click="selectRecord(record)">
+            <div class="record-info">
+              <div class="trans-no">{{ record.transNo }}</div>
+              <div class="trans-date">{{ record.transDate | formatDate }}</div>
+              <div class="qty-info">
+                入库: {{ record.inboundQty }} |
+                已退: {{ record.returnedQty }} |
+                可退: {{ record.availableReturnQty }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 退库方式选择 -->
+      <div class="return-type-section" v-if="selectedRecord">
+        <div class="section-header">
+          <h4>退库方式</h4>
+        </div>
+        <div class="radio-group">
+          <label class="radio-item">
+            <input type="radio" v-model="returnType" value="quantity" />
+            <span>按数量退库</span>
+          </label>
+          <label class="radio-item">
+            <input type="radio" v-model="returnType" value="unit" />
+            <span>按单元退库</span>
+          </label>
+        </div>
+      </div>
+
+      <!-- 按数量退库 -->
+      <div class="quantity-return" v-if="returnType === 'quantity'">
+        <div class="input-group">
+          <label>退库数量</label>
+          <input v-model="returnForm.returnQty" type="number" placeholder="请输入退库数量" />
+        </div>
+        <div class="input-group">
+          <label>退库原因</label>
+          <input v-model="returnForm.returnReason" placeholder="请输入退库原因" />
+        </div>
+        <button @click="confirmReturn" class="confirm-btn" :disabled="!returnForm.returnQty || !returnForm.returnReason">
+          确认退库
+        </button>
+      </div>
+
+      <!-- 按单元退库 -->
+      <div class="unit-return" v-if="returnType === 'unit'">
+        <div class="scan-section">
+          <div class="input-group">
+            <label>单元编码</label>
+            <div class="input-with-scan">
+              <input
+                v-model="scannedUnitId"
+                placeholder="请扫描单元编码"
+                @keyup.enter="scanUnitForReturn"
+              />
+              <button @click="scanUnitForReturn" class="scan-btn">扫描</button>
+            </div>
+          </div>
+        </div>
+
+        <!-- 已扫描单元列表 -->
+        <div class="scanned-units" v-if="scannedUnits.length">
+          <div class="section-header">
+            <h4>已扫描单元 ({{ scannedUnits.length }})</h4>
+          </div>
+          <div class="unit-list">
+            <div v-for="(unit, index) in scannedUnits" :key="unit.unitId" class="unit-item">
+              <div class="unit-info">
+                <div class="unit-id">{{ unit.unitId }}</div>
+                <div class="part-info">{{ unit.partNo }} - {{ unit.partDesc }}</div>
+                <div class="qty-info">数量: {{ unit.qty }}</div>
+              </div>
+              <div class="unit-actions">
+                <button @click="removeUnit(index)" class="remove-btn">移除</button>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="input-group">
+          <label>退库原因</label>
+          <input v-model="returnForm.returnReason" placeholder="请输入退库原因" />
+        </div>
+
+        <button @click="confirmReturn" class="confirm-btn" :disabled="!scannedUnits.length || !returnForm.returnReason">
+          确认退库
+        </button>
+      </div>
+    </div>
+
+    <!-- 加载提示 -->
+    <div class="loading" v-if="loading">
+      <div class="loading-spinner"></div>
+      <div class="loading-text">{{ loadingText }}</div>
+    </div>
+
+    <!-- 消息提示 -->
+    <div class="message" v-if="message" :class="messageType">
+      {{ message }}
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'ProductionInbound',
+  name: 'ProductionInboundPDA',
   data() {
     return {
-      searchValue: '',
-      activeTab: 'all',
-      refreshing: false,
+      selectedFunction: null,
       loading: false,
-      finished: false,
-      orderList: [
-        {
-          id: 1,
-          orderNo: 'MO202401001',
-          productCode: 'PROD001',
-          productName: '成品A',
-          planQuantity: 100,
-          completedQuantity: 80,
-          inboundQuantity: 0,
-          workCenter: '装配线1',
-          status: 0
-        },
-        {
-          id: 2,
-          orderNo: 'MO202401002',
-          productCode: 'PROD002',
-          productName: '成品B',
-          planQuantity: 200,
-          completedQuantity: 150,
-          inboundQuantity: 100,
-          workCenter: '装配线2',
-          status: 1
-        },
-        {
-          id: 3,
-          orderNo: 'MO202401003',
-          productCode: 'PROD003',
-          productName: '成品C',
-          planQuantity: 150,
-          completedQuantity: 150,
-          inboundQuantity: 150,
-          workCenter: '装配线1',
-          status: 2
-        }
-      ]
+      loadingText: '',
+      message: '',
+      messageType: 'info',
+
+      // 通知单信息
+      notifyInfo: {},
+      materialList: [],
+
+      // 包装创建
+      packageForm: {
+        site: 'MAIN',
+        notifyNo: '',
+        partNo: '',
+        qty: null,
+        batchNo: '',
+        operator: 'PDA_USER'
+      },
+      createdPackages: [],
+
+      // 装托盘
+      palletForm: {
+        site: 'MAIN',
+        palletUnitId: '',
+        operator: 'PDA_USER'
+      },
+
+      // 入库登记
+      registerForm: {
+        site: 'MAIN',
+        notifyNo: '',
+        locationId: '',
+        operator: 'PDA_USER'
+      },
+      tempNotifyNo: '',
+
+      // 退库
+      returnForm: {
+        site: 'MAIN',
+        notifyNo: '',
+        transNo: '',
+        returnQty: null,
+        returnReason: '',
+        operator: 'PDA_USER'
+      },
+      inboundRecords: [],
+      selectedRecord: '',
+      returnType: 'quantity',
+
+      // 通用扫描
+      scannedPackageId: '',
+      scannedPackages: [],
+      scannedUnitId: '',
+      scannedUnits: []
     }
   },
-  mounted() {
-    this.loadData()
-  },
   methods: {
-    loadData() {
+    selectFunction(func) {
+      this.selectedFunction = func
+      this.resetAll()
+    },
+
+    goBack() {
+      this.selectedFunction = null
+      this.resetAll()
+    },
+
+    resetAll() {
+      this.notifyInfo = {}
+      this.materialList = []
+      this.createdPackages = []
+      this.scannedPackages = []
+      this.scannedUnits = []
+      this.inboundRecords = []
+      this.selectedRecord = ''
+      this.packageForm = {
+        site: 'MAIN',
+        notifyNo: '',
+        partNo: '',
+        qty: null,
+        batchNo: '',
+        operator: 'PDA_USER'
+      }
+      this.palletForm = {
+        site: 'MAIN',
+        palletUnitId: '',
+        operator: 'PDA_USER'
+      }
+      this.registerForm = {
+        site: 'MAIN',
+        notifyNo: '',
+        locationId: '',
+        operator: 'PDA_USER'
+      }
+      this.returnForm = {
+        site: 'MAIN',
+        notifyNo: '',
+        transNo: '',
+        returnQty: null,
+        returnReason: '',
+        operator: 'PDA_USER'
+      }
+      this.tempNotifyNo = ''
+      this.scannedPackageId = ''
+      this.scannedUnitId = ''
+      this.message = ''
+    },
+
+    // 包装创建相关方法
+    async loadNotifyInfo() {
+      if (!this.packageForm.notifyNo) {
+        this.showMessage('请输入通知单号', 'error')
+        return
+      }
+
       this.loading = true
-      setTimeout(() => {
+      this.loadingText = '加载通知单信息...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/notify/info'),
+          method: 'get',
+          params: { notifyNo: this.packageForm.notifyNo }
+        })
+
+        if (response.data.code === 0) {
+          this.notifyInfo = response.data.data
+          this.packageForm.site = this.notifyInfo.site
+          await this.loadMaterials()
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('加载通知单信息失败', 'error')
+      } finally {
         this.loading = false
-        this.finished = true
-      }, 1000)
+      }
     },
-    onRefresh() {
-      this.refreshing = true
-      setTimeout(() => {
-        this.refreshing = false
-        this.$toast.success('刷新成功')
-      }, 1000)
+
+    async loadMaterials() {
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/notify/materials'),
+          method: 'get',
+          params: { notifyNo: this.packageForm.notifyNo }
+        })
+
+        if (response.data.code === 0) {
+          this.materialList = response.data.data || []
+        }
+      } catch (error) {
+        console.error('加载物料清单失败', error)
+      }
     },
-    onLoad() {
-      this.loadData()
+
+    resetNotify() {
+      this.packageForm.notifyNo = ''
+      this.notifyInfo = {}
+      this.materialList = []
+      this.createdPackages = []
     },
-    handleSearch() {
-      this.loadData()
+
+    async createPackage() {
+      if (!this.packageForm.partNo || !this.packageForm.qty) {
+        this.showMessage('请填写完整的包装信息', 'error')
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '创建包装中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/package/create'),
+          method: 'post',
+          data: this.packageForm
+        })
+
+        if (response.data.code === 0) {
+          this.createdPackages.push(response.data.data)
+          this.showMessage('包装创建成功', 'success')
+          // 重置表单
+          this.packageForm.partNo = ''
+          this.packageForm.qty = null
+          this.packageForm.batchNo = ''
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('创建包装失败', 'error')
+      } finally {
+        this.loading = false
+      }
     },
-    handleClear() {
-      this.searchValue = ''
-      this.loadData()
+
+    async printLabel(pkg) {
+      this.loading = true
+      this.loadingText = '打印标签中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/package/print'),
+          method: 'post',
+          data: {
+            unitId: pkg.unitId,
+            printerName: 'default'
+          }
+        })
+
+        if (response.data.code === 0) {
+          this.showMessage('标签打印成功', 'success')
+          console.log('ZPL数据:', response.data.labelData)
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('打印标签失败', 'error')
+      } finally {
+        this.loading = false
+      }
     },
-    handleTabChange() {
-      this.loadData()
+
+    // 装托盘相关方法
+    scanPallet() {
+      // 这里可以集成扫描设备
+      this.$prompt('请输入托盘编码', '扫描托盘', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(({ value }) => {
+        this.palletForm.palletUnitId = value
+      })
+    },
+
+    async scanPackageForPallet() {
+      if (!this.scannedPackageId) {
+        this.showMessage('请输入包装编码', 'error')
+        return
+      }
+
+      // 检查是否已经扫描过
+      const exists = this.scannedPackages.find(pkg => pkg.unitId === this.scannedPackageId)
+      if (exists) {
+        this.showMessage('该包装已经扫描过了', 'warning')
+        this.scannedPackageId = ''
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '扫描包装中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/package/scan'),
+          method: 'get',
+          params: { unitId: this.scannedPackageId }
+        })
+
+        if (response.data.code === 0) {
+          this.scannedPackages.push(response.data.data)
+          this.scannedPackageId = ''
+          this.showMessage('扫描成功', 'success')
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('扫描包装失败', 'error')
+      } finally {
+        this.loading = false
+      }
+    },
+
+    async confirmPackToPallet() {
+      if (!this.palletForm.palletUnitId) {
+        this.showMessage('请输入托盘编码', 'error')
+        return
+      }
+
+      if (this.scannedPackages.length === 0) {
+        this.showMessage('请先扫描包装', 'error')
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '装托盘中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/pallet/pack'),
+          method: 'post',
+          data: {
+            ...this.palletForm,
+            packageUnitIds: this.scannedPackages.map(pkg => pkg.unitId)
+          }
+        })
+
+        if (response.data.code === 0) {
+          this.showMessage('装托盘成功', 'success')
+          this.palletForm.palletUnitId = ''
+          this.scannedPackages = []
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('装托盘失败', 'error')
+      } finally {
+        this.loading = false
+      }
+    },
+
+    // 入库登记相关方法
+    setNotifyForRegister() {
+      if (!this.tempNotifyNo) {
+        this.showMessage('请输入通知单号', 'error')
+        return
+      }
+      this.registerForm.notifyNo = this.tempNotifyNo
+    },
+
+    async scanPackageForRegister() {
+      if (!this.scannedPackageId) {
+        this.showMessage('请输入包装编码', 'error')
+        return
+      }
+
+      // 检查是否已经扫描过
+      const exists = this.scannedPackages.find(pkg => pkg.unitId === this.scannedPackageId)
+      if (exists) {
+        this.showMessage('该包装已经扫描过了', 'warning')
+        this.scannedPackageId = ''
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '扫描包装中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/package/scan'),
+          method: 'get',
+          params: { unitId: this.scannedPackageId }
+        })
+
+        if (response.data.code === 0) {
+          this.scannedPackages.push(response.data.data)
+          this.scannedPackageId = ''
+          this.showMessage('扫描成功', 'success')
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('扫描包装失败', 'error')
+      } finally {
+        this.loading = false
+      }
+    },
+
+    async confirmInboundRegister() {
+      if (!this.registerForm.locationId) {
+        this.showMessage('请输入库位', 'error')
+        return
+      }
+
+      if (this.scannedPackages.length === 0) {
+        this.showMessage('请先扫描包装', 'error')
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '入库登记中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/register'),
+          method: 'post',
+          data: {
+            ...this.registerForm,
+            unitIds: this.scannedPackages.map(pkg => pkg.unitId)
+          }
+        })
+
+        if (response.data.code === 0) {
+          this.showMessage('入库登记成功', 'success')
+          this.registerForm.locationId = ''
+          this.scannedPackages = []
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('入库登记失败', 'error')
+      } finally {
+        this.loading = false
+      }
     },
-    handleOrderClick(item) {
-      if (item.status === 0 || item.status === 1) {
-        this.$router.push(`/production-inbound/receive/${item.orderNo}`)
-      } else {
-        this.$toast('该订单已完成入库')
+
+    // 退库相关方法
+    async loadInboundRecords() {
+      if (!this.tempNotifyNo) {
+        this.showMessage('请输入通知单号', 'error')
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '加载入库记录...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/records'),
+          method: 'get',
+          params: { notifyNo: this.tempNotifyNo }
+        })
+
+        if (response.data.code === 0) {
+          this.inboundRecords = response.data.data || []
+          this.returnForm.notifyNo = this.tempNotifyNo
+          if (this.inboundRecords.length === 0) {
+            this.showMessage('没有找到入库记录', 'warning')
+          }
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('加载入库记录失败', 'error')
+      } finally {
+        this.loading = false
       }
     },
-    getStatusText(status) {
-      const statusMap = {
-        0: '待入库',
-        1: '部分入库',
-        2: '已完成'
+
+    selectRecord(record) {
+      this.selectedRecord = record.transNo
+      this.returnForm.transNo = record.transNo
+    },
+
+    async scanUnitForReturn() {
+      if (!this.scannedUnitId) {
+        this.showMessage('请输入单元编码', 'error')
+        return
+      }
+
+      // 检查是否已经扫描过
+      const exists = this.scannedUnits.find(unit => unit.unitId === this.scannedUnitId)
+      if (exists) {
+        this.showMessage('该单元已经扫描过了', 'warning')
+        this.scannedUnitId = ''
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '扫描单元中...'
+
+      try {
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/return/scan'),
+          method: 'get',
+          params: { unitId: this.scannedUnitId }
+        })
+
+        if (response.data.code === 0) {
+          const unitInfo = response.data.data
+          if (unitInfo.canReturn === 'Y') {
+            this.scannedUnits.push(unitInfo)
+            this.scannedUnitId = ''
+            this.showMessage('扫描成功', 'success')
+          } else {
+            this.showMessage('该单元不可退库', 'error')
+          }
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('扫描单元失败', 'error')
+      } finally {
+        this.loading = false
       }
-      return statusMap[status] || '未知'
     },
-    getStatusClass(status) {
-      const classMap = {
-        0: 'status-pending',
-        1: 'status-partial',
-        2: 'status-completed'
+
+    async confirmReturn() {
+      if (!this.selectedRecord) {
+        this.showMessage('请先选择入库记录', 'error')
+        return
+      }
+
+      if (!this.returnForm.returnReason) {
+        this.showMessage('请输入退库原因', 'error')
+        return
+      }
+
+      if (this.returnType === 'quantity' && (!this.returnForm.returnQty || this.returnForm.returnQty <= 0)) {
+        this.showMessage('请输入有效的退库数量', 'error')
+        return
       }
-      return classMap[status] || ''
+
+      if (this.returnType === 'unit' && this.scannedUnits.length === 0) {
+        this.showMessage('请先扫描单元', 'error')
+        return
+      }
+
+      this.loading = true
+      this.loadingText = '退库中...'
+
+      try {
+        const returnData = {
+          ...this.returnForm
+        }
+
+        if (this.returnType === 'unit') {
+          returnData.unitIds = this.scannedUnits.map(unit => unit.unitId)
+        }
+
+        const response = await this.$http({
+          url: this.$http.adornUrl('/production/inbound/return'),
+          method: 'post',
+          data: returnData
+        })
+
+        if (response.data.code === 0) {
+          this.showMessage('退库成功', 'success')
+          this.resetReturnForm()
+          await this.loadInboundRecords()
+        } else {
+          this.showMessage(response.data.msg, 'error')
+        }
+      } catch (error) {
+        this.showMessage('退库失败', 'error')
+      } finally {
+        this.loading = false
+      }
+    },
+
+    resetReturnForm() {
+      this.returnForm.returnQty = null
+      this.returnForm.returnReason = ''
+      this.scannedUnits = []
+      this.scannedUnitId = ''
+      this.selectedRecord = ''
+    },
+
+    // 通用方法
+    removePackage(index) {
+      this.scannedPackages.splice(index, 1)
+    },
+
+    removeUnit(index) {
+      this.scannedUnits.splice(index, 1)
+    },
+
+    showMessage(text, type = 'info') {
+      this.message = text
+      this.messageType = type
+      setTimeout(() => {
+        this.message = ''
+      }, 3000)
+    }
+  },
+  filters: {
+    formatDate(date) {
+      if (!date) return ''
+      return new Date(date).toLocaleDateString()
     }
   }
 }
 </script>
 
 <style scoped>
-.production-inbound-container {
+.production-inbound-pda {
+  padding: 10px;
+  font-family: Arial, sans-serif;
+  background-color: #f5f5f5;
   min-height: 100vh;
-  background-color: #f7f8fa;
 }
 
-.search-section {
-  padding: 10px 16px;
-  background: white;
+/* 功能选择 */
+.function-selector {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  padding: 20px 0;
 }
 
-.filter-section {
+.function-card {
   background: white;
-  border-bottom: 1px solid #ebedf0;
+  border-radius: 8px;
+  padding: 20px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  cursor: pointer;
+  transition: all 0.3s;
+  text-align: center;
 }
 
-.order-item {
+.function-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 8px rgba(0,0,0,0.15);
+}
+
+.function-icon {
+  font-size: 48px;
+  margin-bottom: 10px;
+}
+
+.function-title {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 8px;
+  color: #333;
+}
+
+.function-desc {
+  font-size: 14px;
+  color: #666;
+}
+
+/* PDA头部 */
+.pda-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  padding: 10px 0;
+  border-bottom: 2px solid #007bff;
+}
+
+.back-btn {
+  background: #6c757d;
+  color: white;
+  border: none;
+  padding: 8px 12px;
+  border-radius: 4px;
+  margin-right: 15px;
+  cursor: pointer;
+}
+
+.pda-header h2 {
+  margin: 0;
+  color: #007bff;
+  font-size: 20px;
+}
+
+/* 输入区域 */
+.input-section, .notify-info, .scan-section, .records-section, .return-type-section {
   background: white;
-  margin: 10px 16px;
   border-radius: 8px;
-  padding: 16px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  padding: 15px;
+  margin-bottom: 15px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
 }
 
-.order-header {
+.section-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 12px;
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
 }
 
-.order-no {
-  font-size: 16px;
-  font-weight: bold;
-  color: #323233;
+.section-header h3, .section-header h4 {
+  margin: 0;
+  color: #333;
 }
 
-.order-status {
-  padding: 4px 8px;
+.reset-btn {
+  background: #ffc107;
+  color: #212529;
+  border: none;
+  padding: 6px 12px;
   border-radius: 4px;
+  cursor: pointer;
   font-size: 12px;
-  color: white;
 }
 
-.status-pending {
-  background-color: #ff976a;
+.input-group {
+  margin-bottom: 15px;
 }
 
-.status-partial {
-  background-color: #1989fa;
+.input-group label {
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+  color: #333;
 }
 
-.status-completed {
-  background-color: #07c160;
+.input-with-scan {
+  display: flex;
+  gap: 10px;
+}
+
+.input-with-scan input, .input-group input {
+  flex: 1;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  font-size: 16px;
+  width: 100%;
+  box-sizing: border-box;
 }
 
-.order-info {
+.scan-btn, .confirm-btn, .print-btn, .remove-btn {
+  background: #007bff;
+  color: white;
+  border: none;
+  padding: 10px 15px;
+  border-radius: 4px;
+  cursor: pointer;
   font-size: 14px;
-  margin-bottom: 12px;
+  white-space: nowrap;
+}
+
+.scan-btn:hover, .confirm-btn:hover, .print-btn:hover {
+  background: #0056b3;
+}
+
+.remove-btn {
+  background: #dc3545;
+  padding: 6px 10px;
+  font-size: 12px;
+}
+
+.remove-btn:hover {
+  background: #c82333;
+}
+
+.confirm-btn:disabled {
+  background: #6c757d;
+  cursor: not-allowed;
+}
+
+/* 信息卡片 */
+.info-card {
+  background: #f8f9fa;
+  border-radius: 6px;
+  padding: 15px;
+  margin-bottom: 15px;
 }
 
 .info-row {
   display: flex;
-  margin-bottom: 6px;
+  justify-content: space-between;
+  margin-bottom: 8px;
+  padding: 5px 0;
+  border-bottom: 1px solid #eee;
 }
 
 .info-row:last-child {
+  border-bottom: none;
   margin-bottom: 0;
 }
 
-.label {
-  color: #969799;
-  width: 80px;
-  flex-shrink: 0;
+.info-row .label {
+  font-weight: bold;
+  color: #666;
+}
+
+.info-row .value {
+  color: #333;
+}
+
+/* 物料列表 */
+.material-list, .package-list, .record-list, .unit-list {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.material-item, .package-item, .record-item, .unit-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+
+.material-item:hover, .package-item:hover, .record-item:hover, .unit-item:hover {
+  border-color: #007bff;
+  background-color: #f8f9fa;
 }
 
-.value {
-  color: #323233;
+.record-item.selected {
+  border-color: #007bff;
+  background-color: #e3f2fd;
+}
+
+.material-info, .package-info, .record-info, .unit-info {
   flex: 1;
 }
 
-.progress-section {
-  margin-top: 12px;
+.part-no, .unit-id, .trans-no {
+  font-weight: bold;
+  font-size: 16px;
+  color: #333;
+  margin-bottom: 4px;
 }
 
-.progress-text {
+.part-desc, .part-info {
+  color: #666;
+  font-size: 14px;
+  margin-bottom: 4px;
+}
+
+.qty-info, .trans-date {
   font-size: 12px;
-  color: #646566;
-  margin-top: 4px;
+  color: #666;
+}
+
+.package-actions, .unit-actions {
+  display: flex;
+  gap: 5px;
+}
+
+/* 表单区域 */
+.create-form, .quantity-return, .unit-return {
+  background: white;
+  border-radius: 8px;
+  padding: 15px;
+  margin-bottom: 15px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+/* 单选按钮组 */
+.radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  transition: all 0.3s;
+}
+
+.radio-item:hover {
+  background-color: #f8f9fa;
+}
+
+.radio-item input[type="radio"] {
+  margin: 0;
+}
+
+/* 加载和消息 */
+.loading {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background: rgba(0,0,0,0.8);
+  color: white;
+  padding: 20px;
+  border-radius: 8px;
   text-align: center;
+  z-index: 1000;
+}
+
+.loading-spinner {
+  width: 40px;
+  height: 40px;
+  border: 4px solid #f3f3f3;
+  border-top: 4px solid #007bff;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin: 0 auto 10px;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+  font-size: 14px;
+}
+
+.message {
+  position: fixed;
+  top: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+  padding: 12px 20px;
+  border-radius: 6px;
+  font-weight: bold;
+  z-index: 1001;
+  max-width: 90%;
+  text-align: center;
+}
+
+.message.success {
+  background: #d4edda;
+  color: #155724;
+  border: 1px solid #c3e6cb;
+}
+
+.message.error {
+  background: #f8d7da;
+  color: #721c24;
+  border: 1px solid #f5c6cb;
+}
+
+.message.warning {
+  background: #fff3cd;
+  color: #856404;
+  border: 1px solid #ffeaa7;
+}
+
+.message.info {
+  background: #d1ecf1;
+  color: #0c5460;
+  border: 1px solid #bee5eb;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .production-inbound-pda {
+    padding: 5px;
+  }
+
+  .function-card {
+    padding: 15px;
+  }
+
+  .function-icon {
+    font-size: 36px;
+  }
+
+  .input-with-scan {
+    flex-direction: column;
+  }
+
+  .material-item, .package-item, .record-item, .unit-item {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+  }
+
+  .package-actions, .unit-actions {
+    align-self: flex-end;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/production-inbound/receive.vue b/src/views/modules/production-inbound/receive.vue
deleted file mode 100644
index 0a4ff20..0000000
--- a/src/views/modules/production-inbound/receive.vue
+++ /dev/null
@@ -1,394 +0,0 @@
-<template>
-  <div class="receive-container">
-    <van-nav-bar title="生产入库" left-arrow @click-left="$router.back()" />
-    
-    <!-- 订单信息 -->
-    <div class="order-info">
-      <div class="info-header">
-        <div class="order-no">{{ orderInfo.orderNo }}</div>
-        <div class="order-status">{{ getStatusText(orderInfo.status) }}</div>
-      </div>
-      <van-cell-group>
-        <van-cell title="产品编码" :value="orderInfo.productCode" />
-        <van-cell title="产品名称" :value="orderInfo.productName" />
-        <van-cell title="计划数量" :value="orderInfo.planQuantity" />
-        <van-cell title="已完工" :value="orderInfo.completedQuantity" />
-        <van-cell title="已入库" :value="orderInfo.inboundQuantity" />
-      </van-cell-group>
-    </div>
-
-    <!-- 入库明细 -->
-    <div class="inbound-section">
-      <div class="section-title">入库明细</div>
-      <div class="inbound-item">
-        <div class="product-info">
-          <div class="product-name">{{ orderInfo.productCode }} - {{ orderInfo.productName }}</div>
-          <div class="product-spec">规格：{{ orderInfo.specification }}</div>
-          <div class="product-quantity">
-            可入库：{{ orderInfo.completedQuantity - orderInfo.inboundQuantity }}
-          </div>
-        </div>
-        <div class="inbound-input">
-          <van-stepper
-            v-model="inboundQuantity"
-            :min="0"
-            :max="orderInfo.completedQuantity - orderInfo.inboundQuantity"
-            integer
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- 质量检验 -->
-    <div class="quality-section">
-      <div class="section-title">质量检验</div>
-      <van-field
-        v-model="qualityInfo.inspector"
-        label="检验员"
-        placeholder="请输入检验员"
-      />
-      <van-field
-        v-model="qualityInfo.qualityStatus"
-        label="质量状态"
-        placeholder="请选择质量状态"
-        readonly
-        is-link
-        @click="showQualityPicker = true"
-      />
-      <van-field
-        v-model="qualityInfo.qualityRemark"
-        label="检验备注"
-        type="textarea"
-        placeholder="请输入检验备注"
-        rows="2"
-      />
-    </div>
-
-    <!-- 批次信息 -->
-    <div class="batch-section">
-      <div class="section-title">批次信息</div>
-      <van-field
-        v-model="batchInfo.batchNo"
-        label="批次号"
-        placeholder="系统自动生成"
-        disabled
-      />
-      <van-field
-        v-model="batchInfo.productionDate"
-        label="生产日期"
-        placeholder="请选择生产日期"
-        readonly
-        is-link
-        @click="showDatePicker = true"
-      />
-      <van-field
-        v-model="batchInfo.expiryDate"
-        label="有效期至"
-        placeholder="请选择有效期"
-        readonly
-        is-link
-        @click="showExpiryPicker = true"
-      />
-    </div>
-
-    <!-- 库位分配 -->
-    <div class="location-section">
-      <div class="section-title">库位分配</div>
-      <van-field
-        v-model="selectedLocation"
-        label="入库库位"
-        placeholder="请选择或扫描库位"
-        readonly
-        is-link
-        @click="showLocationPicker = true"
-      >
-        <template #right-icon>
-          <van-icon name="scan" @click.stop="handleScanLocation" />
-        </template>
-      </van-field>
-    </div>
-
-    <!-- 备注 -->
-    <div class="remark-section">
-      <van-field
-        v-model="remark"
-        label="备注"
-        type="textarea"
-        placeholder="请输入入库备注"
-        rows="3"
-        autosize
-      />
-    </div>
-
-    <!-- 底部按钮 -->
-    <div class="bottom-actions">
-      <van-button
-        type="primary"
-        block
-        :loading="submitting"
-        @click="handleSubmit"
-      >
-        确认入库
-      </van-button>
-    </div>
-
-    <!-- 选择器 -->
-    <van-popup v-model="showQualityPicker" position="bottom">
-      <van-picker
-        :columns="qualityColumns"
-        @confirm="onQualityConfirm"
-        @cancel="showQualityPicker = false"
-      />
-    </van-popup>
-
-    <van-popup v-model="showDatePicker" position="bottom">
-      <van-datetime-picker
-        v-model="productionDate"
-        type="date"
-        title="选择生产日期"
-        @confirm="onDateConfirm"
-        @cancel="showDatePicker = false"
-      />
-    </van-popup>
-
-    <van-popup v-model="showExpiryPicker" position="bottom">
-      <van-datetime-picker
-        v-model="expiryDate"
-        type="date"
-        title="选择有效期"
-        @confirm="onExpiryConfirm"
-        @cancel="showExpiryPicker = false"
-      />
-    </van-popup>
-
-    <van-popup v-model="showLocationPicker" position="bottom">
-      <van-picker
-        :columns="locationColumns"
-        @confirm="onLocationConfirm"
-        @cancel="showLocationPicker = false"
-      />
-    </van-popup>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ProductionReceive',
-  data() {
-    return {
-      orderInfo: {
-        orderNo: 'MO202401001',
-        productCode: 'PROD001',
-        productName: '成品A',
-        specification: '标准规格',
-        planQuantity: 100,
-        completedQuantity: 80,
-        inboundQuantity: 0,
-        status: 0
-      },
-      inboundQuantity: 0,
-      qualityInfo: {
-        inspector: '',
-        qualityStatus: '',
-        qualityRemark: ''
-      },
-      batchInfo: {
-        batchNo: 'BATCH' + Date.now(),
-        productionDate: '',
-        expiryDate: ''
-      },
-      selectedLocation: '',
-      remark: '',
-      submitting: false,
-      showQualityPicker: false,
-      showDatePicker: false,
-      showExpiryPicker: false,
-      showLocationPicker: false,
-      productionDate: new Date(),
-      expiryDate: new Date(),
-      qualityColumns: [
-        '合格',
-        '待检',
-        '不合格',
-        '返工'
-      ],
-      locationColumns: [
-        'FG01-01-01',
-        'FG01-01-02',
-        'FG01-02-01',
-        'FG01-02-02',
-        'FG02-01-01'
-      ]
-    }
-  },
-  mounted() {
-    this.loadOrderData()
-  },
-  methods: {
-    loadOrderData() {
-      const orderNo = this.$route.params.orderNo
-      console.log('加载生产订单数据:', orderNo)
-    },
-    handleScanLocation() {
-      this.$toast('扫描库位功能开发中...')
-    },
-    onQualityConfirm(value) {
-      this.qualityInfo.qualityStatus = value
-      this.showQualityPicker = false
-    },
-    onDateConfirm(value) {
-      this.batchInfo.productionDate = this.formatDate(value)
-      this.showDatePicker = false
-    },
-    onExpiryConfirm(value) {
-      this.batchInfo.expiryDate = this.formatDate(value)
-      this.showExpiryPicker = false
-    },
-    onLocationConfirm(value) {
-      this.selectedLocation = value
-      this.showLocationPicker = false
-    },
-    formatDate(date) {
-      const year = date.getFullYear()
-      const month = String(date.getMonth() + 1).padStart(2, '0')
-      const day = String(date.getDate()).padStart(2, '0')
-      return `${year}-${month}-${day}`
-    },
-    async handleSubmit() {
-      // 验证入库数量
-      if (this.inboundQuantity <= 0) {
-        this.$toast('请输入入库数量')
-        return
-      }
-
-      // 验证质量状态
-      if (!this.qualityInfo.qualityStatus) {
-        this.$toast('请选择质量状态')
-        return
-      }
-
-      // 验证库位
-      if (!this.selectedLocation) {
-        this.$toast('请选择入库库位')
-        return
-      }
-
-      this.submitting = true
-      
-      try {
-        await new Promise(resolve => setTimeout(resolve, 2000))
-        
-        this.$toast.success('入库成功')
-        this.$router.back()
-      } catch (error) {
-        this.$toast.fail('入库失败')
-      } finally {
-        this.submitting = false
-      }
-    },
-    getStatusText(status) {
-      const statusMap = {
-        0: '待入库',
-        1: '部分入库',
-        2: '已完成'
-      }
-      return statusMap[status] || '未知'
-    }
-  }
-}
-</script>
-
-<style scoped>
-.receive-container {
-  min-height: 100vh;
-  background-color: #f7f8fa;
-  padding-bottom: 80px;
-}
-
-.order-info {
-  background: white;
-  margin-bottom: 10px;
-}
-
-.info-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px;
-  border-bottom: 1px solid #ebedf0;
-}
-
-.order-no {
-  font-size: 18px;
-  font-weight: bold;
-  color: #323233;
-}
-
-.order-status {
-  padding: 4px 8px;
-  border-radius: 4px;
-  font-size: 12px;
-  color: white;
-  background-color: #ff976a;
-}
-
-.inbound-section,
-.quality-section,
-.batch-section,
-.location-section,
-.remark-section {
-  background: white;
-  margin-bottom: 10px;
-}
-
-.section-title {
-  padding: 16px;
-  font-size: 16px;
-  font-weight: bold;
-  color: #323233;
-  border-bottom: 1px solid #ebedf0;
-}
-
-.inbound-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px;
-}
-
-.product-info {
-  flex: 1;
-}
-
-.product-name {
-  font-size: 16px;
-  font-weight: bold;
-  color: #323233;
-  margin-bottom: 4px;
-}
-
-.product-spec {
-  font-size: 12px;
-  color: #969799;
-  margin-bottom: 4px;
-}
-
-.product-quantity {
-  font-size: 14px;
-  color: #646566;
-}
-
-.inbound-input {
-  margin-left: 16px;
-}
-
-.bottom-actions {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 16px;
-  background: white;
-  border-top: 1px solid #ebedf0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/sales-return/index.vue b/src/views/modules/sales-return/index.vue
index 87d39a5..6262b91 100644
--- a/src/views/modules/sales-return/index.vue
+++ b/src/views/modules/sales-return/index.vue
@@ -1,266 +1,119 @@
 <template>
-  <div class="sales-return-container">
-    <van-nav-bar title="销售退货" left-arrow @click-left="$router.back()" />
-    
-    <!-- 搜索栏 -->
-    <div class="search-section">
-      <van-search
-        v-model="searchValue"
-        placeholder="请输入退货单号"
-        @search="handleSearch"
-        @clear="handleClear"
-      />
+  <div class="pda-container">
+    <!-- 状态栏 -->
+    <div class="status-bar">
+      <div class="goBack" @click="$router.back()"><i class="el-icon-arrow-left"></i>上一页</div>
+      <div class="time">销售退货</div>
+      <div class="network" style="color: #fff" @click="$router.push({path: '/'})">🏠首页</div>
     </div>
 
-    <!-- 状态筛选 -->
-    <div class="filter-section">
-      <van-tabs v-model="activeTab" @change="handleTabChange">
-        <van-tab title="全部" name="all" />
-        <van-tab title="待收货" name="0" />
-        <van-tab title="质检中" name="1" />
-        <van-tab title="已完成" name="2" />
-      </van-tabs>
-    </div>
-
-    <!-- 退货单列表 -->
-    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
+    <!-- 功能菜单 -->
+    <div class="menu-grid">
+      <div
+        class="menu-item"
+        v-for="(btn, index) in buttons"
+        :key="index"
+        @click="$router.push(btn.to)"
       >
-        <div
-          v-for="item in returnList"
-          :key="item.id"
-          class="return-item"
-          @click="handleReturnClick(item)"
-        >
-          <div class="return-header">
-            <div class="return-no">{{ item.returnNo }}</div>
-            <div class="return-status" :class="getStatusClass(item.status)">
-              {{ getStatusText(item.status) }}
-            </div>
-          </div>
-          <div class="return-info">
-            <div class="info-row">
-              <span class="label">原订单号：</span>
-              <span class="value">{{ item.originalOrderNo }}</span>
-            </div>
-            <div class="info-row">
-              <span class="label">客户：</span>
-              <span class="value">{{ item.customerName }}</span>
-            </div>
-            <div class="info-row">
-              <span class="label">退货原因：</span>
-              <span class="value">{{ item.returnReason }}</span>
-            </div>
-            <div class="info-row">
-              <span class="label">退货数量：</span>
-              <span class="value">{{ item.returnQuantity }}</span>
-            </div>
-            <div class="info-row">
-              <span class="label">退货金额：</span>
-              <span class="value amount">¥{{ item.returnAmount }}</span>
-            </div>
-            <div class="info-row">
-              <span class="label">申请时间：</span>
-              <span class="value">{{ item.applyTime }}</span>
-            </div>
-          </div>
+        <div class="menu-icon" :class="btn.iconClass">
+          <van-icon :name="btn.icon" size="24" />
         </div>
-      </van-list>
-    </van-pull-refresh>
+        <div class="menu-text">{{ btn.label }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'SalesReturn',
   data() {
     return {
-      searchValue: '',
-      activeTab: 'all',
-      refreshing: false,
-      loading: false,
-      finished: false,
-      returnList: [
-        {
-          id: 1,
-          returnNo: 'RT202401001',
-          originalOrderNo: 'SO202401001',
-          customerName: '客户A有限公司',
-          returnReason: '质量问题',
-          returnQuantity: 10,
-          returnAmount: 25000.00,
-          applyTime: '2024-01-15 10:30',
-          status: 0
-        },
-        {
-          id: 2,
-          returnNo: 'RT202401002',
-          originalOrderNo: 'SO202401002',
-          customerName: '客户B有限公司',
-          returnReason: '规格不符',
-          returnQuantity: 5,
-          returnAmount: 12500.00,
-          applyTime: '2024-01-14 09:20',
-          status: 1
-        },
-        {
-          id: 3,
-          returnNo: 'RT202401003',
-          originalOrderNo: 'SO202401003',
-          customerName: '客户C有限公司',
-          returnReason: '数量错误',
-          returnQuantity: 8,
-          returnAmount: 18000.00,
-          applyTime: '2024-01-13 14:15',
-          status: 2
-        }
+      buttons: [
+        { icon: 'shopping-cart-o', label: '入库', iconClass: 'purchase', to: 'salereturn-inbound' },
+        { icon: 'orders-o', label: '报废', iconClass: 'inspection', to: 'salereturn-scrap' }
       ]
     }
-  },
-  mounted() {
-    this.loadData()
-  },
-  methods: {
-    loadData() {
-      this.loading = true
-      setTimeout(() => {
-        this.loading = false
-        this.finished = true
-      }, 1000)
-    },
-    onRefresh() {
-      this.refreshing = true
-      setTimeout(() => {
-        this.refreshing = false
-        this.$toast.success('刷新成功')
-      }, 1000)
-    },
-    onLoad() {
-      this.loadData()
-    },
-    handleSearch() {
-      this.loadData()
-    },
-    handleClear() {
-      this.searchValue = ''
-      this.loadData()
-    },
-    handleTabChange() {
-      this.loadData()
-    },
-    handleReturnClick(item) {
-      if (item.status === 0 || item.status === 1) {
-        this.$router.push(`/sales-return/receive/${item.returnNo}`)
-      } else {
-        this.$toast('该退货单已完成处理')
-      }
-    },
-    getStatusText(status) {
-      const statusMap = {
-        0: '待收货',
-        1: '质检中',
-        2: '已完成'
-      }
-      return statusMap[status] || '未知'
-    },
-    getStatusClass(status) {
-      const classMap = {
-        0: 'status-pending',
-        1: 'status-checking',
-        2: 'status-completed'
-      }
-      return classMap[status] || ''
-    }
   }
 }
 </script>
 
-<style scoped>
-.sales-return-container {
-  min-height: 100vh;
-  background-color: #f7f8fa;
-}
-
-.search-section {
-  padding: 10px 16px;
-  background: white;
-}
-
-.filter-section {
-  background: white;
-  border-bottom: 1px solid #ebedf0;
+<style>
+/* filepath: D:\xjcode\wms-pda\src\views\modules\recv\po-recv.vue */
+:root {
+  --columns: 3;
+  --button-size: calc(100vw / var(--columns) - 20px);
 }
 
-.return-item {
-  background: white;
-  margin: 10px 16px;
-  border-radius: 8px;
-  padding: 16px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+.pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+  font-family: 'Arial', sans-serif;
+  overflow: auto;
 }
 
-.return-header {
+.status-bar {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 12px;
-}
-
-.return-no {
-  font-size: 16px;
-  font-weight: bold;
-  color: #323233;
-}
-
-.return-status {
-  padding: 4px 8px;
-  border-radius: 4px;
-  font-size: 12px;
-  color: white;
+  padding: 10px 20px;
+  background: #17B3A3;
 }
 
-.status-pending {
-  background-color: #ff976a;
+.menu-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 15px;
+  padding: 20px;
+  justify-content: center; /* 水平居中 */
+  align-content: center; /* 垂直居中 */
+  width: 100%; /* 确保占满容器宽度 */
 }
 
-.status-checking {
-  background-color: #1989fa;
-}
-
-.status-completed {
-  background-color: #07c160;
+.menu-item {
+  background: white;
+  border-radius: 12px;
+  padding: 20px 10px;
+  text-align: center;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  transition: transform 0.2s;
 }
 
-.return-info {
-  font-size: 14px;
+.menu-item:active {
+  transform: scale(0.95);
 }
 
-.info-row {
+.menu-icon {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
   display: flex;
-  margin-bottom: 6px;
+  align-items: center;
+  justify-content: center;
+  margin: 0 auto 10px;
+  color: white;
 }
 
-.info-row:last-child {
-  margin-bottom: 0;
+.menu-icon.purchase {
+  background: linear-gradient(135deg, #17B3A3 0%, #1dc5ef 100%);
 }
 
-.label {
-  color: #969799;
-  width: 80px;
-  flex-shrink: 0;
+.menu-icon.inspection {
+  background: linear-gradient(135deg, #17B3A3 0%, #1dc5ef 100%);
 }
 
-.value {
-  color: #323233;
-  flex: 1;
+.menu-icon.qualified {
+  background: linear-gradient(135deg, #17B3A3 0%, #1dc5ef 100%);
 }
 
-.value.amount {
-  color: #ee0a24;
-  font-weight: bold;
+.menu-text {
+  font-size: 13px;
+  color: #333;
+  font-weight: bold; /* 加粗字体 */
+  white-space: nowrap; /* 防止文字换行 */
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/sales-return/sales-return-inbound.vue b/src/views/modules/sales-return/sales-return-inbound.vue
new file mode 100644
index 0000000..55baa0d
--- /dev/null
+++ b/src/views/modules/sales-return/sales-return-inbound.vue
@@ -0,0 +1,241 @@
+<template>
+  <div>
+    <div class="pda-container">
+      <div class="status-bar">
+        <div class="goBack" @click="handleBack"><i class="el-icon-arrow-left"></i>上一页</div>
+        <div class="goBack">销售退货-入库</div>
+        <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
+      </div>
+      <div class="main-content">
+        <!-- RMA号输入/扫描 -->
+        <el-input v-model="scanRma" placeholder="扫描RMA条码或输入RMA号" @keyup.enter.native="searchRmaList" ref="scanRmaRef" class="rma-input" />
+        <!-- RMA明细选择 -->
+        <div v-if="rmaList.length > 0" class="rma-list">
+          <el-form>
+            <el-row v-for="(rmaDetail, index) in rmaList[0].detailList" :key="index" :class="index < rmaList.length - 1 ? 'bottom-line-row' : ''">
+              <el-col :span="8">
+                <el-form-item label="物料"><span>{{ rmaDetail.partNo }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="批号"><span>{{ rmaDetail.batchNo }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="数量"><span>{{ rmaDetail.processQty }}</span></el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-button type="primary" size="mini" @click="addToReturnList(rmaDetail)" :disabled="isInReturnList(rmaDetail)">添加到退货明细</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- 退货明细列表 -->
+        <div v-if="returnList.length > 0">
+          <div class="return-list-title">退货明细列表</div>
+          <div v-for="(detail, dIdx) in returnList" :key="dIdx" class="detail-block">
+            <el-card shadow="hover" class="detail-card">
+              <div slot="header" class="detail-header">
+                <span>明细{{ dIdx + 1 }}</span>
+                <el-button type="danger" icon="el-icon-delete" circle size="mini" @click="removeDetail(dIdx)" v-if="returnList.length > 1" style="float:right;"></el-button>
+              </div>
+              <el-form label-position="top" class="detail-form">
+                <el-row :gutter="10">
+                  <el-col :span="12"><el-form-item label="物料"><el-input v-model="detail.partNo" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="数量"><el-input v-model="detail.processQty" type="number" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="批号"><el-input v-model="detail.batchNo" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="库位"><el-input v-model="detail.locationNo" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="仓库"><el-input v-model="detail.warehouseId" size="small" /></el-form-item></el-col>
+                </el-row>
+                <!-- 包装单元 -->
+                <div class="pack-unit-area">
+                  <div class="pack-title">包装单元</div>
+                  <div v-for="(pack, pIdx) in detail.packUnitList" :key="pIdx" class="pack-block">
+                    <el-row :gutter="10">
+                      <el-col :span="6"><el-input v-model="pack.code" placeholder="编码" size="small" /></el-col>
+                      <el-col :span="6"><el-input v-model="pack.qty" placeholder="数量" type="number" size="small" /></el-col>
+                      <el-col :span="6"><el-input v-model="pack.perQty" placeholder="单包数量" type="number" size="small" /></el-col>
+                      <el-col :span="4"><el-input v-model="pack.packageQty" placeholder="包数" type="number" size="small" /></el-col>
+                      <el-col :span="2">
+                        <el-button type="danger" icon="el-icon-delete" circle size="mini" @click="removePackUnit(detail, pIdx)"></el-button>
+                      </el-col>
+                    </el-row>
+                  </div>
+                  <el-button type="primary" size="mini" icon="el-icon-plus" @click="addPackUnit(detail)" class="add-pack-btn">添加包装单元</el-button>
+                </div>
+              </el-form>
+            </el-card>
+          </div>
+          <el-button type="success" class="submit-btn" @click="submitReturn">提交</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRmaList, processReturn } from "@/api/sales-return/sales-return.js";
+export default {
+  data() {
+    return {
+      scanRma: "",
+      rmaList: [],
+      returnList: [] // 退货明细列表
+    };
+  },
+  methods: {
+    handleBack() {
+      this.$router.back();
+    },
+    searchRmaList() {
+      if (!this.scanRma) return (this.rmaList = []);
+      getRmaList({ rmaNo: this.scanRma }).then(({ data }) => {
+        if (data.code === 0) this.rmaList = data.rows;
+      });
+    },
+    addToReturnList(rmaDetail) {
+      // 避免重复添加
+      if (this.isInReturnList(rmaDetail)) return;
+      this.returnList.push({
+        site: "1",
+        partNo: rmaDetail.partNo,
+        processQty: rmaDetail.processQty,
+        batchNo: rmaDetail.batchNo,
+        locationNo: "",
+        warehouseId: "",
+        packUnitList: []
+      });
+    },
+    isInReturnList(rmaDetail) {
+      return this.returnList.some(
+        d => d.partNo === rmaDetail.partNo && d.batchNo === rmaDetail.batchNo
+      );
+    },
+    removeDetail(idx) {
+      this.returnList.splice(idx, 1);
+    },
+    addPackUnit(detail) {
+      detail.packUnitList.push({code: "", qty: '', perQty: '', packageQty: ''});
+    },
+    removePackUnit(detail, idx) {
+      detail.packUnitList.splice(idx, 1);
+    },
+    submitReturn() {
+      if (!this.scanRma || this.returnList.length === 0) {
+        this.$message.error("请先扫描RMA号并选择退货明细");
+        return;
+      }
+      processReturn({
+        rmaNo: this.scanRma,
+        processType: "inbound",
+        detailList: this.returnList
+      }).then(({data}) => {
+        if (data.code === 0) {
+          this.$message.success("操作成功");
+          this.scanRma = "";
+          this.rmaList = [];
+          this.returnList = [];
+        } else {
+          this.$message.error(data.msg);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.$nextTick(() => this.$refs.scanRmaRef && this.$refs.scanRmaRef.focus());
+  }
+};
+</script>
+
+<style scoped>
+.pda-container {
+  background: #f5f5f5;
+  min-height: 100vh;
+}
+
+.status-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #409EFF;
+  color: #fff;
+  padding: 8px 12px;
+}
+
+.goBack {
+  cursor: pointer;
+}
+
+.main-content {
+  padding: 10px 6px 30px 6px;
+}
+
+.rma-input {
+  margin-bottom: 12px;
+}
+
+.rma-list {
+  margin-bottom: 18px;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 8px #e6e6e6;
+  padding: 10px;
+}
+
+.return-list-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #409EFF;
+  margin: 12px 0 8px 0;
+}
+
+.detail-block {
+  margin-bottom: 18px;
+}
+
+.detail-card {
+  border-radius: 10px;
+  box-shadow: 0 2px 12px #e0e7ef;
+}
+
+.detail-header {
+  font-weight: bold;
+  font-size: 15px;
+  color: #333;
+  border-left: 4px solid #409EFF;
+  padding-left: 8px;
+}
+
+.detail-form {
+  padding: 6px 0 0 0;
+}
+
+.pack-unit-area {
+  background: #f8fafd;
+  border-radius: 6px;
+  padding: 8px 6px 6px 6px;
+  margin-top: 8px;
+}
+
+.pack-title {
+  font-weight: bold;
+  color: #666;
+  margin-bottom: 4px;
+}
+
+.pack-block {
+  margin-bottom: 6px;
+}
+
+.add-pack-btn {
+  margin-top: 4px;
+}
+
+.submit-btn {
+  width: 100%;
+  font-size: 16px;
+  margin-top: 18px;
+}
+
+.bottom-line-row {
+  border-bottom: 1px solid #eee;
+}
+</style>
diff --git a/src/views/modules/sales-return/sales-return-scrap.vue b/src/views/modules/sales-return/sales-return-scrap.vue
new file mode 100644
index 0000000..6cf95d8
--- /dev/null
+++ b/src/views/modules/sales-return/sales-return-scrap.vue
@@ -0,0 +1,133 @@
+<template>
+  <div>
+    <div class="pda-container">
+      <div class="status-bar">
+        <div class="goBack" @click="handleBack"><i class="el-icon-arrow-left"></i>上一页</div>
+        <div class="goBack">销售退货-报废</div>
+        <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
+      </div>
+      <div class="main-content">
+        <!-- RMA号输入/扫描 -->
+        <el-input v-model="scanRma" placeholder="扫描RMA条码或输入RMA号" @keyup.enter.native="searchRmaList" ref="scanRmaRef" class="rma-input" />
+        <!-- RMA明细选择 -->
+        <div v-if="rmaList.length > 0" class="rma-list">
+          <el-form>
+            <el-row v-for="(rmaDetail, index) in rmaList[0].detailList" :key="index" :class="index < rmaList.length - 1 ? 'bottom-line-row' : ''">
+              <el-col :span="8"><el-form-item label="物料"><span>{{ rmaDetail.partNo }}</span></el-form-item></el-col>
+              <el-col :span="8"><el-form-item label="批号"><span>{{ rmaDetail.batchNo }}</span></el-form-item></el-col>
+              <el-col :span="8"><el-form-item label="数量"><span>{{ rmaDetail.processQty }}</span></el-form-item></el-col>
+              <el-col :span="24"><el-form-item label="描述"><span>{{ rmaDetail.desc }}</span></el-form-item></el-col>
+              <el-col :span="24">
+                <el-button type="primary" size="mini" @click="addToReturnList(rmaDetail)" :disabled="isInReturnList(rmaDetail)">添加到退货明细</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- 退货明细列表 -->
+        <div v-if="returnList.length > 0">
+          <div class="return-list-title">退货明细列表</div>
+          <div v-for="(detail, dIdx) in returnList" :key="dIdx" class="detail-block">
+            <el-card shadow="hover" class="detail-card">
+              <div slot="header" class="detail-header">
+                <span>明细{{ dIdx + 1 }}</span>
+                <el-button type="danger" icon="el-icon-delete" circle size="mini" @click="removeDetail(dIdx)" v-if="returnList.length > 1" style="float:right;"></el-button>
+              </div>
+              <el-form label-position="top" class="detail-form">
+                <el-row :gutter="10">
+                  <el-col :span="12"><el-form-item label="物料"><el-input v-model="detail.partNo" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="数量"><el-input v-model="detail.processQty" type="number" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="批号"><el-input v-model="detail.batchNo" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="库位"><el-input v-model="detail.locationNo" size="small" /></el-form-item></el-col>
+                  <el-col :span="12"><el-form-item label="仓库"><el-input v-model="detail.warehouseId" size="small" /></el-form-item></el-col>
+                </el-row>
+              </el-form>
+            </el-card>
+          </div>
+          <el-button type="success" class="submit-btn" @click="submitReturn">提交</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRmaList, processReturn } from "@/api/sales-return/sales-return.js";
+export default {
+  data() {
+    return {
+      scanRma: "",
+      rmaList: [],
+      returnList: []
+    };
+  },
+  methods: {
+    handleBack() {
+      this.$router.back();
+    },
+    searchRmaList() {
+      if (!this.scanRma) return (this.rmaList = []);
+      getRmaList({ rmaNo: this.scanRma }).then(({ data }) => {
+        if (data.code === 0) this.rmaList = data.rows;
+      });
+    },
+    addToReturnList(rmaDetail) {
+      if (this.isInReturnList(rmaDetail)) return;
+      this.returnList.push({
+        site: "1",
+        partNo: rmaDetail.partNo,
+        processQty: rmaDetail.processQty,
+        batchNo: rmaDetail.batchNo,
+        locationNo: "",
+        warehouseId: ""
+      });
+    },
+    isInReturnList(rmaDetail) {
+      return this.returnList.some(
+        d => d.partNo === rmaDetail.partNo && d.batchNo === rmaDetail.batchNo
+      );
+    },
+    removeDetail(idx) {
+      this.returnList.splice(idx, 1);
+    },
+    submitReturn() {
+      if (!this.scanRma || this.returnList.length === 0) {
+        this.$message.error("请先扫描RMA号并选择退货明细");
+        return;
+      }
+      processReturn({
+        rmaNo: this.scanRma,
+        processType: "scrap",
+        detailList: this.returnList
+      }).then(({ data }) => {
+        if (data.code === 0) {
+          this.$message.success("操作成功");
+          this.scanRma = "";
+          this.rmaList = [];
+          this.returnList = [];
+        } else {
+          this.$message.error(data.msg);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.$nextTick(() => this.$refs.scanRmaRef && this.$refs.scanRmaRef.focus());
+  }
+};
+</script>
+
+<style scoped>
+.pda-container { background: #f5f5f5; min-height: 100vh; }
+.status-bar { display: flex; justify-content: space-between; align-items: center; background: #409EFF; color: #fff; padding: 8px 12px; }
+.goBack { cursor: pointer; }
+.main-content { padding: 10px 6px 30px 6px; }
+.rma-input { margin-bottom: 12px; }
+.rma-list { margin-bottom: 18px; background: #fff; border-radius: 8px; box-shadow: 0 2px 8px #e6e6e6; padding: 10px; }
+.return-list-title { font-size: 16px; font-weight: bold; color: #409EFF; margin: 12px 0 8px 0; }
+.detail-block { margin-bottom: 18px; }
+.detail-card { border-radius: 10px; box-shadow: 0 2px 12px #e0e7ef; }
+.detail-header { font-weight: bold; font-size: 15px; color: #333; border-left: 4px solid #409EFF; padding-left: 8px; }
+.detail-form { padding: 6px 0 0 0; }
+.submit-btn { width: 100%; font-size: 16px; margin-top: 18px; }
+.bottom-line-row { border-bottom: 1px solid #eee; }
+</style>