diff --git a/src/views/modules/production-inbound/inboundRegister.vue b/src/views/modules/production-inbound/inboundRegister.vue
index 98b1b1b..bfeebca 100644
--- a/src/views/modules/production-inbound/inboundRegister.vue
+++ b/src/views/modules/production-inbound/inboundRegister.vue
@@ -1,387 +1,641 @@
 <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="pda-container" v-loading.fullscreen.lock="fullscreenLoading"
+         element-loading-background="rgba(255, 255, 255, 0.3)"
+         element-loading-spinner="el-icon-loading"
+         :element-loading-text="loadingText">
+      <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="header-right" @click="$router.push({ path: '/' })">
-        首页
-      </div>
-    </div>
-
-    <!-- 搜索框 -->
-    <div class="search-container">
-      <el-input clearable
-                v-model="searchCode"
-                placeholder="请输入入库申请单单号"
-                prefix-icon="el-icon-search"
-                @keyup.enter.native="handleSearch"
-                ref="searchInput"
-      />
-    </div>
-
-    <!-- 入库申请单列表 -->
-    <div class="content-area">
-      <div
-        v-for="(item, index) in inboundList"
-        :key="index"
-        class="inbound-card"
-        @click="goToRegisterPage(item)"
-      >
-        <div class="card-title">
-          <span class="title-label">入库申请单号</span>
-          <span class="title-value">{{ item.notifyNo }}</span>
-        </div>
-
-        <div class="card-details">
-          <div class="detail-item">
-            <div class="detail-label">关联单号</div>
-            <div class="detail-value">{{ item.workOrderNo }}</div>
+      <div style="overflow-y: auto">
+        <!-- Step 1: 扫描工单号 -->
+        <div v-if="processFlag === 1">
+          <div class="scan-box" style="margin: 2px;">
+            <el-input clearable v-model="scanCode" placeholder="扫描或输入工单号"
+                      inputmode="none"
+                      autocomplete="off"
+                      autocorrect="off"
+                      spellcheck="false"
+                      @keyup.enter.native="searchShopOrder" ref="scanCodeRef" />
           </div>
-          <div class="detail-item">
-            <div class="detail-label">箱子数量</div>
-            <div class="detail-value">
-              <span class="qualified">{{ item.registeredBoxes }}</span><span class="total">{{ item.totalBoxes }}</span>
-            </div>
-          </div>
-          <div class="detail-item">
-            <div class="detail-label">物料总数</div>
-            <div class="detail-value">
-              <span class="qualified">{{ item.registeredQty }}</span><span class="total">{{ item.totalQty }}</span>
-            </div>
+          <div class="item-list" v-if="shopOrderList.length > 0" style="margin: 2px;">
+            <el-form label-position="top" style="margin: 3px;">
+              <el-row :gutter="5" @click.native="selectShopOrder(orderDetail)"
+                      v-for="(orderDetail, index) in shopOrderList" :key="index" :class="index < shopOrderList.length - 1 ? 'bottom-line-row' : ''">
+                <el-col :span="8">
+                  <el-form-item label="工单号"><span>{{ orderDetail.orderNo }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="料号"><span>{{ orderDetail.partNo }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="">
+                    <el-button type="text" class="recvButton"
+                               style="margin-top: 10px;margin-left: 20px" size="small">入库</el-button>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="物料描述"><span>{{ orderDetail.partDesc }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6" :class="{ mt10: getTextWidth(orderDetail.partDesc) > 34 }">
+                  <el-form-item label="订单数量"><span>{{ orderDetail.lotSize }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6" :class="{ mt10: getTextWidth(orderDetail.partDesc) > 34 }">
+                  <el-form-item label="已完成数"><span>{{ orderDetail.qtyComplete }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6" :class="{ mt10: getTextWidth(orderDetail.partDesc) > 34 }">
+                  <el-form-item label="状态">
+                    <el-tag :type="orderDetail.objstate === 'Started' ? 'success' : 'warning'" size="mini">
+                      {{ orderDetail.objstate }}
+                    </el-tag>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6" :class="{ mt10: getTextWidth(orderDetail.partDesc) > 34 }">
+                  <el-form-item style="margin-left: 20px" label="单位"><span>{{ orderDetail.uom }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
         </div>
-      </div>
 
-      <!-- 空状态 -->
-      <div v-if="inboundList.length === 0 && !loading" class="empty-state">
-        <i class="el-icon-box"></i>
-        <p>暂无待登记入库申请单</p>
-      </div>
+        <!-- Step 2: 入库明细 -->
+        <div v-if="processFlag === 2">
+          <el-form label-position="top" class="form-section" style="margin: 5px;">
+            <el-row :gutter="20">
+              <el-col :span="12"><el-form-item label="工单号"><el-input v-model="inboundItem.orderNo" disabled /></el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="下达号/序列号"><el-input v-model="displayReleaseSeq" disabled /></el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="料号"><el-input v-model="inboundItem.partNo" disabled /></el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="计量单位"><el-input v-model="inboundItem.uom" disabled /></el-form-item></el-col>
+              <el-col :span="24"><el-form-item label="物料描述"><el-input v-model="inboundItem.partDesc" disabled /></el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="订单数量"><el-input v-model="inboundItem.lotSize" disabled /></el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="已完成数"><el-input v-model="inboundItem.qtyComplete" disabled /></el-form-item></el-col>
+              <el-col :span="12">
+                <el-form-item label="此次入库数量">
+                  <el-input v-model="inboundItem.transQty" type="number" @blur="checkQuantity" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label=" ">
+                  <el-button type="text" @click.stop="handlingUnitStep"
+                             style="font-size: 16px;margin-top: -5px" size="small">包装记录</el-button>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12"><el-form-item label="库位">
+                <el-input v-model="inboundItem.locationNo" placeholder="请输入库位" />
+              </el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="批号">
+                <el-input v-model="inboundItem.batchNo" placeholder="请输入批号" />
+              </el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="WDR">
+                <el-input v-model="inboundItem.wdr" placeholder="请输入WDR" />
+              </el-form-item></el-col>
+              <!-- 勾选框 -->
+              <el-col :span="12" style="margin-top: 24px">
+                <el-form-item>
+                  <el-checkbox v-model="inboundItem.ifsAutoReport">Auto Report of Operation</el-checkbox>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" style="margin-top: 5px">
+                <el-form-item>
+                  <el-checkbox v-model="inboundItem.ifsSimplifiedMaterial">Simplified Material Check</el-checkbox>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8" style="margin-top: 10px"><el-form-item><el-button type="text" style="font-size: 16px;margin-left: 30px" @click="processFlag = 1">回退</el-button></el-form-item></el-col>
+              <el-col :span="8" style="margin-top: 10px"><el-form-item><el-button type="text" style="font-size: 16px;margin-left: 20px" @click="confirmInbound">确认</el-button></el-form-item></el-col>
+              <el-col :span="8" style="margin-top: 10px"><el-form-item><el-button type="text" style="font-size: 16px;margin-left: 10px" @click="$router.push('/')">退出</el-button></el-form-item></el-col>
+            </el-row>
+          </el-form>
+        </div>
 
-      <!-- 加载状态 -->
-      <div v-if="loading" class="loading-state">
-        <i class="el-icon-loading"></i>
-        <p>加载中...</p>
+        <!-- Step 3: 包装记录 -->
+        <div v-if="processFlag === 3">
+          <el-form label-position="top" class="form-section" style="margin: 5px;">
+            <el-row :gutter="20">
+              <el-col :span="12"><el-form-item label="料号"><el-input v-model="inboundItem.partNo" disabled /></el-form-item></el-col>
+              <el-col :span="12"><el-form-item label="未完成数量"><el-input v-model="inboundItem.unCompleteQty" disabled /></el-form-item></el-col>
+              <el-col :span="24"><el-form-item label="物料描述"><el-input v-model="inboundItem.partDesc" disabled /></el-form-item></el-col>
+
+              <!-- 自动计算开关 -->
+              <el-col :span="24" style="margin-bottom: 10px;">
+                <el-form-item>
+                  <el-switch
+                    v-model="autoCalculate"
+                    active-text="自动计算模式"
+                    inactive-text="手动输入模式"
+                    active-color="#17B3A3"
+                    style="display: block;"
+                  >
+                  </el-switch>
+                  <span v-if="autoCalculate" style="font-size: 13px; color: #17B3A3; margin-top: 5px; display: block; font-weight: bold;">
+                    💡 输入单包装数量后，按回车键或点击确定按钮
+                  </span>
+                  <span v-else style="font-size: 12px; color: #999; margin-top: 5px; display: block;">
+                    手动输入单包装数量和包装数，然后点击"创建"按钮
+                  </span>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8"><el-form-item label="单包装数量">
+                <el-input
+                  v-model="hanlingItem.perQty"
+                  type="number"
+                  :placeholder="autoCalculate ? '输入完按回车或失去焦点' : '请输入单包装数量'"
+                  @blur="autoCalculate && autoCreateHandlingUnits()"
+                  @keyup.enter.native="autoCalculate && autoCreateHandlingUnits()"
+                />
+              </el-form-item></el-col>
+              <el-col :span="8" v-if="!autoCalculate"><el-form-item label="包装数">
+                <el-input v-model="hanlingItem.packageQty" type="number" placeholder="请输入包装数" />
+              </el-form-item></el-col>
+              <el-col :span="8" v-if="!autoCalculate" style="margin-top: 16px"><el-form-item>
+                <el-button type="text" @click="createHandlingUnit" style="font-size: 16px">创建</el-button></el-form-item></el-col>
+              <el-col :span="8" v-else style="margin-top: 16px"><el-form-item>
+                <el-button type="text"  style="font-size: 16px">确定</el-button></el-form-item></el-col>
+              <el-table :data="handlingUnit" :row-style="{ height: '30px' }" style="width: 94%; margin-left: 10px;" highlight-current-row>
+                <el-table-column prop="code" label="序号" />
+                <el-table-column prop="packageQty" label="包装数" width="80" />
+                <el-table-column prop="perQty" label="单包装数量" width="100" />
+                <el-table-column label="操作" v-if="!autoCalculate">
+                  <template slot-scope="scope">
+                    <a @click="removeItem(scope.$index)">删除</a>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-col :span="24" v-if="autoCalculate && handlingUnit.length > 0" style="margin-top: 10px;">
+                <span style="font-size: 12px; color: #999;">
+                  💡 如需修改，请重新输入单包装数量
+                </span>
+              </el-col>
+              <el-col :span="24"><el-form-item><span>合计</span><span style="margin-left: 38%">{{ totalQty }}</span></el-form-item></el-col>
+              <el-col :span="12"><el-form-item><el-button type="text" @click="processFlag = 2" style="font-size: 18px;margin-left: 60px">回退</el-button></el-form-item></el-col>
+              <el-col :span="12"><el-form-item><el-button type="text" @click="processFlag = 2" style="font-size: 18px;">确定</el-button></el-form-item></el-col>
+            </el-row>
+          </el-form>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import {
-  getInboundNotifyByNo,
-  getInboundNotifyListByNo,
-} from '@/api/production/production-inbound'
-import { getCurrentWarehouse } from '@/utils'
-import moment from 'moment';
+import { getShopOrderFromIfs, getNextSequenceNo, submitShopOrderInbound, validateMaterialIssued, printLabel } from "@/api/production/production-inbound.js";
 
 export default {
   data() {
     return {
-      searchCode: '',
-      inboundList: [],
-      loading: false
+      processFlag: 1,
+      scanCode: '',
+      shopOrderList: [],
+      inboundItem: {},
+      handlingUnit: [],
+      hanlingItem: { code: '', qty: '', perQty: '', packageQty: '' },
+      site: localStorage.getItem('site'),
+      warehouseId: localStorage.getItem('selectedWarehouse'),
+      fullscreenLoading: false,
+      loadingText: '加载中...',
+      autoCalculate: false
     };
   },
-  methods: {
-    formatDate(date) {
-      return date ? moment(date).format('YYYY-MM-DD') : '';
+  computed: {
+    totalQty() {
+      const sum = this.handlingUnit.reduce((sum, item) => sum + Number(item.qty), 0);
+      this.inboundItem.transQty = sum;
+      return sum;
     },
-    // 处理搜索
-    handleSearch() {
-      if (this.searchCode.trim()) {
-        this.searchInboundList(this.searchCode.trim());
+    huKey() {
+      return `hu_shop_${this.inboundItem.orderNo}_${this.inboundItem.releaseNo}`;
+    },
+    displayReleaseSeq() {
+      return `${this.inboundItem.releaseNo || ''}/${this.inboundItem.sequenceNo || ''}`;
+    }
+  },
+  watch: {
+    autoCalculate(newVal, oldVal) {
+      this.hanlingItem.perQty = '';
+      this.hanlingItem.packageQty = '';
+      this.handlingUnit = [];
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+
+      if (newVal) {
+        this.$message.success('已切换到自动创建HU模式');
       } else {
-        this.loadInboundList();
+        this.$message.success('已切换到手动输入模式');
+      }
+    }
+  },
+  methods: {
+    // 计算"显示宽度"
+    getTextWidth(text) {
+      if (!text) return 0
+      let len = 0
+      for (let char of text) {
+        if (/[\u4e00-\u9fa5\u3000-\u303F\uFF00-\uFFEF]/.test(char)) {
+          len += 2
+        } else {
+          len += 1
+        }
       }
+      return len
     },
+    handleBack() {
+      if (this.processFlag === 1) this.$router.back();
+      else if (this.processFlag === 3) this.processFlag = 2;
+      else this.processFlag = 1;
+    },
+    // 搜索工单
+    searchShopOrder() {
+      if (!this.scanCode) return this.shopOrderList = [];
+
+      this.loadingText = '搜索中...';
+      this.fullscreenLoading = true;
+
+      const requestData = {
+        ifsDBName: "IFST",
+        domainUserID: "CCL_WMS",
+        ifsSiteID: this.site,
+        ifsOrderNo: this.scanCode,
+        ifsReleaseNo: "*",
+        ifsSequenceNo: "*"
+      };
 
-    // 加载生产入库申请单列表
-    loadInboundList() {
-      this.loading = true;
-      const params = {
-        site: localStorage.getItem('site'),
-        status: '待登记',
-      }
-      console.log('params', params);
-      
-      getInboundNotifyListByNo(params).then(({ data }) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          this.inboundList = data.list || [];
+      getShopOrderFromIfs(requestData).then(({ data }) => {
+        if (data.code === 0) {
+          this.shopOrderList = data.data || []
         } else {
-          this.$message.error(data.msg || '获取数据失败');
+          this.$message.error(data.msg || '查询失败');
+          this.shopOrderList = []
         }
+        this.$nextTick(() => {
+          if (this.$refs.scanCodeRef) {
+            this.$refs.scanCodeRef.blur();
+          }
+        });
       }).catch(error => {
-        this.loading = false;
-        console.error('获取生产入库申请单列表失败:', error);
-        this.$message.error('获取数据失败');
+        console.error('搜索失败:', error);
+        this.$message.error('搜索失败，请重试');
+        this.shopOrderList = []
+      }).finally(() => {
+        this.fullscreenLoading = false;
       });
     },
+    // 选择工单
+    async selectShopOrder(row) {
+      // 校验状态
+      if (row.objstate !== 'Started') {
+        return this.$message.warning(`工单状态为 ${row.objstate}，只有Started状态才能入库`);
+      }
 
-    // 搜索特定入库申请单
-    searchInboundList(searchCode) {
-      this.loading = true;
-      const params = {
-        notifyNo: searchCode,
-        site: localStorage.getItem('site'),
-        status: 'REGISTER'
-      };
+      this.fullscreenLoading = true;
+      this.loadingText = '检查物料发料状态...';
+
+      try {
+        // 1. 检查物料是否已发料
+        const validateResult = await validateMaterialIssued({
+          site: this.site,
+          orderNo: row.orderNo,
+          releaseNo: row.releaseNo || '*',
+          sequenceNo: row.sequenceNo || '*'
+        });
+
+        if (validateResult.data.code !== 0) {
+          this.$alert(validateResult.data.msg || '物料发料检查失败', '操作提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          });
+          return;
+        }
 
-      getInboundNotifyListByNo(params).then(({ data }) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          if (data.list.length === 0) {
-            this.$message.warning('未找到匹配的入库申请单');
+        this.loadingText = '加载中...';
+
+        // 2. 获取下一个序列号
+        let nextSequence = 1;
+        try {
+          const { data } = await getNextSequenceNo({
+            orderNo: row.orderNo,
+            releaseNo: row.releaseNo || '*',
+            sequenceNo: row.sequenceNo || '*'
+          });
+          if (data.code === 0) {
+            nextSequence = data.data;
           }
-          this.inboundList = data.list || [];
-        } else {
-          this.$message.error(data.msg || '查询失败');
+        } catch (error) {
+          console.error('获取序列号失败:', error);
+        }
+
+        this.inboundItem = {
+          ...row,
+          transQty: '',
+          unCompleteQty: parseFloat(row.lotSize) - parseFloat(row.qtyComplete),
+          sequenceNoNew: nextSequence,
+          batchNo: `${row.orderNo}-${row.releaseNo}-${row.sequenceNo}-${nextSequence}`,
+          locationNo: '',
+          serialNo: '*',
+          wdr: '*',
+          engChgLevel: '1',
+          ifsAutoReport: false,  // Auto Report of Operation
+          ifsSimplifiedMaterial: true  // Simplified Material Check默认选中
+        };
+        this.processFlag = 2;
+      } catch (error) {
+        console.error('操作失败:', error);
+        this.$message.error(error.message || '操作失败');
+      } finally {
+        this.fullscreenLoading = false;
+      }
+    },
+    // 检查数量
+    checkQuantity() {
+      const transQty = parseFloat(this.inboundItem.transQty) || 0;
+      const qtyComplete = parseFloat(this.inboundItem.qtyComplete) || 0;
+      const lotSize = parseFloat(this.inboundItem.lotSize) || 0;
+
+      if (qtyComplete + transQty > lotSize) {
+        this.$confirm(
+          `当前已完成数量(${qtyComplete}) + 本次入库数量(${transQty}) = ${qtyComplete + transQty}，超过订单数量(${lotSize})，是否继续？`,
+          '数量超出提示',
+          {
+            confirmButtonText: '继续',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).catch(() => {
+          this.inboundItem.transQty = '';
+        });
+      }
+    },
+    handlingUnitStep() {
+      this.processFlag = 3;
+      this.autoCalculate = false;  // 默认使用自动计算模式
+      const saved = localStorage.getItem(this.huKey);
+      this.handlingUnit = saved ? JSON.parse(saved) : [];
+    },
+    /**
+     * 自动创建HU列表（自动模式）
+     */
+    autoCreateHandlingUnits() {
+      const perQty = this.hanlingItem.perQty;
+
+      if (!perQty || isNaN(perQty) || parseFloat(perQty) <= 0) {
+        this.$message.warning('请输入有效的单包装数量');
+        return;
+      }
+
+      const qtyToReceive = parseFloat(this.inboundItem.transQty) || 0;
+      if (qtyToReceive <= 0) {
+        this.$message.warning('入库数量为0，无法创建HU');
+        this.hanlingItem.perQty = '';
+        return;
+      }
+
+      const perQtyValue = parseFloat(perQty);
+      const packageQty = Math.floor(qtyToReceive / perQtyValue);
+      const remainder = qtyToReceive - (packageQty * perQtyValue);
+
+      this.handlingUnit = [];
+
+      if (packageQty > 0) {
+        for (let i = 1; i <= packageQty; i++) {
+          const qty = perQtyValue;
+          const code = String(i);
+          this.handlingUnit.push({
+            code: code,
+            perQty: perQtyValue,
+            packageQty: 1,
+            qty: qty
+          });
+        }
+      }
+
+      if (remainder > 0) {
+        const code = String(this.handlingUnit.length + 1);
+        this.handlingUnit.push({
+          code: code,
+          perQty: remainder,
+          packageQty: 1,
+          qty: remainder
+        });
+      }
+
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+      this.hanlingItem.perQty = '';
+      this.hanlingItem.packageQty = '';
+
+      this.$message.success(`自动创建了${this.handlingUnit.length}个HU，合计数量：${qtyToReceive}`);
+    },
+    /**
+     * 手动创建HU（手动模式）
+     */
+    createHandlingUnit() {
+      const { perQty, packageQty } = this.hanlingItem;
+      if (!perQty || !packageQty || isNaN(perQty) || isNaN(packageQty)) {
+        return this.$message.warning("请填写有效的包装信息");
+      }
+      const qty = parseFloat(perQty) * parseInt(packageQty);
+      const code = String(this.handlingUnit.length + 1);
+      const newItem = { ...this.hanlingItem, qty, code };
+      this.handlingUnit.push(newItem);
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+
+      this.hanlingItem.perQty = '';
+      this.hanlingItem.packageQty = '';
+    },
+    removeItem(index) {
+      this.handlingUnit.splice(index, 1);
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+    },
+    clearAllHandlingUnitCache() {
+      this.hanlingItem = { code: '', qty: '', perQty: '', packageQty: '' };
+      const keys = Object.keys(localStorage);
+      keys.forEach(key => {
+        if (key.startsWith('hu_shop_')) {
+          localStorage.removeItem(key);
         }
-      }).catch(error => {
-        this.loading = false;
-        this.$message.error('查询失败');
       });
     },
+    // 确认入库
+    async confirmInbound() {
+      if (this.fullscreenLoading) return;
+
+      const item = this.inboundItem;
+      if (!item.transQty || !item.locationNo || !item.batchNo) {
+        return this.$message.error("请填写完整信息");
+      }
+
+      // 检查数量是否超出
+      const transQty = parseFloat(item.transQty) || 0;
+      const qtyComplete = parseFloat(item.qtyComplete) || 0;
+      const lotSize = parseFloat(item.lotSize) || 0;
+
+      if (qtyComplete + transQty > lotSize) {
+        try {
+          await this.$confirm(
+            `当前已完成数量(${qtyComplete}) + 本次入库数量(${transQty}) = ${qtyComplete + transQty}，超过订单数量(${lotSize})，是否继续？`,
+            '数量超出提示',
+            {
+              confirmButtonText: '继续',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          );
+        } catch (error) {
+          // 用户取消
+          return;
+        }
+      }
+
+      this.loadingText = '提交中...';
+      this.fullscreenLoading = true;
+
+      // 构建提交数据
+      const submitData = {
+        // 基本字段
+        site: this.site,
+        warehouseId: this.warehouseId,
+        orderNo: item.orderNo,
+        releaseNo: item.releaseNo,
+        sequenceNo: item.sequenceNo,
+        partNo: item.partNo,
+        partDesc: item.partDesc,
+        transQty: item.transQty,
+        batchNo: item.batchNo,
+        locationNo: item.locationNo,
+        serialNo: item.serialNo || '*',
+        engChgLevel: item.engChgLevel || '1',
+        uom: item.uom,
+        lotSize: item.lotSize,
+        qtyComplete: item.qtyComplete,
+        // IFS参数
+        ifsAutoReport: item.ifsAutoReport ? 'Yes' : 'No',
+        ifsSimplifiedMaterial: item.ifsSimplifiedMaterial ? 'Yes' : 'No',
+        // 处理单元列表
+        handlingUnitList: this.handlingUnit.map(hu => ({
+          perQty: hu.perQty,
+          packageQty: hu.packageQty
+        }))
+      };
 
-    // 跳转到入库登记页面
-    goToRegisterPage(item) {
-      this.$router.push({
-        name: 'inboundRegisterDetail',
-        params: {
-          inboundNo: item.notifyNo,
+      submitShopOrderInbound(submitData).then(({ data }) => {
+        if (data.code === 0) {
+          this.$message.success("入库成功");
+          this.clearAllHandlingUnitCache();
+          this.printViaServer(data.data);
+          this.processFlag = 1;
+          this.scanCode = '';
+          this.shopOrderList = [];
+          this.inboundItem = {};
+          this.handlingUnit = [];
+        } else {
+          this.$message.error(data.msg || '入库失败');
         }
+      }).catch(error => {
+        console.error('入库失败:', error);
+        this.$message.error('网络错误，请重试');
+      }).finally(() => {
+        this.fullscreenLoading = false;
       });
-    }
+    },
+    /**
+     * 通过服务器打印
+     */
+    async printViaServer(transNo) {
+      this.$emit('print-start')
+      try {
+        const printRequest = {
+          userId: localStorage.getItem('userName'),
+          username: localStorage.getItem('userName'),
+          site: localStorage.getItem('site'),
+          transNo: transNo,
+          printLabel: "库存成品标签"
+        }
+        const { data } = await printLabel(printRequest)
+        if (data.code === 200) {
+          this.$message.success(`打印任务已发送！`)
+        }
+      } catch (error) {
+        console.error('服务器打印失败:', error)
+        this.$message.error(`打印失败: ${error.message || error}`)
+      }
+    },
   },
-
   mounted() {
-    // 聚焦搜索框
-    this.$nextTick(() => {
-      if (this.$refs.searchInput) {
-        this.$refs.searchInput.focus();
-      }
-    });
+    this.$nextTick(() => this.$refs.scanCodeRef.focus());
+  },
 
-    // 加载数据
-    this.loadInboundList();
-  }
 };
 </script>
 
 <style scoped>
-.pda-container {
-  width: 100vw;
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-  background: #f5f5f5;
+.mt10 {
+  margin-top: 10px;
 }
-
-/* 头部栏 */
-.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;
+.scan-box input {
+  width: 100%;
+  padding: 12px;
   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;
-}
-
-/* 内容区域 */
-.content-area {
+.item-list {
   flex: 1;
   overflow-y: auto;
-  padding: 12px 16px;
-}
-
-/* 入库卡片 */
-.inbound-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;
-}
-
-.inbound-card:hover {
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
-  transform: translateY(-1px);
+  margin: 10px 0;
+  border: 1px solid rgba(200, 200, 200, 0.8);
 }
-
-.inbound-card:active {
-  transform: translateY(0);
+.item-list span {
+  color: #000;
+  font-size: 15px;
 }
-
-/* 卡片标题 */
-.card-title {
-  margin-bottom: 12px;
+.bottom-line-row {
+  border-bottom: 1px solid rgba(200, 200, 200, 0.8);
 }
-
-.title-label {
-  font-size: 12px;
-  color: #666;
-  display: block;
-  margin-bottom: 4px;
-}
-
-.title-value {
+.recvButton {
   font-size: 16px;
-  font-weight: bold;
-  color: #333;
-  margin-left: 20px;
-}
-
-/* 卡片详情 */
-.card-details {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  gap: 4px;
+  border-radius: 3px;
+  color: #17b3a3;
 }
-
-.detail-item {
-  flex: 1;
-  text-align: center;
-  min-width: 60px;
-  max-width: 60px;
+.item-list .el-row {
+  cursor: pointer;
+  transition: background 0.3s;
 }
-
-.detail-label {
-  font-size: 11px;
-  color: #666;
-  margin-bottom: 4px;
-  line-height: 1.2;
-  margin-left: -12px;
+.item-list .el-row:hover {
+  background: #f5f7fa;
 }
-
-.detail-value {
-  font-size: 13px;
-  color: #333;
-  line-height: 1.2;
-  margin-left: -12px;
+.disabled-button {
+  color: #ccc !important;
+  cursor: not-allowed !important;
 }
-
-.detail-value .qualified {
-  color: #17B3A3;
-  font-weight: 500;
+.form-section >>> .el-col {
+  margin-bottom: 2px;
 }
-
-.detail-value .total {
-  color: #333;
-  font-weight: 500;
-}
-
-.detail-value .total::before {
-  content: '/';
-  color: #333;
-}
-
-/* 空状态 */
-.empty-state {
+.status-bar {
   display: flex;
-  flex-direction: column;
+  justify-content: space-between;
   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;
+  background: #17b3a3;
+  color: white;
 }
 
-/* 加载状态 */
-.loading-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 60px 20px;
-  color: #17B3A3;
+/* 自定义loading样式 */
+.pda-container >>> .el-loading-mask {
+  background-color: rgba(255, 255, 255, 0.3) !important;
 }
 
-.loading-state i {
-  font-size: 24px;
-  margin-bottom: 12px;
-  animation: spin 1s linear infinite;
+.pda-container >>> .el-loading-spinner {
+  margin-top: -25px;
 }
 
-@keyframes spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
+.pda-container >>> .el-loading-spinner .circular {
+  width: 35px;
+  height: 35px;
 }
 
-.loading-state p {
+.pda-container >>> .el-loading-text {
+  color: #17b3a3 !important;
   font-size: 14px;
-  margin: 0;
+  font-weight: 500;
+  margin-top: 10px;
 }
+</style>
 
-/* 响应式设计 */
-@media (max-width: 360px) {
-  .header-bar {
-    padding: 8px 12px;
-  }
-
-  .search-container {
-    padding: 8px 12px;
-  }
-
-  .content-area {
-    padding: 8px 12px;
-  }
-
-  .inbound-card {
-    padding: 12px;
-  }
-
-  .card-details {
-    flex-wrap: wrap;
-    gap: 6px;
-  }
-
-  .detail-item {
-    flex: 0 0 48%;
-    margin-bottom: 6px;
-    min-width: 50px;
-  }
-}
-</style>
\ No newline at end of file