diff --git a/src/api/outsourcing/outsourcing.js b/src/api/outsourcing/outsourcing.js
new file mode 100644
index 0000000..7619873
--- /dev/null
+++ b/src/api/outsourcing/outsourcing.js
@@ -0,0 +1,4 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 获取委外订单信息
+export const getOutsourceOrderInfo = data => createAPI(`/pda/outsourcing/issue/getOutsourceOrderInfo`,'post',data)
\ No newline at end of file
diff --git a/src/api/production/production-return.js b/src/api/production/production-return.js
index c9e1051..4110243 100644
--- a/src/api/production/production-return.js
+++ b/src/api/production/production-return.js
@@ -1,8 +1,11 @@
 
 import { createAPI } from "@/utils/httpRequest.js";
 
+// 获取工单信息
+export const getReturnWorkOrderInfo = data => createAPI(`/pda/production/return/getReturnWorkOrderInfo`,'post',data)
 
-export const getWorkOrderMaterials = data => createAPI(`/pda/production/issue/getWorkOrderMaterials`,'post',data)
+export const getIssueForShopOrder = data => createAPI(`/pda/production/return/getIssueForShopOrder`,'post',data)
+export const getInventoryPart = data => createAPI(`/pda/production/return/getInventoryPart`,'post',data)
 
 export const parseMaterialLabel = data => createAPI(`/pda/production/issue/parseMaterialLabel`,'post',data)
 export const  directReturn = data => createAPI(`/pda/production/issue/directReturn`,'post',data)
diff --git a/src/router/index.js b/src/router/index.js
index ea48de5..5f585ee 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -51,7 +51,9 @@ const globalRoutes = [
 //生产退料
   {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-return/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/productionReturnPicking", name: "productionReturnPicking", component: resolve => require(["@/views/modules/production-return/productionReturnPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
-  {path: "/productionReturnPickingDetail/:orderNo/:orderType", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  {path: "/productionReturnIssueList", name: "productionReturnIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  {path: "/productionReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  {path: "/productionReturnPDA", name: "productionReturnPDA", component: resolve => require(["@/views/modules/production-return/productionReturnPDA.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: '/production-return/pick/:orderNo',
     name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-return/pick.vue"], resolve),
     meta: { transition: 'instant' ,preload: true,keepAlive: true}},
@@ -62,7 +64,9 @@ const globalRoutes = [
   {path: "/inboundRegister",name: "inboundRegister", component: resolve => require(["@/views/modules/production-inbound/inboundRegister.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/inboundRegisterDetail/:inboundNo",name: "inboundRegisterDetail", component: resolve => require(["@/views/modules/production-inbound/inboundRegisterDetail.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}},
+  { path:"/outsourcingDirectIssue",name:"outsourcingDirectIssue",component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingDirectIssue.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   { path: "/outsourcingPicking", name: "outsourcingPicking", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   { path: "/outsourcingPickingDetail/:outsourcingNo", name: "outsourcingPickingDetail", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
 
diff --git a/src/views/modules/outsourcing-issue/index.vue b/src/views/modules/outsourcing-issue/index.vue
index 2a22000..1433f6c 100644
--- a/src/views/modules/outsourcing-issue/index.vue
+++ b/src/views/modules/outsourcing-issue/index.vue
@@ -35,7 +35,7 @@ export default {
           icon: "scan",
           label: "直接发料",
           iconClass: "direct",
-          to: "outsourcingPicking",
+          to: "outsourcingDirectIssue",
           disabled: false,
         },
         {
diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue
new file mode 100644
index 0000000..9fbbdd6
--- /dev/null
+++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue
@@ -0,0 +1,481 @@
+<template>
+  <div class="pda-container">
+    <!-- 头部栏 -->
+    <div class="header-bar">
+      <div class="header-left" @click="$router.back()">
+        <i class="el-icon-arrow-left"></i>
+        <span>委外直接发料</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
+
+    <!-- 委外订单输入 -->
+    <div class="search-container">
+      <el-input
+        clearable
+        v-model="outsourcingNo"
+        placeholder="请输入委外订单号"
+        prefix-icon="el-icon-search"
+        @keyup.enter.native="handleSearchOrder"
+        ref="orderInput"
+      />
+    </div>
+
+    <!-- 委外订单卡片列表 -->
+    <div class="work-order-list" v-if="orderList.length > 0">
+      <div
+        v-for="(order, index) in orderList"
+        :key="index"
+        class="work-order-card"
+        @click="selectOrder(order)"
+      >
+        <div class="card-title">
+          <span class="title-label">委外订单号：{{ order.poNumber }}</span>
+          <span class="title-value">{{ order.supplierName || order.supplierNo || '-' }}</span>
+        </div>
+
+        <div class="part-desc-row">
+          <span class="desc-text">申请单：{{ order.requestNo || '-' }}</span>
+        </div>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">计划数量</div>
+            <div class="detail-value">{{ order.qty || 0 }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">已发数量</div>
+            <div class="detail-value">{{ order.recvQty || 0 }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ order.uom || '个' }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 材料列表 -->
+    <div class="content-area" v-if="selectedOrder && materialList.length > 0">
+      <div
+        v-for="(material, index) in materialList"
+        :key="index"
+        class="material-card"
+        @click="selectMaterial(material)"
+      >
+        <div class="card-title">
+          <span class="title-label"
+            >物料编码：{{ material.partNo }} &nbsp;&nbsp; 行号：{{
+              material.lineNo || index + 1
+            }}</span
+          >
+        </div>
+
+        <div class="part-desc-row">
+          <span class="desc-text">{{ material.partDesc || material.materialDesc }}</span>
+        </div>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">需求数量</div>
+            <div class="detail-value">{{ material.qty || material.requiredQty || 0 }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">已发数量</div>
+            <div class="detail-value">{{ material.issuedQty || material.pickedQty || 0 }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ material.uom || '个' }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 空状态 -->
+    <div v-if="selectedOrder && materialList.length === 0" class="empty-state">
+      <i class="el-icon-box"></i>
+      <p>该委外订单暂无材料清单</p>
+    </div>
+
+    <!-- 加载状态 -->
+    <div v-if="loading" class="loading-state">
+      <i class="el-icon-loading"></i>
+      <p>加载中...</p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getOutsourceOrderInfo } from '@/api/outsourcing/outsourcing.js'
+import moment from 'moment'
+
+export default {
+  data() {
+    return {
+      outsourcingNo: '',
+      orderList: [],
+      selectedOrder: null,
+      materialList: [],
+      loading: false,
+    }
+  },
+  methods: {
+    formatDate(date) {
+      return date ? moment(date).format('YYYY-MM-DD') : ''
+    },
+    // 查询委外订单
+    handleSearchOrder() {
+      if (!this.outsourcingNo.trim()) {
+        this.$message.warning('请输入委外订单号')
+        return
+      }
+      this.loading = true
+      const params = {
+        site: this.$store.state.user.site,
+        poNumber: this.outsourcingNo.trim(),
+      }
+      getOutsourceOrderInfo(params)
+        .then(({ data }) => {
+          this.loading = false
+          if (data && data.code === 0) {
+            // 将列表规范为订单列表
+            this.orderList = (data.rows || []).map((row) => ({
+              poNumber: row.poNumber || row.notifyNo,
+              requestNo: row.workOrderNo || row.relatedNo,
+              qty: row.qty,
+              recvQty: row.recvQty || 0,
+              uom: row.uom,
+              supplierName: row.supplierName,
+              supplierNo: row.supplierNo,
+            }))
+            this.selectedOrder = null
+            this.materialList = []
+            if (this.orderList.length === 0) {
+              this.$message.warning('未找到该委外订单')
+            }
+          } else {
+            this.$message.error(data.msg || '查询失败')
+            this.orderList = []
+            this.selectedOrder = null
+            this.materialList = []
+          }
+        })
+        .catch((error) => {
+          this.loading = false
+          console.error('查询委外订单失败:', error)
+          this.$message.error('查询失败')
+        })
+    },
+    // 选择订单
+    selectOrder(order) {
+      this.selectedOrder = order
+      this.loadMaterialList()
+    },
+    // 加载材料清单（通过 poNumber 拉取明细行）
+    loadMaterialList() {
+      if (!this.selectedOrder) {
+        this.materialList = []
+        return
+      }
+      const params = {
+        site: this.$store.state.user.site,
+        poNumber: this.selectedOrder.poNumber,
+      }
+      getOutsourceOrderInfo(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.materialList = (data.rows || []).map((item, index) => ({
+              id: index + 1,
+              partNo: item.partNo || item.materialCode,
+              partDesc: item.partDesc || item.materialDesc,
+              qty: item.qty || item.requiredQty,
+              issuedQty: item.recvQty || item.pickedQty || 0,
+              uom: item.uom,
+              lineNo: item.lineNo || item.lineNum,
+            }))
+          } else {
+            this.$message.error(data.msg || '获取材料清单失败')
+            this.materialList = []
+          }
+        })
+        .catch((error) => {
+          console.error('获取材料清单失败:', error)
+          this.$message.error('获取材料清单失败')
+        })
+    },
+    // 选择材料，跳转到扫描明细页
+    selectMaterial(material) {
+      this.$router.push({
+        name: 'outsourcingDirectIssueDetail',
+        params: {
+          outsourcingNo: this.selectedOrder.poNumber,
+          partNo: material.partNo,
+          partDesc: material.partDesc || '',
+          requiredQty: material.qty || 0,
+          issuedQty: material.issuedQty || 0,
+        },
+      })
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      if (this.$refs.orderInput) {
+        this.$refs.orderInput.focus()
+      }
+    })
+  },
+}
+</script>
+
+<style scoped>
+.pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+}
+
+.header-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 16px;
+  background: #17b3a3;
+  color: white;
+  height: 40px;
+  min-height: 40px;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.header-left i {
+  margin-right: 8px;
+  font-size: 18px;
+}
+
+.header-right {
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.search-container {
+  padding: 12px 16px;
+  background: white;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.search-container .el-input {
+  flex: 1;
+}
+
+.work-order-list {
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+
+.work-order-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+
+.work-order-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.work-order-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.work-order-card:active {
+  transform: translateY(0);
+}
+
+.content-area {
+  flex: 1;
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+
+.material-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+
+.material-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.material-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.material-card:active {
+  transform: translateY(0);
+}
+
+.card-title {
+  margin-bottom: 12px;
+}
+
+.title-label {
+  font-size: 12px;
+  color: #666;
+  display: block;
+  margin-bottom: 4px;
+}
+
+.title-value {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-left: 16px;
+}
+
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+
+.desc-text {
+  font-size: 12px;
+  color: #666;
+  line-height: 1.3;
+  word-break: break-all;
+}
+
+.card-details {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 4px;
+}
+
+.detail-item {
+  flex: 1;
+  text-align: center;
+  min-width: 50px;
+  max-width: 70px;
+}
+
+.detail-label {
+  font-size: 11px;
+  color: #666;
+  margin-bottom: 4px;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+
+.detail-value {
+  font-size: 13px;
+  color: #333;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #999;
+}
+
+.empty-state i {
+  font-size: 48px;
+  margin-bottom: 16px;
+}
+
+.empty-state p {
+  font-size: 14px;
+  margin: 0;
+}
+
+.loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #17b3a3;
+}
+
+.loading-state i {
+  font-size: 24px;
+  margin-bottom: 12px;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.loading-state p {
+  font-size: 14px;
+  margin: 0;
+}
+
+@media (max-width: 360px) {
+  .header-bar {
+    padding: 8px 12px;
+  }
+  .search-container {
+    padding: 8px 12px;
+  }
+  .work-order-list {
+    padding: 8px 12px;
+  }
+  .work-order-card {
+    padding: 12px;
+  }
+  .content-area {
+    padding: 8px 12px;
+  }
+  .material-card {
+    padding: 12px;
+  }
+  .card-details {
+    flex-wrap: wrap;
+    gap: 6px;
+  }
+  .detail-item {
+    flex: 0 0 48%;
+    margin-bottom: 6px;
+    min-width: 50px;
+  }
+}
+</style>
+
+
diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue
new file mode 100644
index 0000000..8f56a22
--- /dev/null
+++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue
@@ -0,0 +1,478 @@
+<template>
+  <div class="pda-container">
+    <!-- 头部栏 -->
+    <div class="header-bar">
+      <div class="header-left" @click="$router.back()">
+        <i class="el-icon-arrow-left"></i>
+        <span>委外直接发料</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
+
+    <!-- 扫描框 -->
+    <div class="search-container">
+      <el-input clearable class="compact-input" v-model="scanCode" placeholder="请扫描材料纸质标签" prefix-icon="el-icon-search"
+        @keyup.enter.native="handleScan" ref="scanInput" />
+      <div class="mode-switch">
+        <el-switch class="custom-switch" v-model="isRemoveMode" active-color="#ff4949" inactive-color="#13ce66">
+        </el-switch>
+        <span v-if="isRemoveMode" class="switch-text">{{ '移除' }}</span>
+        <span v-else class="switch-text2">{{ '添加' }}</span>
+      </div>
+    </div>
+
+    <!-- 订单及物料信息 -->
+    <div class="work-order-list" v-if="outsourcingNo && componentPartNo">
+      <div class="work-order-card">
+        <div class="card-title">
+          <span class="title-label">委外订单号：{{ outsourcingNo }}</span>
+        </div>
+
+        <div class="part-desc-row">
+          <span class="desc-text">物料编码：{{ componentPartNo }}</span>
+        </div>
+        <div class="part-desc-row">
+          <span class="desc-text">物料名称：{{ componentPartDesc }}</span>
+        </div>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">需求数量</div>
+            <div class="detail-value">{{ requiredQty }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">已发数量</div>
+            <div class="detail-value">{{ issuedQty }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">本次</div>
+            <div class="detail-value">{{ totalScannedQty }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="section-title">
+      <div class="title-left">
+        <i class="el-icon-circle-check"></i>
+        <span>发料信息确认</span>
+      </div>
+    </div>
+
+    <!-- 标签列表 -->
+    <div class="label-list">
+      <div class="list-header">
+        <div class="col-no">NO.</div>
+        <div class="col-label">标签条码</div>
+        <div class="col-batch">仓库</div>
+        <div class="col-batch">批次号</div>
+        <div class="col-qty">数量</div>
+      </div>
+
+      <div v-for="(label, index) in scannedLabels" :key="label.id" class="list-item">
+        <div class="col-no">{{ index+1 }}</div>
+        <div class="col-label">{{ label.labelCode }}</div>
+        <div class="col-batch">{{label.warehouseId}}</div>
+        <div class="col-batch">{{ label.batchNo || '-' }}</div>
+        <div class="col-qty">{{ label.quantity }}</div>
+      </div>
+
+      <div v-if="scannedLabels.length === 0" class="empty-labels">
+        <p>暂无扫描标签</p>
+      </div>
+    </div>
+
+    <!-- 底部操作按钮 -->
+    <div class="bottom-actions">
+      <button class="action-btn secondary" @click="confirmIssue" :disabled="scannedLabels.length === 0">
+        确定
+      </button>
+      <button class="action-btn secondary" style="margin-left: 10px;">
+        打印
+      </button>
+      <button class="action-btn secondary" style="margin-left: 10px;" @click="clearScannedLabels">
+        清空
+      </button>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import moment from 'moment'
+
+export default {
+  data() {
+    return {
+      scanCode: '',
+      isRemoveMode: false,
+      scannedLabels: [],
+      outsourcingNo: '',
+      componentPartNo: '',
+      componentPartDesc: '',
+      requiredQty: 0,
+      issuedQty: 0,
+    }
+  },
+  computed: {
+    totalScannedQty() {
+      return this.scannedLabels.reduce((sum, l) => sum + (l.quantity || 0), 0)
+    },
+  },
+  methods: {
+    formatDate(date) {
+      return date ? moment(date).format('YYYY-MM-DD') : ''
+    },
+    handleScan() {
+      if (!this.scanCode.trim()) return
+      if (this.isRemoveMode) {
+        this.removeLabelByCode(this.scanCode.trim())
+      } else {
+        this.validateAndAddLabel(this.scanCode.trim())
+      }
+      this.scanCode = ''
+    },
+    // TODO: 接入委外标签校验API
+    validateAndAddLabel(labelCode) {
+      // 先允许录入，后续替换为接口校验
+      const exists = this.scannedLabels.find((item) => item.labelCode === labelCode)
+      if (exists) {
+        this.$message.warning('该标签已扫描，请勿重复扫描')
+        return
+      }
+      this.scannedLabels.push({
+        id: Date.now(),
+        labelCode,
+        componentPartNo: this.componentPartNo,
+        quantity: 1,
+        batchNo: '-',
+        warehouseId: '-',
+      })
+      this.$message.success('扫描成功')
+    },
+    removeLabelByCode(labelCode) {
+      const index = this.scannedLabels.findIndex((item) => item.labelCode === labelCode)
+      if (index !== -1) {
+        this.scannedLabels.splice(index, 1)
+        this.$message.success('移除成功')
+      } else {
+        this.$message.warning('未找到该标签')
+      }
+    },
+    clearScannedLabels() {
+      if (this.scannedLabels.length === 0) return
+      this.$confirm('确定清空所有已扫描的标签吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.scannedLabels = []
+          this.$message.success('已清空')
+        })
+        .catch(() => {})
+    },
+    confirmIssue() {
+      if (this.scannedLabels.length === 0) {
+        this.$message.warning('请先扫描材料标签')
+        return
+      }
+      // TODO: 调用委外直接发料确认API
+      this.$message.success('发料成功（示例）')
+      this.$router.back()
+    },
+    initFromRoute() {
+      this.outsourcingNo = this.$route.params.outsourcingNo
+      this.componentPartNo = this.$route.params.partNo
+      this.componentPartDesc = this.$route.params.partDesc || ''
+      this.requiredQty = Number(this.$route.params.requiredQty || 0)
+      this.issuedQty = Number(this.$route.params.issuedQty || 0)
+    },
+  },
+  mounted() {
+    this.initFromRoute()
+    this.$nextTick(() => {
+      if (this.$refs.scanInput) {
+        this.$refs.scanInput.focus()
+      }
+    })
+  },
+}
+</script>
+
+<style scoped>
+.pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+}
+.header-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 16px;
+  background: #17b3a3;
+  color: white;
+  height: 40px;
+  min-height: 40px;
+}
+.header-left {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+.header-left i {
+  margin-right: 8px;
+  font-size: 18px;
+}
+.header-right {
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+.search-container {
+  padding: 12px 16px;
+  background: white;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+.search-container .el-input {
+  width: 240px;
+  margin-right: 12px;
+}
+.compact-input ::v-deep .el-input__inner {
+  height: 36px;
+  padding: 0 12px 0 35px;
+  font-size: 14px;
+}
+.compact-input ::v-deep .el-input__prefix {
+  left: 10px;
+}
+.compact-input ::v-deep .el-input__suffix {
+  right: 30px;
+}
+.mode-switch {
+  position: relative;
+  display: inline-block;
+}
+.custom-switch {
+  transform: scale(1.3);
+}
+.switch-text {
+  position: absolute;
+  left: 25%;
+  transform: translateX(-50%);
+  top: 50%;
+  transform: translateY(-50%) translateX(-50%);
+  font-size: 12px;
+  font-weight: 500;
+  color: #606266;
+  white-space: nowrap;
+  pointer-events: none;
+  z-index: 1;
+  top: 53%;
+  transform: translate(-50%, -50%);
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+  pointer-events: none;
+  z-index: 2;
+}
+.switch-text2 {
+  position: absolute;
+  left: 75%;
+  transform: translateX(-50%);
+  top: 50%;
+  transform: translateY(-50%) translateX(-50%);
+  font-size: 12px;
+  font-weight: 500;
+  color: #606266;
+  white-space: nowrap;
+  pointer-events: none;
+  z-index: 1;
+  top: 53%;
+  transform: translate(-50%, -50%);
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+  pointer-events: none;
+  z-index: 2;
+}
+.custom-switch ::v-deep .el-switch__core {
+  width: 60px;
+  height: 28px;
+}
+.work-order-list {
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+.work-order-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+.work-order-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+.work-order-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+.work-order-card:active {
+  transform: translateY(0);
+}
+.card-title {
+  margin-bottom: 12px;
+}
+.title-label {
+  font-size: 12px;
+  color: #666;
+  display: block;
+  margin-bottom: 4px;
+}
+.title-value {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-left: 20px;
+}
+.section-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 8px;
+  background: white;
+  margin: 0 16px;
+  margin-top: 4px;
+  border-radius: 8px 8px 0 0;
+  border-bottom: 2px solid #17B3A3;
+}
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+.desc-text {
+  font-size: 12px;
+  color: #666;
+  line-height: 1.3;
+  word-break: break-all;
+}
+.card-details {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 4px;
+}
+.detail-item {
+  flex: 1;
+  text-align: center;
+  min-width: 50px;
+  max-width: 70px;
+}
+.detail-label {
+  font-size: 11px;
+  color: #666;
+  margin-bottom: 4px;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+.detail-value {
+  font-size: 13px;
+  color: #333;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+.label-list {
+  background: white;
+  margin: 0 16px 12px;
+  border-radius: 8px;
+  overflow: hidden;
+}
+.list-header {
+  display: flex;
+  background: #f8f9fa;
+  padding: 12px 8px;
+  border-bottom: 1px solid #e0e0e0;
+  font-size: 12px;
+  color: #666;
+  font-weight: 500;
+}
+.list-item {
+  display: flex;
+  padding: 12px 8px;
+  border-bottom: 1px solid #f0f0f0;
+  font-size: 12px;
+  color: #333;
+}
+.list-item:last-child {
+  border-bottom: none;
+}
+.col-no {
+  width: 20px;
+  text-align: center;
+}
+.col-label {
+  flex: 2;
+  text-align: center;
+}
+.col-batch {
+  flex: 1;
+  text-align: center;
+}
+.col-qty {
+  width: 60px;
+  text-align: center;
+}
+.empty-labels {
+  padding: 40px 20px;
+  text-align: center;
+  color: #999;
+}
+.bottom-actions {
+  display: flex;
+  padding: 16px;
+  gap: 20px;
+  background: white;
+  margin-top: auto;
+}
+.action-btn {
+  flex: 1;
+  padding: 12px;
+  border: 1px solid #17b3a3;
+  background: white;
+  color: #17b3a3;
+  border-radius: 20px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+.action-btn:hover {
+  background: #17b3a3;
+  color: white;
+}
+.action-btn:active {
+  transform: scale(0.98);
+}
+@media (max-width: 360px) {
+  .header-bar { padding: 8px 12px; }
+  .search-container { padding: 8px 12px; }
+  .work-order-list { padding: 8px 12px; }
+  .work-order-card { padding: 12px; }
+  .card-details { flex-wrap: wrap; gap: 6px; }
+  .detail-item { flex: 0 0 48%; margin-bottom: 6px; min-width: 50px; }
+  .label-list { margin: 0 12px 8px; }
+}
+</style>
+
+
diff --git a/src/views/modules/production-issue/directIssue.vue b/src/views/modules/production-issue/directIssue.vue
index ac41184..c50939d 100644
--- a/src/views/modules/production-issue/directIssue.vue
+++ b/src/views/modules/production-issue/directIssue.vue
@@ -30,7 +30,7 @@
         @click="selectWorkOrder(workOrder)"
       >
         <div class="card-title">
-          <span class="title-label">工单号：{{ workOrder.orderNo }}</span>
+          <span class="title-label">工单号：{{ workOrder.orderNo }}-{{workOrder.releaseNo}}-{{workOrder.sequenceNo}}</span>
           <span class="title-value">{{ workOrder.partNo }}</span>
         </div>
 
@@ -70,7 +70,7 @@
         <div class="card-title">
           <span class="title-label"
             >物料编码：{{ material.componentPartNo }} &nbsp;&nbsp; 行号：{{
-              material.lineNo || index + 1
+              material.lineItemNo
             }}</span
           >
           <!-- <span class="title-value">{{ material.componentPartNo }}</span> -->
@@ -226,7 +226,7 @@ export default {
       this.$router.push({
         name: "directIssueDetail",
         params: {
-          workOrderNo: this.selectedWorkOrder.orderNo,
+          workOrderNo: this.selectedWorkOrder.orderNo+'-'+this.selectedWorkOrder.releaseNo+'-'+this.selectedWorkOrder.sequenceNo,
           partNo: material.componentPartNo,
           partDesc: material.componentPartDesc,
           requiredQty: material.qtyRequired,
diff --git a/src/views/modules/production-issue/directIssueDetail.vue b/src/views/modules/production-issue/directIssueDetail.vue
index 76996e1..f90434a 100644
--- a/src/views/modules/production-issue/directIssueDetail.vue
+++ b/src/views/modules/production-issue/directIssueDetail.vue
@@ -23,7 +23,7 @@
       </div>
     </div>
 
-    <!-- 工单及物料信息 -->
+    <!-- 工单物料信息 -->
     <div class="work-order-list" v-if="workOrderNo && componentPartNo">
       <div class="work-order-card">
         <div class="card-title">
@@ -88,11 +88,11 @@
       <button class="action-btn secondary" @click="confirmIssue" :disabled="scannedLabels.length === 0">
         确定
       </button>
-      <button class="action-btn secondary" style="margin-left: 10px;">
+      <!-- <button class="action-btn secondary" style="margin-left: 10px;">
         打印
-      </button>
+      </button> -->
       <button class="action-btn secondary" style="margin-left: 10px;" @click="clearScannedLabels">
-        清空
+        取消
       </button>
     </div>
   </div>
@@ -139,7 +139,7 @@ export default {
     },
     validateAndAddLabel(labelCode) {
       const params = {
-        labelCode,
+        scannedLabel: labelCode,
         workOrderNo: this.workOrderNo,
         componentPartNo: this.componentPartNo,
         site: this.$store.state.user.site,
@@ -187,31 +187,40 @@ export default {
       }
     },
     clearScannedLabels() {
-      if (this.scannedLabels.length === 0) return
-      this.$confirm('确定清空所有已扫描的标签吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          this.scannedLabels = []
-          this.$message.success('已清空')
+      if (this.scannedLabels.length > 0) {
+        this.$confirm('确定清空所有已扫描的标签吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         })
-        .catch(() => {})
+          .then(() => {
+            this.scannedLabels = []
+            this.$router.back()
+            this.$message.success('已清空')
+          })
+          .catch(() => {})
+      } else {
+        this.$router.back()
+      }
     },
     confirmIssue() {
       if (this.scannedLabels.length === 0) {
         this.$message.warning('请先扫描材料标签')
         return
       }
+      console.log('1231', localStorage.getItem('userName'))
+
       const params = {
         site: this.$store.state.user.site,
         workOrderNo: this.workOrderNo,
         componentPartNo: this.componentPartNo,
-        labels: this.scannedLabels.map((l) => ({
+        operatorName: localStorage.getItem('userName'),
+        selectedMaterials: this.scannedLabels.map((l, i) => ({
+          itemNo: i + 1,
           labelCode: l.labelCode,
-          quantity: l.quantity,
+          issueQty: l.quantity,
           batchNo: l.batchNo,
+          warehouseId: l.warehouseId,
           materialCode: l.materialCode,
         })),
       }
@@ -421,7 +430,7 @@ export default {
   margin: 0 16px;
   margin-top: 4px;
   border-radius: 8px 8px 0 0;
-  border-bottom: 2px solid #17B3A3;
+  border-bottom: 2px solid #17b3a3;
 }
 
 /* 物料描述行 */
diff --git a/src/views/modules/production-return/production.vue b/src/views/modules/production-return/production.vue
index 7ce0168..2c61b67 100644
--- a/src/views/modules/production-return/production.vue
+++ b/src/views/modules/production-return/production.vue
@@ -32,7 +32,7 @@ export default {
     return {
       buttons: [
         { icon: 'scan', label: '直接退料', iconClass: 'direct', to: 'productionReturnPicking', disabled: false },
-        { icon: 'records', label: '申请单退料', iconClass: 'request', to: 'productionReturnPicking', disabled: false },
+        { icon: 'records', label: '申请单退料', iconClass: 'request', to: 'productionReturnPDA', disabled: false },
         { icon: 'logistics', label: '移库退料', iconClass: 'move', to: 'productionReturnPicking', disabled: true },
         { icon: 'revoke', label: '退料撤销', iconClass: 'cancel', to: 'productionReturnPicking', disabled: true },
       ]
diff --git a/src/views/modules/production-return/productionReturnIssueList.vue b/src/views/modules/production-return/productionReturnIssueList.vue
new file mode 100644
index 0000000..36efc95
--- /dev/null
+++ b/src/views/modules/production-return/productionReturnIssueList.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="pda-container">
+    <!-- 头部栏 -->
+    <div class="header-bar">
+      <div class="header-left" @click="$router.back()">
+        <i class="el-icon-arrow-left"></i>
+        <span>退仓 - 领料记录</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
+
+    <div class="content-area">
+      <div class="work-order-list" v-if="issueList.length > 0">
+        <div
+          v-for="(item, index) in issueList"
+          :key="index"
+          class="material-card"
+          @click="goDetail(item)"
+        >
+          <div class="card-title">
+            <span class="title-label">
+              物料编码：{{ partNo }} &nbsp;&nbsp; 领料号：{{ item.TRANSACTION_ID }}
+            </span>
+          </div>
+          <div class="part-desc-row">
+            <span class="desc-text">批次号：{{ item.LOT_BATCH_NO || '-' }}</span>
+          </div>
+          <div class="card-details">
+            <div class="detail-item">
+              <div class="detail-label">领料数量</div>
+              <div class="detail-value">{{ item.QUANTITY }}</div>
+            </div>
+            <div class="detail-item">
+              <div class="detail-label">撤销数量</div>
+              <div class="detail-value">{{ item.QTY_REVERSED || 0 }}</div>
+            </div>
+            <div class="detail-item">
+              <div class="detail-label">单位</div>
+              <div class="detail-value">{{ item.uom || '个' }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div v-if="!loading && issueList.length === 0" class="empty-state">
+        <i class="el-icon-box"></i>
+        <p>暂无领料记录</p>
+      </div>
+
+      <div v-if="loading" class="loading-state">
+        <i class="el-icon-loading"></i>
+        <p>加载中...</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getIssueForShopOrder } from '@/api/production/production-return';
+
+export default {
+  data() {
+    return {
+      workOrderNo: '',
+      partNo: '',
+      loading: false,
+      issueList: [],
+    };
+  },
+  methods: {
+    loadIssueList() {
+      if (!this.workOrderNo || !this.partNo) {
+        return;
+      }
+      this.loading = true;
+      const params = {
+        workOrderNo: this.workOrderNo,
+        site: this.$store.state.user.site,
+        partNo: this.partNo,
+      };
+      getIssueForShopOrder(params)
+        .then(({ data }) => {
+          this.loading = false;
+          if (data && data.code === 0) {
+            this.issueList = data.issueForShopOrder || [];
+          } else {
+            this.$message.error(data.msg || '获取领料记录失败');
+            this.issueList = [];
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.$message.error('获取领料记录失败');
+        });
+    },
+    goDetail(item) {
+      this.$router.push({
+        name: 'productionReturnPickingDetail',
+        params: {
+          orderNo: this.workOrderNo,
+          orderType: 'workOrder',
+          partNo: this.partNo,
+          transactionId: item.TRANSACTION_ID,
+          quantity: item.QUANTITY,
+          batchNo: item.LOT_BATCH_NO,
+        },
+      });
+    },
+  },
+  mounted() {
+    this.workOrderNo = this.$route.params.workOrderNo;
+    this.partNo = this.$route.params.partNo;
+    this.loadIssueList();
+  },
+};
+</script>
+
+<style scoped>
+.pda-container { width: 100vw; height: 100vh; display: flex; flex-direction: column; background: #f5f5f5; }
+.header-bar { display: flex; justify-content: space-between; align-items: center; padding: 8px 16px; background: #17B3A3; color: white; height: 40px; min-height: 40px; }
+.header-left { display: flex; align-items: center; cursor: pointer; font-size: 16px; font-weight: 500; }
+.header-left i { margin-right: 8px; font-size: 18px; }
+.header-right { cursor: pointer; font-size: 16px; font-weight: 500; }
+.content-area { flex: 1; overflow-y: auto; padding: 12px 16px; }
+.work-order-list { overflow-y: auto; padding: 12px 16px; }
+.material-card { background: white; border-radius: 8px; margin-bottom: 12px; padding: 16px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); cursor: pointer; transition: all 0.2s ease; border: 2px solid transparent; }
+.material-card:hover { box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15); transform: translateY(-1px); }
+.material-card:active { transform: translateY(0); }
+.card-title { margin-bottom: 12px; }
+.title-label { font-size: 12px; color: #666; display: block; margin-bottom: 4px; }
+.part-desc-row { margin-bottom: 12px; padding: 0 4px; }
+.desc-text { font-size: 12px; color: #666; line-height: 1.3; word-break: break-all; }
+.card-details { display: flex; justify-content: space-between; align-items: flex-start; gap: 4px; }
+.detail-item { flex: 1; text-align: center; min-width: 50px; max-width: 70px; }
+.detail-label { font-size: 11px; color: #666; margin-bottom: 4px; line-height: 1.2; margin-left: -12px; }
+.detail-value { font-size: 13px; color: #333; line-height: 1.2; margin-left: -12px; }
+.empty-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 60px 20px; color: #999; }
+.empty-state i { font-size: 48px; margin-bottom: 16px; }
+.loading-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 60px 20px; color: #17B3A3; }
+.loading-state i { font-size: 24px; margin-bottom: 12px; animation: spin 1s linear infinite; }
+@keyframes spin { from { transform: rotate(0deg); } to { transform: rotate(360deg); } }
+</style>
+
+
diff --git a/src/views/modules/production-return/productionReturnPDA.vue b/src/views/modules/production-return/productionReturnPDA.vue
index 1ca8476..22088fe 100644
--- a/src/views/modules/production-return/productionReturnPDA.vue
+++ b/src/views/modules/production-return/productionReturnPDA.vue
@@ -1,29 +1,17 @@
 <template>
-  <div>
-    <div class="pda-container">
-      <div class="status-bar">
-        <div class="goBack" @click="goBack"><i class="el-icon-arrow-left"></i>上一页</div>
-        <div class="goBack">{{ functionTitle }}</div>
-        <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
+  <div class="pda-container">
+    <!-- 头部栏（对齐 productionReturnPicking.vue） -->
+    <div class="header-bar">
+      <div class="header-left" @click="goBack">
+        <i class="el-icon-arrow-left"></i>
+        <span>{{ functionTitle }}</span>
       </div>
-      <div style="overflow-y: auto">
-        <!-- 功能选择 -->
-        <div class="function-selector" v-if="!selectedFunction">
-          <div class="function-card" @click="selectFunction('direct')">
-            <div class="function-icon">📦</div>
-            <div class="function-title">直接退料</div>
-            <div class="function-desc">输入工单号，选择材料行，扫描物料标签直接退料</div>
-          </div>
-
-          <div class="function-card" @click="selectFunction('request')">
-            <div class="function-icon">📋</div>
-            <div class="function-title">基于申请单退料</div>
-            <div class="function-desc">选择退料申请单，选择发料记录，录入退料数量</div>
-          </div>
-        </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
 
-        <!-- 直接退料 -->
-        <div class="direct-return" v-if="selectedFunction === 'direct'">
+    <div class="content-area">
+        <!-- 删除：功能选择、直接退料模块 -->
+        <div class="direct-return" v-if="false">
           <!-- 工单输入 -->
           <div class="input-section" v-if="!workOrderMaterials.length">
             <div class="input-group">
@@ -191,7 +179,7 @@
         </div>
 
         <!-- 基于申请单退料 -->
-        <div class="request-return" v-if="selectedFunction === 'request'">
+        <div class="request-return">
           <!-- 申请单输入 -->
           <div class="input-section" v-if="!returnRequestMaterials.length">
             <div class="input-group">
@@ -318,7 +306,7 @@
                 <div class="checkbox-group">
                   <label class="checkbox-label">
                     <input type="checkbox" v-model="requestReturnForm.createLabel" />
-                    创建箱/卷记录并打印纸质标签
+                    创建箱/卷并打印RFID标签
                   </label>
                 </div>
 
@@ -338,6 +326,22 @@
               </button>
             </div>
           </div>
+
+          <!-- 装托盘（占位，参考装托盘功能接入真实流程） -->
+          <div class="return-input-section" v-if="selectedIssueRecord">
+            <div class="section-header">
+              <h3>装托盘</h3>
+            </div>
+            <div class="return-details">
+              <div class="input-group">
+                <label>托盘号</label>
+                <div class="input-with-scan">
+                  <input v-model="palletForm.palletId" placeholder="请输入或扫描托盘号" />
+                  <button @click="handlePalletize" class="scan-btn">装托盘</button>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
 
         <!-- 加载提示 -->
@@ -350,7 +354,6 @@
         <div class="message" v-if="message" :class="messageType">
           {{ message }}
         </div>
-      </div>
     </div>
   </div>
 </template>
@@ -372,7 +375,6 @@ export default {
   name: 'productionReturnPDA',
   data() {
     return {
-      selectedFunction: null,
       loading: false,
       loadingText: '',
       message: '',
@@ -415,29 +417,21 @@ export default {
       scannedLabel: '',
       labelInfo: null,
       returnQty: null
+      ,
+      // 装托盘
+      palletForm: {
+        palletId: ''
+      }
     }
   },
   computed: {
     functionTitle() {
-      if (!this.selectedFunction) return '生产订单退料';
-      if (this.selectedFunction === 'direct') return '直接退料';
-      if (this.selectedFunction === 'request') return '基于申请单退料';
-      return '生产订单退料';
+      return '申请单退料';
     }
   },
   methods: {
-    selectFunction(func) {
-      this.selectedFunction = func
-      this.resetAll()
-    },
-
     goBack() {
-      if (!this.selectedFunction) {
-        this.$router.push('/')
-      } else {
-        this.selectedFunction = null
-        this.resetAll()
-      }
+      this.$router.back()
     },
 
     resetAll() {
@@ -782,6 +776,16 @@ export default {
       }
     },
 
+    // 装托盘占位，后续接入装托盘功能
+    handlePalletize() {
+      if (!this.palletForm.palletId) {
+        this.showMessage('请输入托盘号', 'error')
+        return
+      }
+      this.showMessage('装托盘成功（示例）', 'success')
+      this.palletForm.palletId = ''
+    },
+
     showMessage(text, type = 'info') {
       this.message = text
       this.messageType = type
@@ -794,11 +798,49 @@ export default {
 </script>
 
 <style scoped>
-.production-return-pda {
-  padding: 10px;
-  font-family: Arial, sans-serif;
-  background-color: #f5f5f5;
-  min-height: 100vh;
+/* 对齐 productionReturnPicking.vue 的容器与头部样式 */
+.pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+}
+
+.header-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 16px;
+  background: #17B3A3;
+  color: white;
+  height: 40px;
+  min-height: 40px;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.header-left i {
+  margin-right: 8px;
+  font-size: 18px;
+}
+
+.header-right {
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.content-area {
+  flex: 1;
+  overflow-y: auto;
+  padding: 12px 16px;
 }
 
 /* 功能选择 */
@@ -1246,9 +1288,6 @@ export default {
 
 /* 响应式设计 */
 @media (max-width: 768px) {
-  .production-return-pda {
-    padding: 5px;
-  }
 
   .function-card {
     padding: 15px;
diff --git a/src/views/modules/production-return/productionReturnPicking.vue b/src/views/modules/production-return/productionReturnPicking.vue
index 731c9d3..dd30e9c 100644
--- a/src/views/modules/production-return/productionReturnPicking.vue
+++ b/src/views/modules/production-return/productionReturnPicking.vue
@@ -33,6 +33,9 @@
       >
         <div class="card-title">
           <span class="title-label">工单号：{{ workOrder.orderNo }}</span>
+          
+        </div>
+        <div class="part-desc-row">
           <span class="title-value">{{ workOrder.partNo }}</span>
         </div>
 
@@ -44,7 +47,7 @@
         <div class="card-details">
           <div class="detail-item">
             <div class="detail-label">计划数量</div>
-            <div class="detail-value">{{ workOrder.qtyComplete }}</div>
+            <div class="detail-value">{{ workOrder.lotSize }}</div>
           </div>
           <div class="detail-item">
             <div class="detail-label">状态</div>
@@ -58,7 +61,7 @@
       </div>
     </div>
 
-    <!-- 材料列表 -->
+    <!-- 材料列表（新增，仿 directIssue.vue） -->
     <div
       class="content-area"
       v-if="selectedWorkOrder && materialList.length > 0"
@@ -67,7 +70,7 @@
         v-for="(material, index) in materialList"
         :key="index"
         class="material-card"
-        @click="selectMaterial(material)"
+        @click="openIssueList(material)"
       >
         <div class="card-title">
           <span class="title-label"
@@ -117,10 +120,8 @@
 </template>
 
 <script>
-import {
-  getWorkOrderInfo,
-  getWorkOrderMaterials,
-} from '@/api/production/production-issue';
+import { getWorkOrderMaterials } from '@/api/production/production-issue';
+import { getReturnWorkOrderInfo,getIssueForShopOrder } from '@/api/production/production-return';
 import moment from 'moment';
 
 export default {
@@ -151,8 +152,7 @@ export default {
         site: this.$store.state.user.site,
       };
 
-      getWorkOrderInfo(params)
-        .then(({ data }) => {
+      getReturnWorkOrderInfo(params).then(({ data }) => {
           this.loading = false;
           console.log("工单信息", data);
 
@@ -184,7 +184,7 @@ export default {
       this.loadMaterialList();
     },
 
-    // 加载材料清单
+    // 加载材料清单（工单BOM）
     loadMaterialList() {
       if (!this.selectedWorkOrder) {
         this.materialList = [];
@@ -198,33 +198,29 @@ export default {
 
       getWorkOrderMaterials(params)
         .then(({ data }) => {
-          console.log("材料清单", data);
-
           if (data && data.code === 0) {
             this.materialList = (data.materials || []).map((item, index) => ({
               ...item,
               id: index + 1,
             }));
           } else {
-            this.$message.error(data.msg || "获取材料清单失败");
+            this.$message.error(data.msg || '获取材料清单失败');
             this.materialList = [];
           }
         })
         .catch((error) => {
-          console.error("获取材料清单失败:", error);
-          this.$message.error("获取材料清单失败");
+          console.error('获取材料清单失败:', error);
+          this.$message.error('获取材料清单失败');
         });
     },
 
-    // 选择材料，跳转到扫描明细页
-    selectMaterial(material) {
-      console.log("选择材料", material);
-
+    // 打开领料记录列表（新页面）
+    openIssueList(material) {
       this.$router.push({
-        name: "productionReturnPickingDetail",
+        name: 'productionReturnIssueList',
         params: {
-          orderNo: this.selectedWorkOrder.orderNo,
-          orderType:'workOrder'
+          workOrderNo: this.selectedWorkOrder.orderNo,
+          partNo: material.componentPartNo,
         },
       });
     },
diff --git a/src/views/modules/production-return/productionReturnPickingDetail.vue b/src/views/modules/production-return/productionReturnPickingDetail.vue
index bdcfb69..0f37c4d 100644
--- a/src/views/modules/production-return/productionReturnPickingDetail.vue
+++ b/src/views/modules/production-return/productionReturnPickingDetail.vue
@@ -6,14 +6,14 @@
         <i class="el-icon-arrow-left"></i>
         <span>生产退仓</span>
       </div>
-      <div class="header-right" @click="$router.push({ path: '/' })">
-        首页
-      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
     </div>
 
     <!-- 搜索框 -->
     <div class="search-container">
-      <el-input clearable class="compact-input"
+      <el-input
+        clearable
+        class="compact-input"
         v-model="scanCode"
         placeholder="请扫描物料标签或批次号"
         prefix-icon="el-icon-search"
@@ -25,35 +25,52 @@
           class="custom-switch"
           v-model="isRemoveMode"
           active-color="#ff4949"
-          inactive-color="#13ce66">
+          inactive-color="#13ce66"
+        >
         </el-switch>
-        <span v-if="isRemoveMode" class="switch-text">{{ '移除' }}</span>
-        <span v-else class="switch-text2">{{ '添加' }}</span>
+        <span v-if="isRemoveMode" class="switch-text">{{ "移除" }}</span>
+        <span v-else class="switch-text2">{{ "添加" }}</span>
       </div>
     </div>
 
-    <!-- 订单信息卡片 -->
-    <div class="material-info-card" v-if="orderInfo.orderNo">
-      <div class="card-title">
-        <span class="title-label">{{ orderInfo.type === 'workOrder' ? '工单号' : '退料申请单号' }}</span>
-        <span class="title-value">{{ orderInfo.orderNo }}</span>
-      </div>
+    <!-- 订单信息卡片（对齐直接领料明细样式） -->
+    <div class="work-order-list" v-if="orderInfo.orderNo">
+      <div class="work-order-card">
+        <div class="card-title">
+          <span class="title-label"
+            >{{
+              orderInfo.type === "workOrder" ? "工单号" : "退料申请单号"
+            }}：{{ orderInfo.orderNo }}</span
+          >
+        </div>
 
-      <div class="card-details">
-        <div class="detail-item">
-          <div class="detail-label">{{ orderInfo.type === 'workOrder' ? '产品编码' : '关联工单' }}</div>
-          <div class="detail-value">{{ orderInfo.relatedNo }}</div>
+        <!-- 关联信息单独一行 -->
+        <div class="part-desc-row">
+          <span class="desc-text"
+            >{{ orderInfo.type === "workOrder" ? "关联单号" : "关联工单" }}：{{
+              orderInfo.transactionId
+            }}</span
+          >
         </div>
-        <div class="detail-item">
-          <div class="detail-label">退料物料</div>
-          <div class="detail-value">
-            <span class="qualified">{{ orderInfo.returnedMaterials }}</span><span class="total">{{ orderInfo.totalMaterials }}</span>
-          </div>
+        <div class="part-desc-row">
+          <span class="desc-text">{{ orderInfo.partNo }}</span>
+        </div>
+        <div class="part-desc-row">
+          <span class="desc-text">{{ orderInfo.description }}</span>
         </div>
-        <div class="detail-item">
-          <div class="detail-label">退料数量</div>
-          <div class="detail-value">
-            <span class="qualified">{{ orderInfo.returnedQty }}</span><span class="total">{{ orderInfo.totalQty }}</span>
+
+        <div class="card-details">
+          <!-- <div class="detail-item">
+            <div class="detail-label">退料物料</div>
+            <div class="detail-value">{{ orderInfo.partNo }}</div>
+          </div> -->
+          <div class="detail-item">
+            <div class="detail-label">已退数量</div>
+            <div class="detail-value">{{ orderInfo.quantity }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">本次</div>
+            <div class="detail-value">{{ totalScannedQty }}</div>
           </div>
         </div>
       </div>
@@ -66,7 +83,9 @@
         <span>退料信息确认</span>
       </div>
       <div class="title-right">
-        <span class="material-list-link" @click="showMaterialListDialog">物料清单</span>
+        <span class="material-list-link" @click="showMaterialListDialog"
+          >物料清单</span
+        >
       </div>
     </div>
 
@@ -101,7 +120,11 @@
     <!-- 退料原因选择 -->
     <div class="return-reason-section">
       <div class="reason-title">退料原因</div>
-      <el-select v-model="returnReason" placeholder="请选择退料原因" style="width: 100%">
+      <el-select
+        v-model="returnReason"
+        placeholder="请选择退料原因"
+        style="width: 100%"
+      >
         <el-option label="质量问题" value="QUALITY_ISSUE"></el-option>
         <el-option label="超发退料" value="OVER_ISSUE"></el-option>
         <el-option label="错误物料" value="WRONG_MATERIAL"></el-option>
@@ -112,13 +135,20 @@
 
     <!-- 底部操作按钮 -->
     <div class="bottom-actions">
-      <button class="action-btn primary" @click="confirmReturn">
+      <button class="action-btn primary" @click="printLabels">打印</button>
+      <button
+        class="action-btn primary"
+        style="margin-left: 10px"
+        @click="confirmReturn"
+      >
         确定退料
       </button>
-      <button class="action-btn secondary" style="margin-left: 10px;" @click="printLabels">
-        打印
-      </button>
-      <button class="action-btn secondary" style="margin-left: 10px;" @click="cancelReturn">
+
+      <button
+        class="action-btn secondary"
+        style="margin-left: 10px"
+        @click="cancelReturn"
+      >
         取消
       </button>
     </div>
@@ -154,8 +184,12 @@
                 class="table-row"
               >
                 <div class="col-no">{{ index + 1 }}</div>
-                <div class="col-material-code">{{ item.materialCode || item.partNo }}</div>
-                <div class="col-returnable-qty">{{ item.returnableQty || 0 }}</div>
+                <div class="col-material-code">
+                  {{ item.materialCode || item.partNo }}
+                </div>
+                <div class="col-returnable-qty">
+                  {{ item.returnableQty || 0 }}
+                </div>
                 <div class="col-returned-qty">{{ item.returnedQty || 0 }}</div>
               </div>
             </div>
@@ -173,44 +207,156 @@
         </div>
       </div>
     </div>
+
+    <!-- 打印弹框 -->
+    <div v-if="showPrintDialog" class="print-overlay">
+      <div class="print-modal">
+        <div class="print-form">
+          <!-- 物料编码输入行 -->
+          <div class="form-row">
+            <div class="form-group">
+              <label class="form-label">物料编码</label>
+              <el-input
+                v-model="printData.materialCode1"
+                placeholder="请输入物料编码"
+                @input="handleMaterialCodeInput"
+                disabled
+                class="form-input"
+              />
+            </div>
+            <div class="form-group">
+              <label class="form-label">物料数量</label>
+              <el-input
+                v-model="printData.materialCode2"
+                placeholder="物料数量"
+                class="form-input"
+              />
+            </div>
+            <div class="add-btn">
+              <i class="el-icon-plus" @click="addWmsLabel"></i>
+            </div>
+          </div>
+
+          <!-- 物料名称和单位行 -->
+          <div class="form-row">
+            <div class="form-group">
+              <label class="form-label">物料名称</label>
+              <el-input
+                v-model="printData.materialName"
+                placeholder="物料名称自动带出"
+                disabled
+                class="form-input disabled-input"
+              />
+            </div>
+            <!-- <div class="form-group">
+              <label class="form-label">单位</label>
+              <el-input
+                v-model="printData.unit"
+                disabled
+                class="form-input disabled-input"
+              />
+            </div> -->
+          </div>
+
+          <!-- 入库信息确认标题 -->
+          <div class="section-divider">
+            <div class="divider-dot"></div>
+            <span class="divider-text">标签信息确认</span>
+          </div>
+
+          <!-- 标签列表 -->
+          <div class="print-label-list">
+            <div class="print-list-header">
+              <div class="print-col-no">NO.</div>
+              <div class="print-col-label">标签条码</div>
+              <div class="print-col-material">物料编码</div>
+              <div class="print-col-qty">标签数量</div>
+            </div>
+
+            <div class="print-list-body">
+              <div
+                v-for="(item, index) in printLabelList"
+                :key="index"
+                class="print-list-item"
+              >
+                <div class="print-col-no">{{ index+1 }}</div>
+                <div class="print-col-label">{{ item.labelCode }}</div>
+                <div class="print-col-material">{{ item.partNo }}</div>
+                <div class="print-col-qty">{{ item.quantity }}</div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 底部按钮 -->
+          <div class="print-actions">
+            <button class="print-btn confirm-btn" @click="confirmPrint">
+              确定
+            </button>
+            <button class="print-btn cancel-btn" @click="closePrintDialog">
+              取消
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import { getWorkOrderMaterials, parseMaterialLabel, directReturn } from '@/api/production/production-return';
-import moment from 'moment';
+import {
+  getWorkOrderMaterials,
+  parseMaterialLabel,
+  directReturn,
+  getInventoryPart
+} from "@/api/production/production-return";
+import moment from "moment";
 
 export default {
   data() {
     return {
-      scanCode: '',
+      scanCode: "",
       orderInfo: {},
       labelList: [],
-      orderNo: '',
-      orderType: '',
+      orderNo: "",
+      orderType: "",
       showMaterialDialog: false,
       materialList: [],
       materialListLoading: false,
       isRemoveMode: false, // 默认为添加模式
-      returnReason: ''
+      returnReason: "",
+      showPrintDialog: false,
+      printData: {},
+      partNo:"", // 物料编码
+      transactionId:"", // 关联单号
+      quantity:"", // 本次退料数量
+      batchNo:"", // 批次号
+      printLabelList: [],
     };
   },
+  computed: {
+    totalScannedQty() {
+      return this.labelList.reduce(
+        (sum, l) => sum + (Number(l.quantity) || 0),
+        0
+      );
+    },
+  },
   methods: {
     formatDate(date) {
-      return date ? moment(date).format('YYYY-MM-DD') : '';
+      return date ? moment(date).format("YYYY-MM-DD") : "";
     },
     // 处理扫描
     handleScan() {
       if (!this.scanCode.trim()) {
         return;
       }
- 
+
       if (this.isRemoveMode) {
         this.removeLabelByCode(this.scanCode.trim());
       } else {
         this.validateAndAddLabel(this.scanCode.trim());
       }
-      this.scanCode = '';
+      this.scanCode = "";
     },
 
     // 验证标签并添加到列表（保留生产退仓功能）
@@ -221,34 +367,40 @@ export default {
         orderType: this.orderType,
         site: this.$store.state.user.site,
       };
-      
-      // 模拟生产退料标签验证
-      this.simulateReturnLabelScan(params).then((result) => {
-        if (result.success) {
-          // 检查是否已经扫描过
-          const exists = this.labelList.find(item => item.labelCode === labelCode);
-          if (exists) {
-            this.$message.warning('该标签已扫描，请勿重复扫描');
-            return;
-          }
 
-          // 添加到列表
-          this.labelList.push({
-            id: Date.now(),
-            labelCode: labelCode,
-            partNo: result.data.partNo,
-            quantity: result.data.quantity,
-            batchNo: result.data.batchNo,
-            returnReason: result.data.returnReason
-          });
+      // 模拟生产退料标签验证
+      this.simulateReturnLabelScan(params)
+        .then((result) => {
+          if (result.success) {
+            // 检查是否已经扫描过
+            const exists = this.labelList.find(
+              (item) => item.labelCode === labelCode
+            );
+            if (exists) {
+              this.$message.warning("该标签已扫描，请勿重复扫描");
+              return;
+            }
 
-          this.$message.success('操作成功');
-        } else {
-          this.$message.error(result.message || '该标签不符合退料要求，请检查');
-        }
-      }).catch(() => {
-        this.$message.error('操作失败');
-      });
+            // 添加到列表
+            this.labelList.push({
+              id: Date.now(),
+              labelCode: labelCode,
+              partNo: result.data.partNo,
+              quantity: result.data.quantity,
+              batchNo: result.data.batchNo,
+              returnReason: result.data.returnReason,
+            });
+
+            this.$message.success("操作成功");
+          } else {
+            this.$message.error(
+              result.message || "该标签不符合退料要求，请检查"
+            );
+          }
+        })
+        .catch(() => {
+          this.$message.error("操作失败");
+        });
     },
 
     // 模拟生产退料标签扫描API
@@ -259,11 +411,11 @@ export default {
           resolve({
             success: true,
             data: {
-              partNo: 'MAT' + Math.floor(Math.random() * 1000),
+              partNo: "MAT" + Math.floor(Math.random() * 1000),
               quantity: Math.floor(Math.random() * 50) + 1,
-              batchNo: 'BATCH' + Math.floor(Math.random() * 100),
-              returnReason: 'QUALITY_ISSUE'
-            }
+              batchNo: "BATCH" + Math.floor(Math.random() * 100),
+              returnReason: "QUALITY_ISSUE",
+            },
           });
         }, 500);
       });
@@ -271,24 +423,26 @@ export default {
 
     // 通过条码移除标签
     removeLabelByCode(labelCode) {
-      const index = this.labelList.findIndex(item => item.labelCode === labelCode);
+      const index = this.labelList.findIndex(
+        (item) => item.labelCode === labelCode
+      );
       if (index !== -1) {
         this.labelList.splice(index, 1);
-        this.$message.success('操作成功');
+        this.$message.success("操作成功");
       } else {
-        this.$message.warning('未找到该标签');
+        this.$message.warning("未找到该标签");
       }
     },
 
     // 确认生产退料
     confirmReturn() {
       if (this.labelList.length === 0) {
-        this.$message.warning('请先扫描退料标签');
+        this.$message.warning("请先扫描退料标签");
         return;
       }
 
       if (!this.returnReason) {
-        this.$message.warning('请选择退料原因');
+        this.$message.warning("请选择退料原因");
         return;
       }
 
@@ -297,25 +451,27 @@ export default {
         orderNo: this.orderNo,
         orderType: this.orderType,
         returnReason: this.returnReason,
-        labels: this.labelList.map(label => ({
+        labels: this.labelList.map((label) => ({
           labelCode: label.labelCode,
           quantity: label.quantity,
           batchNo: label.batchNo,
-          partNo: label.partNo
-        }))
+          partNo: label.partNo,
+        })),
       };
 
       // 模拟生产退料确认API
-      this.simulateReturnConfirm(returnParams).then((result) => {
-        if (result.success) {
-          this.$message.success('生产退料成功');
-          this.$router.back();
-        } else {
-          this.$message.error(result.message || '操作失败');
-        }
-      }).catch(() => {
-        this.$message.error('操作失败');
-      });
+      this.simulateReturnConfirm(returnParams)
+        .then((result) => {
+          if (result.success) {
+            this.$message.success("生产退料成功");
+            this.$router.back();
+          } else {
+            this.$message.error(result.message || "操作失败");
+          }
+        })
+        .catch(() => {
+          this.$message.error("操作失败");
+        });
     },
 
     // 模拟生产退料确认API
@@ -324,7 +480,7 @@ export default {
         setTimeout(() => {
           resolve({
             success: true,
-            message: '生产退料成功'
+            message: "生产退料成功",
           });
         }, 1000);
       });
@@ -332,26 +488,72 @@ export default {
 
     // 打印标签
     printLabels() {
-      if (this.labelList.length === 0) {
-        this.$message.warning('暂无标签可打印');
+
+      this.showPrintDialog = true;
+      this.initPrintData();
+    },
+
+    // 初始化打印数据
+    initPrintData() {
+      this.printData = {
+        materialCode1: this.partNo,
+        materialCode2: 0,
+        materialName: this.orderInfo.description,
+        unit: "",
+        inboundQty: "",
+      };
+      this.printLabelList = [];
+    },
+
+    // 关闭打印弹框
+    closePrintDialog() {
+      this.showPrintDialog = false;
+      this.printData = {};
+    },
+
+    // 确认打印
+    confirmPrint() {
+      if (!this.printData.materialCode1.trim()) {
+        this.$message.warning("请输入物料编码");
+        return;
+      }
+
+      if (!this.printData.inboundQty || this.printData.inboundQty <= 0) {
+        this.$message.warning("请输入有效的入库数量");
         return;
       }
 
-      this.$message.warning('打印功能开发中...');
+      // 模拟打印操作
+      this.$message.success("打印成功");
+      this.closePrintDialog();
+    },
+
+    // 物料编码输入处理
+    handleMaterialCodeInput() {
+      if (this.printData.materialCode1.trim()) {
+        // 模拟根据物料编码获取物料名称和单位
+        this.printData.materialName = "物料名称自动带出";
+        this.printData.unit = "PCS";
+      } else {
+        this.printData.materialName = "";
+        this.printData.unit = "";
+      }
     },
 
     // 取消退料
     cancelReturn() {
       if (this.labelList.length > 0) {
-        this.$confirm('取消后将清空已扫描的标签，确定取消吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '继续操作',
-          type: 'warning'
-        }).then(() => {
-          this.$router.back();
-        }).catch(() => {
-          // 用户选择继续操作
-        });
+        this.$confirm("取消后将清空已扫描的标签，确定取消吗？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "继续操作",
+          type: "warning",
+        })
+          .then(() => {
+            this.$router.back();
+          })
+          .catch(() => {
+            // 用户选择继续操作
+          });
       } else {
         this.$router.back();
       }
@@ -365,10 +567,10 @@ export default {
 
     // 加载物料清单
     loadMaterialList() {
-      console.log('加载退料物料清单', this.orderInfo, this.orderNo);
-      
+      console.log("加载退料物料清单", this.orderInfo, this.orderNo);
+
       if (!this.$store.state.user.site || !this.orderNo) {
-        this.$message.error('缺少必要参数，无法获取物料清单');
+        this.$message.error("缺少必要参数，无法获取物料清单");
         return;
       }
 
@@ -376,23 +578,25 @@ export default {
       const params = {
         site: this.$store.state.user.site,
         orderNo: this.orderNo,
-        orderType: this.orderType
+        orderType: this.orderType,
       };
 
       // 模拟获取物料清单
-      this.simulateMaterialList(params).then((data) => {      
-        this.materialListLoading = false;
-        if (data && data.code === 0) {
-          this.materialList = data.materials || [];
-        } else {
-          this.$message.error(data.msg || '获取物料清单失败');
+      this.simulateMaterialList(params)
+        .then((data) => {
+          this.materialListLoading = false;
+          if (data && data.code === 0) {
+            this.materialList = data.materials || [];
+          } else {
+            this.$message.error(data.msg || "获取物料清单失败");
+            this.materialList = [];
+          }
+        })
+        .catch(() => {
+          this.materialListLoading = false;
+          this.$message.error("获取物料清单失败");
           this.materialList = [];
-        }
-      }).catch(() => {
-        this.materialListLoading = false;
-        this.$message.error('获取物料清单失败');
-        this.materialList = [];
-      });
+        });
     },
 
     // 模拟物料清单API
@@ -401,28 +605,28 @@ export default {
         setTimeout(() => {
           const mockMaterials = [
             {
-              materialCode: 'MAT001',
-              partNo: 'MAT001',
+              materialCode: "MAT001",
+              partNo: "MAT001",
               returnableQty: 100,
-              returnedQty: 20
+              returnedQty: 20,
             },
             {
-              materialCode: 'MAT002',
-              partNo: 'MAT002',
+              materialCode: "MAT002",
+              partNo: "MAT002",
               returnableQty: 200,
-              returnedQty: 50
+              returnedQty: 50,
             },
             {
-              materialCode: 'MAT003',
-              partNo: 'MAT003',
+              materialCode: "MAT003",
+              partNo: "MAT003",
               returnableQty: 150,
-              returnedQty: 0
-            }
+              returnedQty: 0,
+            },
           ];
 
           resolve({
             code: 0,
-            materials: mockMaterials
+            materials: mockMaterials,
           });
         }, 500);
       });
@@ -439,51 +643,65 @@ export default {
         orderNo: this.orderNo,
         orderType: this.orderType,
         site: this.$store.state.user.site,
+        partNo:this.partNo
       };
-      console.log('加载订单详情参数:', params);
-      
-      // 模拟获取订单详情
-      this.simulateOrderDetails(params).then((data) => {
-        if (data && data.code === 0) {
-          this.orderInfo = data.data;
-        } else {
-          this.$message.error(data.msg || '获取订单详情失败');
-        }
-      }).catch(() => {
-        this.$message.error('获取订单详情失败');
-      });
+      console.log("加载订单详情参数:", params);
+
+      // 物料详情接口
+      getInventoryPart(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.orderInfo = data.inventoryPart[0]
+            this.orderInfo.type = this.orderType
+            this.orderInfo.orderNo = this.orderNo
+            this.orderInfo.transactionId = this.transactionId
+            this.orderInfo.quantity = this.quantity
+          } else {
+            this.$message.error(data.msg || "获取订单详情失败");
+          }
+        }).catch(() => {
+          this.$message.error("获取订单详情失败");
+        });
     },
-
-    // 模拟订单详情API
-    simulateOrderDetails() {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve({
-            code: 0,
-            data: {
-              orderNo: this.orderNo,
-              type: this.orderType,
-              relatedNo: this.orderType === 'workOrder' ? 'PROD001' : 'WO202401001',
-              returnedMaterials: 2,
-              totalMaterials: 5,
-              returnedQty: 150,
-              totalQty: 500,
-              site: this.$store.state.user.site
-            }
-          });
-        }, 500);
-      });
+    addWmsLabel(){
+      if(!this.printData.materialCode1.trim()){
+        this.$message.warning("请输入物料编码");
+        return;
+      }
+      if(!this.printData.materialCode2 || this.printData.materialCode2<=0){
+        this.$message.warning("请输入有效的物料数量");
+        return;
+      }
+      let newLabel = {
+        site: this.$store.state.user.site,
+        partNo: this.printData.materialCode1,
+        quantity: this.printData.materialCode2,
+        batchNo: this.batchNo,
+        warehouseId:"",
+        locationId:"",
+      }
+      console.log("添加标签:",newLabel);
+      
+      // 添加到列表
+      this.printLabelList.push(newLabel);
+      this.$message.success("操作成功");
+      // 清空输入
+      this.printData.materialCode2 = 0;
+      this.printData.unit = "";
     }
   },
 
   mounted() {
-    // 获取路由参数 
+    // 获取路由参数
     this.orderNo = this.$route.params.orderNo;
-    this.orderType = this.$route.params.orderType || 'workOrder';
-    console.log("订单号:", this.orderNo, "订单类型:", this.orderType);
-    
+    this.orderType = this.$route.params.orderType || "workOrder";
+    this.partNo = this.$route.params.partNo
+    this.transactionId = this.$route.params.transactionId
+    this.quantity = this.$route.params.quantity
+    this.batchNo = this.$route.params.batchNo
+    console.log("订单号:", this.orderNo, "订单类型:", this.orderType,"物料编码:",this.partNo);
+
     if (!this.orderNo) {
-      this.$message.error('参数错误');
+      this.$message.error("参数错误");
       this.$router.back();
       return;
     }
@@ -497,7 +715,7 @@ export default {
 
     // 加载订单详情
     this.loadOrderDetails();
-  }
+  },
 };
 </script>
 
@@ -517,7 +735,7 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 8px 16px;
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
   height: 40px;
   min-height: 40px;
@@ -638,7 +856,7 @@ export default {
   border-radius: 8px;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
   border: 1px solid #f0f0f0;
-  border-left: 4px solid #17B3A3;
+  border-left: 4px solid #17b3a3;
 }
 
 .card-title {
@@ -693,7 +911,7 @@ export default {
 }
 
 .detail-value .qualified {
-  color: #17B3A3;
+  color: #17b3a3;
   font-weight: 500;
 }
 
@@ -703,7 +921,7 @@ export default {
 }
 
 .detail-value .total::before {
-  content: '/';
+  content: "/";
   color: #333;
 }
 
@@ -717,7 +935,47 @@ export default {
   margin: 0 16px;
   margin-top: 4px;
   border-radius: 8px 8px 0 0;
-  border-bottom: 2px solid #17B3A3;
+  border-bottom: 2px solid #17b3a3;
+}
+
+/* 对齐直接领料明细的工单卡片样式 */
+/* 工单列表容器背景与间距 */
+.work-order-list {
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+
+/* 工单卡片具有白色背景、圆角、阴影与边框一致性 */
+.work-order-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+
+.work-order-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.work-order-card:active {
+  transform: translateY(0);
+}
+
+/* 物料描述行（单独一行的小字说明） */
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+
+.desc-text {
+  font-size: 12px;
+  color: #666;
+  line-height: 1.3;
+  word-break: break-all;
 }
 
 .title-left {
@@ -726,13 +984,13 @@ export default {
 }
 
 .title-left i {
-  color: #17B3A3;
+  color: #17b3a3;
   font-size: 16px;
   margin-right: 8px;
 }
 
 .title-left span {
-  color: #17B3A3;
+  color: #17b3a3;
   font-size: 14px;
   font-weight: 500;
 }
@@ -743,7 +1001,7 @@ export default {
 }
 
 .material-list-link {
-  color: #17B3A3;
+  color: #17b3a3;
   font-size: 14px;
   font-weight: 500;
   cursor: pointer;
@@ -856,8 +1114,8 @@ export default {
 }
 
 .action-btn.primary {
-  border: 1px solid #17B3A3;
-  background: #17B3A3;
+  border: 1px solid #17b3a3;
+  background: #17b3a3;
   color: white;
 }
 
@@ -867,13 +1125,13 @@ export default {
 }
 
 .action-btn.secondary {
-  border: 1px solid #17B3A3;
+  border: 1px solid #17b3a3;
   background: white;
-  color: #17B3A3;
+  color: #17b3a3;
 }
 
 .action-btn.secondary:hover {
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
 }
 
@@ -909,7 +1167,7 @@ export default {
 }
 
 .material-modal .modal-header {
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
   padding: 5px 16px;
   display: flex;
@@ -954,7 +1212,7 @@ export default {
   display: flex;
   background: #f8f9fa;
   padding: 10px 6px;
-  border-bottom: 2px solid #17B3A3;
+  border-bottom: 2px solid #17b3a3;
   font-size: 12px;
   color: #333;
   font-weight: 600;
@@ -1027,13 +1285,13 @@ export default {
   font-size: 14px;
   cursor: pointer;
   transition: all 0.2s;
-  border: 1px solid #17B3A3;
+  border: 1px solid #17b3a3;
   background: white;
-  color: #17B3A3;
+  color: #17b3a3;
 }
 
 .btn-close:hover {
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
 }
 
@@ -1050,7 +1308,7 @@ export default {
 .loading-container i {
   font-size: 24px;
   margin-bottom: 12px;
-  color: #17B3A3;
+  color: #17b3a3;
 }
 
 .loading-container span {
@@ -1078,6 +1336,217 @@ export default {
   font-size: 14px;
 }
 
+/* 打印弹框样式 */
+.print-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+}
+
+.print-modal {
+  background: #f5f5f5;
+  border-radius: 12px;
+  width: 100%;
+  max-width: 600px;
+  max-height: 90vh;
+  overflow: hidden;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+}
+
+.print-form {
+  padding: 10px;
+  overflow-y: auto;
+  max-height: 90vh;
+}
+
+.form-row {
+  display: flex;
+  align-items: flex-end;
+  gap: 12px;
+  margin-bottom: 16px;
+}
+
+.form-group {
+  flex: 1;
+}
+
+.form-label {
+  display: block;
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 6px;
+  font-weight: 500;
+}
+
+.form-input {
+  width: 100%;
+}
+
+.form-input ::v-deep .el-input__inner {
+  height: 40px;
+  border: 2px solid #17b3a3;
+  border-radius: 6px;
+  font-size: 14px;
+}
+
+.disabled-input ::v-deep .el-input__inner {
+  background: #e8e8e8;
+  color: #666;
+  border-color: #ddd;
+}
+
+.add-btn {
+  width: 40px;
+  height: 40px;
+  background: #17b3a3;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: background-color 0.2s;
+  flex-shrink: 0;
+}
+
+.add-btn:hover {
+  background: #13998c;
+}
+
+.add-btn i {
+  color: white;
+  font-size: 20px;
+  font-weight: bold;
+}
+
+.section-divider {
+  display: flex;
+  align-items: center;
+  margin: 24px 0 16px;
+  padding-bottom: 8px;
+  border-bottom: 2px solid #17b3a3;
+}
+
+.divider-dot {
+  width: 8px;
+  height: 8px;
+  background: #17b3a3;
+  border-radius: 50%;
+  margin-right: 8px;
+}
+
+.divider-text {
+  font-size: 14px;
+  color: #17b3a3;
+  font-weight: 500;
+}
+
+.print-label-list {
+  background: white;
+  border-radius: 8px;
+  overflow: hidden;
+  margin-bottom: 20px;
+}
+
+.print-list-header {
+  display: flex;
+  background: #f8f9fa;
+  padding: 12px 8px;
+  border-bottom: 1px solid #e0e0e0;
+  font-size: 12px;
+  color: #666;
+  font-weight: 500;
+}
+
+.print-list-body {
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.print-list-item {
+  display: flex;
+  padding: 12px 8px;
+  border-bottom: 1px solid #f0f0f0;
+  font-size: 12px;
+  color: #333;
+}
+
+.print-list-item:last-child {
+  border-bottom: none;
+}
+
+.print-col-no {
+  width: 40px;
+  text-align: center;
+  flex-shrink: 0;
+}
+
+.print-col-label {
+  flex: 2;
+  text-align: center;
+  min-width: 100px;
+}
+
+.print-col-material {
+  flex: 2;
+  text-align: center;
+  min-width: 100px;
+}
+
+.print-col-qty {
+  width: 60px;
+  text-align: center;
+  flex-shrink: 0;
+}
+
+.print-actions {
+  display: flex;
+  gap: 20px;
+  justify-content: center;
+  margin-top: 20px;
+}
+
+.print-btn {
+  padding: 12px 30px;
+  border-radius: 25px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid #17b3a3;
+  min-width: 100px;
+}
+
+.confirm-btn {
+  background: #17b3a3;
+  color: white;
+}
+
+.confirm-btn:hover {
+  background: #13998c;
+  border-color: #13998c;
+}
+
+.cancel-btn {
+  background: white;
+  color: #17b3a3;
+}
+
+.cancel-btn:hover {
+  background: #17b3a3;
+  color: white;
+}
+
+.print-btn:active {
+  transform: scale(0.98);
+}
+
 /* 响应式设计 */
 @media (max-width: 360px) {
   .header-bar {
@@ -1117,12 +1586,43 @@ export default {
     min-width: 50px;
   }
 
-  .list-header, .list-item {
+  .list-header,
+  .list-item {
     font-size: 11px;
   }
 
-  .col-label, .col-part, .col-batch {
+  .col-label,
+  .col-part,
+  .col-batch {
     flex: 1.2;
   }
+
+  .print-modal {
+    max-width: 95%;
+    margin: 10px;
+  }
+
+  .print-form {
+    padding: 15px;
+  }
+
+  .form-row {
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .add-btn {
+    align-self: center;
+    margin-top: 10px;
+  }
+
+  .print-actions {
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  .print-btn {
+    width: 100%;
+  }
 }
 </style>
\ No newline at end of file