647556386
15 小时以前 b5d01891fbbd69d8d50d2b4fb562fac3130fc2d6
虚拟出入库单据锁定
已修改7个文件
516 ■■■■ 文件已修改
项目代码/WIDESEA_WMSClient/config/buttons.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue 404 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundPickingService.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WIDESEA_WMSClient/config/buttons.js
@@ -284,7 +284,7 @@
    onClick: function () {
    }
},{
    name: "单据盘点与回库操作",
    name: "单据盘亏与回库操作",
    icon: '',
    class: '',
    value: 'OrderStockTake',
ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue
@@ -5,7 +5,7 @@
      :lazy="true"
      :width="isMobile ? '95%' : '70%'"
      :padding="24"
      title="库存盘点操作(条码盘盈不需要进行盘点完成操作)"
      title="库存盘亏操作(注意:条码盘盈不需要进行盘点操作,拿出多余物料以后,将料箱回库,之后杂收入库即可)"
      class="custom-vol-box"
    >
      <div class="stock-take-container">
@@ -133,7 +133,7 @@
            :disabled="loading"
            class="complete-btn"
          >
            <Check /> ç›˜ç‚¹å®Œæˆ
            <Check /> æ¡ç ç›˜äºæ“ä½œå®Œæˆ
          </el-button>
          <el-button
            type="text"
@@ -365,12 +365,12 @@
        stockQuantity,
      },
      {
        loadingText: "提交盘点数据中...",
        loadingText: "提交盘亏数据中...",
      }
    );
    if (res.status) {
      ElMessage.success("盘点完成,提交成功!");
      ElMessage.success("盘亏完成,提交成功!");
      formData.barcode = "";
      formData.stockQuantity = "";
      formData.actualQuantity = 0;
@@ -379,7 +379,7 @@
      });
      emit("refresh");
    } else {
      throw new Error(res.message || "盘点提交失败");
      throw new Error(res.message || "盘亏提交失败");
    }
  } catch (error) {
    ElMessage.error(error.message || "网络异常,提交失败");
ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue
@@ -35,7 +35,6 @@
              ref="outboundInputRef"
              :disabled="loading || submitLoading || isOutboundVerified"
            ></el-input>
            <!-- æ–°å¢žï¼šéªŒè¯çŠ¶æ€æç¤º -->
            <span v-if="isOutboundVerified" class="verified-tag">✓ å·²éªŒè¯</span>
            <span v-else-if="loading" class="loading-tag">✦ éªŒè¯ä¸­...</span>
          </el-form-item>
@@ -89,7 +88,7 @@
          </el-form-item>
        </el-form>
        <!-- ä¸‹æ–¹æ˜¾ç¤ºæ¡†ï¼ˆç›´æŽ¥æ¸²æŸ“后端返回的数组) -->
        <!-- ä¸‹æ–¹æ˜¾ç¤ºæ¡† -->
        <div class="scan-list">
          <el-card shadow="hover" style="margin-bottom: 10px; border: none;" class="custom-card">
            <div class="card-header">
@@ -98,36 +97,15 @@
            <div class="card-body">
              <el-scrollbar height="400px" class="custom-scrollbar">
                <transition-group name="barcode-item-transition">
                  <div class="barcode-item" v-for="(item, index) in scannedBarcodes" :key="`${item.barcode}-${index}`" :data-index="index">
                  <div class="barcode-item" v-for="(item, index) in scannedBarcodes" :key="`${item.barcode}-${index}`">
                    <div class="barcode-detail">
                      <div class="detail-row">
                        <span class="label">条码:</span>
                        <span class="value">{{ item.barcode || '-' }}</span>
                      </div>
                      <div class="detail-row">
                        <span class="label">物料编码:</span>
                        <span class="value">{{ item.materielCode || '-' }}</span>
                      </div>
                      <div class="detail-row">
                        <span class="label">物料名称:</span>
                        <span class="value">{{ item.materielName || '-' }}</span>
                      </div>
                      <div class="detail-row">
                        <span class="label">批次号:</span>
                        <span class="value">{{ item.batchNo || '-' }}</span>
                      </div>
                      <div class="detail-row">
                        <span class="label">条码数量:</span>
                        <span class="value">{{ item.orderQuantity || item.quantity || 0 }}</span>
                      </div>
                      <div class="detail-row">
                        <span class="label">供应商编码:</span>
                        <span class="value">{{ item.supplyCode || '-' }}</span>
                      </div>
                      <div class="detail-row">
                        <span class="label">采购单号:</span>
                        <span class="value">{{ item.purchaseOrderNo || '-' }}</span>
                      </div>
                      <div class="detail-row"><span class="label">条码:</span><span class="value">{{ item.barcode || '-' }}</span></div>
                      <div class="detail-row"><span class="label">物料编码:</span><span class="value">{{ item.materielCode || '-' }}</span></div>
                      <div class="detail-row"><span class="label">物料名称:</span><span class="value">{{ item.materielName || '-' }}</span></div>
                      <div class="detail-row"><span class="label">批次号:</span><span class="value">{{ item.batchNo || '-' }}</span></div>
                      <div class="detail-row"><span class="label">条码数量:</span><span class="value">{{ item.orderQuantity || item.quantity || 0 }}</span></div>
                      <div class="detail-row"><span class="label">供应商编码:</span><span class="value">{{ item.supplyCode || '-' }}</span></div>
                      <div class="detail-row"><span class="label">采购单号:</span><span class="value">{{ item.purchaseOrderNo || '-' }}</span></div>
                    </div>
                    <el-button
                      class="delete-btn"
@@ -162,11 +140,7 @@
          <el-button 
            type="text" 
            size="small" 
            @click="(e) => {
              e.stopPropagation();
              e.preventDefault();
              showDetailBox = false;
            }"
            @click="handleCancel"
            class="cancel-btn" 
            :disabled="loading || submitLoading"
          >
@@ -179,28 +153,21 @@
</template>
<script setup>
import { ref, reactive, onMounted, nextTick } from 'vue';
import { ref, reactive, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { Search, Check } from '@element-plus/icons-vue';
import VolBox from "@/components/basic/VolBox.vue";
import http from '@/api/http';
// å“åº”式数据
const showDetailBox = ref(false);
const orderForm = reactive({
  outboundOrderNo: "",
  purchaseOrderNo: ""
});
const formData = reactive({
  barcode: "",
});
const orderForm = reactive({ outboundOrderNo: "", purchaseOrderNo: "" });
const formData = reactive({ barcode: "" });
const scannedBarcodes = ref([]);
const loading = ref(false);
// æ–°å¢žï¼šæäº¤ä¸“属loading状态,控制遮罩层显示
const submitLoading = ref(false);
// æ ¸å¿ƒæ–°å¢žï¼šå‡ºåº“单验证状态标识
const isOutboundVerified = ref(false);
let unlockCalled = false; // é˜²æ­¢é‡å¤è§£é”
// æ¨¡æ¿å¼•用
const formRef = ref(null);
@@ -208,253 +175,172 @@
const outboundInputRef = ref(null);
const purchaseInputRef = ref(null);
// éŸ³é¢‘资源
const successAudioSrc = require('@/assets/audio/success.mp3');
const errorAudioSrc = require('@/assets/audio/error.mp3');
// ========== ä»…新增:音频播放函数(无其他代码改动) ==========
const playAudio = (audioSrc, volume = 0.8) => {
  try {
    const audio = new Audio(audioSrc);
    audio.volume = volume;
    audio.play().catch(() => {});
  } catch (e) {}
const playAudio = (src, volume = 0.8) => {
  try { const audio = new Audio(src); audio.volume = volume; audio.play().catch(() => {}); } catch(e) {}
};
const playSuccess = () => playAudio(successAudioSrc);
const playError = () => playAudio(errorAudioSrc);
// ========== éŸ³é¢‘函数结束 ==========
// ç»„件挂载时聚焦到出库单输入框
onMounted(() => {
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
});
// ç®€å•防抖函数
const debounce = (fn, delay = 100) => {
  let timer = null;
  return (...args) => {
    if (timer) clearTimeout(timer);
    timer = setTimeout(() => {
      fn.apply(this, args);
    }, delay);
  };
// ========== è§£é”æ ¸å¿ƒé€»è¾‘(使用新接口 MovePickingOrders) ==========
const unlockOutboundOrder = async () => {
  if (!isOutboundVerified.value || !orderForm.outboundOrderNo?.trim()) return;
  if (unlockCalled) return;
  unlockCalled = true;
  const outboundOrderNo = orderForm.outboundOrderNo.trim();
  try {
    // æ›¿æ¢ä¸º MovePickingOrders æŽ¥å£
    await http.post(`/api/OutboundPicking/MovePickingOrders?outOrder=${outboundOrderNo}`, null, "解锁出库单中...").catch(() => {});
  } catch (error) {
    // é™é»˜å¤±è´¥
  }
};
// æ‰“开弹窗
// é¡µé¢å…³é—­/刷新时的同步解锁(使用 sendBeacon æˆ– fetch keepalive)
const unlockOnPageUnload = () => {
  if (!isOutboundVerified.value || !orderForm.outboundOrderNo?.trim()) return;
  const outboundOrderNo = orderForm.outboundOrderNo.trim();
  const url = `/api/OutboundPicking/MovePickingOrders?outOrder=${encodeURIComponent(outboundOrderNo)}`;
  // ä½¿ç”¨ fetch keepalive å‘送
  fetch(url, { method: 'POST', keepalive: true, headers: { 'Content-Type': 'application/json' } }).catch(() => {});
};
// ç›‘听弹窗关闭(任何方式:叉号、ESC、遮罩、取消按钮等)
watch(showDetailBox, (newVal, oldVal) => {
  if (oldVal === true && newVal === false) {
    // å¼¹çª—关闭时调用解锁
    unlockOutboundOrder();
  }
});
// å–消按钮
const handleCancel = (e) => {
  e?.stopPropagation();
  e?.preventDefault();
  showDetailBox.value = false;
};
// æ‰“开弹窗(重置所有状态)
const open = () => {
  unlockCalled = false;
  showDetailBox.value = true;
  scannedBarcodes.value = [];
  formData.barcode = "";
  orderForm.outboundOrderNo = "";
  orderForm.purchaseOrderNo = "";
  submitLoading.value = false; // æ‰“开弹窗时重置提交loading
  isOutboundVerified.value = false; // æ‰“开弹窗时重置出库单验证状态
  nextTick(() => {
    outboundInputRef.value?.focus(); // æ‰“开弹窗仍聚焦出库单输入框
  });
  submitLoading.value = false;
  isOutboundVerified.value = false;
  nextTick(() => outboundInputRef.value?.focus());
};
/**
 * éªŒè¯å‡ºåº“单据号的有效性
 * æ ¸å¿ƒä¿®æ”¹ï¼šéªŒè¯æˆåŠŸåŽæ ‡è®°isOutboundVerified为true,失败则重置为false
 */
// éªŒè¯å‡ºåº“单号(仍使用原接口,此接口用于验证单据有效性)
const validateOutboundOrder = async () => {
  const outboundOrderNo = orderForm.outboundOrderNo.trim();
  if (!outboundOrderNo) {
    ElMessage.warning("请输入出库单据号");
    return;
  }
  if (!outboundOrderNo) { ElMessage.warning("请输入出库单据号"); return; }
  try {
    loading.value = true;
    const res = await http.post(
      `/api/OutboundPicking/GetAvailablePickingOrders?outOrder=`+ outboundOrderNo,
      "验证出库单据号中..."
    );
    const res = await http.post(`/api/OutboundPicking/GetAvailablePickingOrders?outOrder=${outboundOrderNo}`, "验证出库单据号中...");
    if (res.status !== true) {
      // éªŒè¯å¤±è´¥ï¼šæ¸…空输入框,提示错误,重置验证状态,聚焦回出库单输入框
      orderForm.outboundOrderNo = "";
      isOutboundVerified.value = false;
      ElMessage.error(res.message || "出库单据号验证失败,请检查单据号是否正确");
      nextTick(() => {
        outboundInputRef.value?.focus(); // å¤±è´¥èšç„¦å‡ºåº“单输入框
      });
      ElMessage.error(res.message || "出库单据号验证失败");
      nextTick(() => outboundInputRef.value?.focus());
      return;
    }
    // éªŒè¯æˆåŠŸï¼šæ ‡è®°éªŒè¯çŠ¶æ€ä¸ºtrue,提示用户,聚焦条码扫描框
    isOutboundVerified.value = true;
    ElMessage.success("出库单据号验证通过");
    nextTick(() => {
      barcodeInputRef.value?.focus(); // æˆåŠŸç›´æŽ¥è·³è½¬åˆ°æ¡ç æ‰«ææ¡†
    });
    nextTick(() => barcodeInputRef.value?.focus());
  } catch (error) {
    // æŽ¥å£å¼‚常:清空输入框,提示错误,重置验证状态,聚焦回出库单输入框
    orderForm.outboundOrderNo = "";
    isOutboundVerified.value = false;
    ElMessage.error(`出库单据号验证异常:${error.message || "网络错误,请重试"}`);
    nextTick(() => {
      outboundInputRef.value?.focus(); // å¼‚常聚焦出库单输入框
    });
    ElMessage.error(`验证异常:${error.message || "网络错误"}`);
    nextTick(() => outboundInputRef.value?.focus());
  } finally {
    loading.value = false;
  }
};
// å‡ºåº“单输入处理
const handleOutboundInput = (value) => {
  // æ ¸å¿ƒä¿®æ”¹ï¼šè¾“入时自动重置验证状态(防止手动修改已验证的出库单号)
  if (value && value.trim()) {
    isOutboundVerified.value = false;
  }
};
const handleOutboundInput = (val) => { if (val?.trim()) isOutboundVerified.value = false; };
const handlePurchaseInput = (val) => {};
// é‡‡è´­å•输入处理
const handlePurchaseInput = (value) => {
  if (value && value.trim()) {
    // å¯ä¿ç•™é‡‡è´­å•号格式验证逻辑
  }
};
// èšç„¦æ¡ç è¾“入框(复用函数)
const focusBarcodeInputDirectly = () => {
  if (isOutboundVerified.value) {
    barcodeInputRef.value?.focus();
  } else {
    ElMessage.warning("请先输入并验证有效的出库单据号");
    nextTick(() => {
      outboundInputRef.value?.focus();
    });
  }
};
/**
 * æ ¹æ®æ¡ç æŸ¥è¯¢é‡‡è´­å•号
 */
// èŽ·å–é‡‡è´­å•å·
const getPurchaseOrderByBarcode = async (barcode) => {
  const res = await http.post(`/api/OutboundPicking/GetPurchaseOrderByBarcode?barCode=${encodeURIComponent(barcode)}`, "查询采购单号中...");
  if (res.status !== true) {
    throw new Error(res.message || "查询采购单号失败");
  }
  if (res.status !== true) throw new Error(res.message || "查询失败");
  let purchaseOrderNo = '';
  if (Array.isArray(res.data) && res.data.length > 0) {
    purchaseOrderNo = res.data[0].purchaseOrderNo || res.data[0].orderId;
  } else {
    purchaseOrderNo = res.data?.purchaseOrderNo || res.data?.orderId;
  }
  if (Array.isArray(res.data) && res.data.length > 0) purchaseOrderNo = res.data[0].purchaseOrderNo || res.data[0].orderId;
  else purchaseOrderNo = res.data?.purchaseOrderNo || res.data?.orderId;
  return purchaseOrderNo;
};
// æ‰«ææ¡ç æ ¸å¿ƒé€»è¾‘
// æ‰«ææ¡ç 
const handleScan = async () => {
  // æ ¸å¿ƒæ–°å¢žï¼šå‰ç½®æ ¡éªŒï¼Œç¡®ä¿å‡ºåº“单已验证
  if (!isOutboundVerified.value) {
    ElMessage.warning("请先验证有效的出库单据号后再扫描条码");
    playError(); // ========== ä»…新增这一行 ==========
    nextTick(() => {
      outboundInputRef.value?.focus();
    });
    ElMessage.warning("请先验证出库单据号");
    playError();
    nextTick(() => outboundInputRef.value?.focus());
    return;
  }
  if (!formRef.value) return;
  await formRef.value.validateField('barcode');
  const barcode = formData.barcode.trim();
  const outboundOrderNo = orderForm.outboundOrderNo.trim();
  // æ¡ç åŽ»é‡
  if (!barcode) return;
  const isDuplicate = scannedBarcodes.value.some(item => item.barcode === barcode);
  if (isDuplicate) {
    ElMessage.warning(`条码【${barcode}】已存在,无需重复扫描`);
    playError(); // ========== ä»…新增这一行 ==========
    ElMessage.warning(`条码【${barcode}】已存在`);
    playError();
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus()); // åŽ»é‡åŽä»èšç„¦æ¡ç æ¡†
    nextTick(() => barcodeInputRef.value?.focus());
    return;
  }
  try {
    loading.value = true;
    // æ­¥éª¤1:查询采购单号
    let purchaseOrderNo = '';
    try {
      purchaseOrderNo = await getPurchaseOrderByBarcode(barcode);
      if (purchaseOrderNo) {
        orderForm.purchaseOrderNo = purchaseOrderNo;
      } else {
        ElMessage.info("未查询到该条码对应的采购单号,继续验证条码有效性");
        playError(); // ========== ä»…新增这一行 ==========
      }
    } catch (error) {
      ElMessage.info("未查询到该条码对应的采购单号,继续验证条码有效性:" + error.message);
      playError(); // ========== ä»…新增这一行 ==========
    }
    // æ­¥éª¤2:验证条码并获取物料信息
      if (purchaseOrderNo) orderForm.purchaseOrderNo = purchaseOrderNo;
    } catch (e) { ElMessage.info("未查询到采购单号,继续验证条码"); playError(); }
    const validateRes = await http.post("/api/OutboundPicking/BarcodeValidate", {
      outOder: outboundOrderNo,
      outOder: orderForm.outboundOrderNo,
      inOder: purchaseOrderNo || orderForm.purchaseOrderNo,
      barCode: barcode
    });
    if (validateRes.status === true) {
      if (!Array.isArray(validateRes.data) || validateRes.data.length === 0) {
        ElMessage.warning("该条码验证成功,但未返回物料信息");
        playError(); // ========== ä»…新增这一行 ==========
        formData.barcode = "";
        nextTick(() => barcodeInputRef.value?.focus());
      } else {
        const newItems = validateRes.data.map(item => ({
          barcode: item.barcode || '',
          materielCode: item.materielCode || '',
          materielName: item.materielName || '',
          batchNo: item.batchNo || '',
          orderQuantity: item.orderQuantity || item.quantity || 0,
          supplyCode: item.supplyCode || '',
          purchaseOrderNo: purchaseOrderNo || ''
        }));
        scannedBarcodes.value.push(...newItems);
        ElMessage.success(`扫描成功,新增 ${newItems.length} æ¡ç‰©æ–™ä¿¡æ¯ï¼Œç´¯è®¡ ${scannedBarcodes.value.length} æ¡`);
        playSuccess(); // ========== ä»…新增这一行 ==========
        formData.barcode = "";
      }
    } else {
      playError(); // ========== ä»…新增这一行 ==========
    if (validateRes.status === true && Array.isArray(validateRes.data) && validateRes.data.length) {
      const newItems = validateRes.data.map(item => ({
        barcode: item.barcode || '',
        materielCode: item.materielCode || '',
        materielName: item.materielName || '',
        batchNo: item.batchNo || '',
        orderQuantity: item.orderQuantity || item.quantity || 0,
        supplyCode: item.supplyCode || '',
        purchaseOrderNo: purchaseOrderNo || ''
      }));
      scannedBarcodes.value.push(...newItems);
      ElMessage.success(`扫描成功,新增 ${newItems.length} æ¡`);
      playSuccess();
      formData.barcode = "";
      nextTick(() => barcodeInputRef.value?.focus());
    } else {
      ElMessage.error(validateRes.message || '条码验证失败');
      playError();
      formData.barcode = "";
    }
  } catch (error) {
    ElMessage.error(error.message);
    playError(); // ========== ä»…新增这一行 ==========
    ElMessage.error('条码验证异常');
    playError();
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
  } finally {
    loading.value = false;
    // æ‰«æå®ŒæˆåŽå§‹ç»ˆèšç„¦æ¡ç è¾“入框(方便连续扫描)
    nextTick(() => {
      barcodeInputRef.value?.focus();
      if (barcodeInputRef.value?.input) {
        barcodeInputRef.value.input.select = () => {};
      }
    });
    nextTick(() => barcodeInputRef.value?.focus());
  }
};
// å¸¦é˜²æŠ–的扫描处理
const debouncedHandleScan = debounce(async (e) => {
  e.stopPropagation();
  e.preventDefault();
  await handleScan();
}, 100);
const debounce = (fn, delay = 100) => {
  let timer = null;
  return (...args) => { if (timer) clearTimeout(timer); timer = setTimeout(() => fn.apply(this, args), delay); };
};
const debouncedHandleScan = debounce(async (e) => { e.stopPropagation(); e.preventDefault(); await handleScan(); }, 100);
// ç§»é™¤å•条记录
// åˆ é™¤æ¡ç 
const removeItem = async (index, barcode) => {
  try {
    loading.value = true;
@@ -464,82 +350,82 @@
      inOder: currentItem?.purchaseOrderNo || orderForm.purchaseOrderNo,
      barCode: barcode
    });
    if (res.status === true) {
      scannedBarcodes.value.splice(index, 1);
      ElMessage.success("删除成功");
      if (scannedBarcodes.value.length === 0) {
        orderForm.purchaseOrderNo = "";
      }
      if (scannedBarcodes.value.length === 0) orderForm.purchaseOrderNo = "";
    } else {
      ElMessage.error("删除失败:" + (res.message || '删除失败'));
      ElMessage.error("删除失败:" + (res.message || ''));
    }
  } catch (error) {
    ElMessage.error("删除条码异常:" + error.message);
    ElMessage.error("删除异常");
  } finally {
    loading.value = false;
    // åˆ é™¤åŽä»èšç„¦æ¡ç è¾“入框
    nextTick(() => barcodeInputRef.value?.focus());
  }
};
// æäº¤å‡ºåº“
const submit = async () => {
  // æ ¸å¿ƒæ–°å¢žï¼šå‰ç½®æ ¡éªŒå‡ºåº“单验证状态
  if (!isOutboundVerified.value) {
    ElMessage.warning("出库单据号未验证,无法提交");
    nextTick(() => {
      outboundInputRef.value?.focus();
    });
    ElMessage.warning("出库单据号未验证");
    nextTick(() => outboundInputRef.value?.focus());
    return;
  }
  if (scannedBarcodes.value.length === 0) {
    ElMessage.warning("请先扫描至少一条条码");
    ElMessage.warning("请先扫描条码");
    nextTick(() => barcodeInputRef.value?.focus());
    return;
  }
  const barcodes = scannedBarcodes.value.map(item => item.barcode);
  const purchaseOrderNos = [...new Set(scannedBarcodes.value.map(item => item.purchaseOrderNo).filter(Boolean))];
  try {
    // å¼€å¯æäº¤loading,显示遮罩层
    submitLoading.value = true;
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderNo,
      InOderSubmit: purchaseOrderNos.join(',') || '',
      BarCodeSubmit: barcodes
    });
    if (res.status === true) {
      ElMessage.success("出库提交成功");
      showDetailBox.value = false;
      scannedBarcodes.value = [];
      orderForm.purchaseOrderNo = "";
      isOutboundVerified.value = false; // æäº¤æˆåŠŸåŽé‡ç½®éªŒè¯çŠ¶æ€
      unlockOutboundOrder();
      showDetailBox.value = false; // è§¦å‘ watch è§£é”ï¼ˆä½†æäº¤æˆåŠŸåŽé€šå¸¸ä¸éœ€è¦è§£é”ï¼Œå› ä¸ºå·²ç»å‡ºåº“äº†ï¼Œä¸è¿‡åŽç«¯åº”è‡ªè¡Œå¤„ç†çŠ¶æ€ï¼‰
      // æ³¨æ„ï¼šæäº¤æˆåŠŸåŽä¸åº”è¯¥å†è°ƒç”¨è§£é”æŽ¥å£ï¼Œå› ä¸ºå•æ®å·²å¤„ç†å®Œæ¯•ã€‚è¿™é‡Œé€šè¿‡æ ‡å¿—é¿å…ï¼šsubmit æˆåŠŸåŽé‡ç½®éªŒè¯çŠ¶æ€
      isOutboundVerified.value = false;
      unlockCalled = true; // é˜²æ­¢ watch å†æ¬¡è°ƒç”¨è§£é”
    } else {
      ElMessage.error("出库提交失败:" + (res.message || '提交失败'));
      unlockOutboundOrder();
      ElMessage.error("出库提交失败:" + (res.message || ''));
      nextTick(() => barcodeInputRef.value?.focus());
    }
  } catch (error) {
    ElMessage.error("出库提交异常:" + error.message);
    unlockOutboundOrder();
    ElMessage.error("提交异常:" + error.message);
    nextTick(() => barcodeInputRef.value?.focus());
  } finally {
    // å…³é—­æäº¤loading,隐藏遮罩层
    submitLoading.value = false;
    loading.value = false;
  }
};
// æš´éœ²ç»™çˆ¶ç»„件的方法
defineExpose({
  open
// ç”Ÿå‘½å‘¨æœŸï¼šæ·»åŠ é¡µé¢å…³é—­æ—¶çš„è§£é”ç›‘å¬
onMounted(() => {
  window.addEventListener('beforeunload', unlockOnPageUnload);
});
onBeforeUnmount(() => {
  window.removeEventListener('beforeunload', unlockOnPageUnload);
  // ç»„件卸载时如果弹窗还开着,也尝试解锁(但通常页面关闭会触发 beforeunload)
  if (showDetailBox.value) {
    unlockOutboundOrder();
  }
});
// æš´éœ²æ–¹æ³•
defineExpose({ open });
</script>
<style scoped>
/*过渡动画 */
/* è¿‡æ¸¡åŠ¨ç”» */
.barcode-item-transition-enter-active,
.barcode-item-transition-leave-active {
  transition: all 0.3s ease;
@@ -556,7 +442,7 @@
  transition: transform 1s ease;
}
/* æ–°å¢žï¼šæäº¤é®ç½©å±‚样式 */
/* æäº¤é®ç½©å±‚样式 */
.submit-mask {
  position: absolute;
  top: 0;
@@ -583,7 +469,7 @@
  animation: el-loading-circle 1.5s linear infinite;
}
/* æ–°å¢žï¼šéªŒè¯çŠ¶æ€æ ‡ç­¾æ ·å¼ */
/* éªŒè¯çŠ¶æ€æ ‡ç­¾æ ·å¼ */
.verified-tag {
  color: #67c23a;
  font-size: 12px;
@@ -605,7 +491,6 @@
.scan-list {
  width: 100%;
}
.custom-card {
  border-radius: 12px;
  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08) !important;
@@ -614,7 +499,6 @@
.custom-card:hover {
  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.12) !important;
}
.card-header {
  display: flex;
  justify-content: space-between;
@@ -628,11 +512,9 @@
  font-size: 15px;
  color: #333;
}
.card-body {
  padding: 0;
}
.custom-scrollbar :deep(.el-scrollbar__thumb) {
  background: rgba(0, 0, 0, 0.2);
  border-radius: 4px;
@@ -645,7 +527,6 @@
.custom-scrollbar :deep(.el-scrollbar__wrap) {
  overflow-x: hidden;
}
.barcode-item {
  display: flex;
  justify-content: space-between;
@@ -691,7 +572,6 @@
  flex: 1;
  word-break: break-all;
}
.delete-btn {
  color: #ea1919;
  font-size: 16px;
@@ -707,7 +587,6 @@
  color: #f56c6c !important;
  background: rgba(245, 108, 108, 0.1);
}
.empty-tip {
  text-align: center;
  padding: 80px 0;
@@ -723,7 +602,6 @@
  font-size: 40px;
  color: #dcdfe6;
}
.custom-input :deep(.el-input__inner) {
  border-radius: 6px;
  border-color: #e4e7ed;
@@ -735,7 +613,6 @@
  border-color: #409eff;
  box-shadow: 0 0 0 3px rgba(64, 158, 255, 0.1);
}
.custom-button {
  border-radius: 6px;
  height: 36px;
@@ -748,7 +625,6 @@
  transform: translateY(-1px);
  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.2);
}
.footer-actions {
  text-align: right;
}
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundPickingService.cs
@@ -32,7 +32,12 @@
        /// <returns></returns>
        WebResponseContent GetAvailablePurchaseOrders();
        WebResponseContent GetAvailablePickingOrders(string outOrder);
        /// <summary>
        /// å•据锁定与解锁
        /// </summary>
        /// <param name="outOrder"></param>
        /// <returns></returns>
        WebResponseContent MovePickingOrders(string outOrder);
        /// <summary>
        /// æ‰«ç éªŒè¯
        /// </summary>
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs
@@ -60,9 +60,9 @@
        public int CreateType { get; set; }
        /// <summary>
        /// éƒ¨é—¨ç¼–号
        /// è™šæ‹Ÿå‡ºå…¥åº“锁定标识
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "部门编号")]
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "虚拟出入库锁定标识")]
        public string DepartmentCode { get; set; }
        /// <summary>
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs
@@ -2324,6 +2324,14 @@
            {
                return WebResponseContent.Instance.Error("未找到满足出库条件的出库单");
            }
            if (outboundOrder.DepartmentCode == "虚拟出入库锁定")
            {
                return WebResponseContent.Instance.Error("该单据另一台电脑正在进行虚拟出入库操作,请稍后再试");
            }
            else
            {
                outboundOrder.DepartmentCode = "虚拟出入库锁定";
            }
            if(outboundOrder.IsBatch == 0)
            {
                return WebResponseContent.Instance.Error("该单据不属于分批回传单据,不允许虚拟出入库");
@@ -2334,12 +2342,25 @@
                item.NoStockOutQty = 0;
                item.documentsNO = "";
            }
            _outboundOrderService.UpdateData(outboundOrder);
            _outboundOrderDetailService.UpdateData(outboundOrder.Details);
            return WebResponseContent.Instance.OK("成功");
        }
    public WebResponseContent BarcodeValidate(NoStockOutModel noStockOut)
        public WebResponseContent MovePickingOrders(string outOrder)
        {
            Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == outOrder).First();
            if (outboundOrder.DepartmentCode == "虚拟出入库锁定")
            {
                outboundOrder.DepartmentCode = "";
            }
            _outboundOrderService.UpdateData(outboundOrder);
            return WebResponseContent.Instance.OK("成功");
        }
        public WebResponseContent BarcodeValidate(NoStockOutModel noStockOut)
    {
        try
        {
@@ -2425,7 +2446,13 @@
                    {
                        return WebResponseContent.Instance.Error($"在出库单中未找到物料{item.MaterielCode}的可出库明细");
                    }
                    // x
                    foreach (var outboundOrderDetail in eligibleOutDetails)
                    {
                        outboundOrderDetail.NoStockOutQty = 0;
                        outboundOrderDetail.documentsNO = "";
                    }
                    _outboundOrderDetailService.UpdateData(eligibleOutDetails);
                    // éåŽ†ç¬¦åˆæ¡ä»¶çš„å‡ºåº“æ˜Žç»†ï¼Œé€è¡Œåˆ†é…æ•°é‡
                    foreach (var outDetail in eligibleOutDetails)
                    {
@@ -2709,12 +2736,58 @@
        {
            try
            {
                Dt_OutboundOrder outboundOrder = _inboundOrderRepository.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOutSubmit.OutOderSubmit && x.OrderStatus != OutOrderStatusEnum.出库完成.ObjToInt()).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到出库单:{noStockOutSubmit.OutOderSubmit}");
                }
                // 1. ç­›é€‰å‡ºæœ¬æ¬¡æäº¤æ¡ç å…³è”的出库明细
                List<Dt_OutboundOrderDetail> outboundOrderDetail2 = outboundOrder.Details
                    .Where(x => !string.IsNullOrWhiteSpace(x.documentsNO)
                        && noStockOutSubmit.BarCodeSubmit.Any(barcode =>
                            x.documentsNO.IndexOf(barcode, StringComparison.OrdinalIgnoreCase) >= 0))
                    .ToList();
                HashSet<string> existBarcodes = new HashSet<string>();
                foreach (var detail in outboundOrderDetail2)
                {
                    try
                    {
                        // ååºåˆ—化明细里的条码列表
                        var barcodesInDoc = JsonConvert.DeserializeObject<List<Barcodes>>(detail.documentsNO);
                        if (barcodesInDoc == null) continue;
                        // æŠŠæ¡ç åŠ å…¥åŽ»é‡é›†åˆ
                        foreach (var b in barcodesInDoc)
                        {
                            if (!string.IsNullOrEmpty(b.Barcode))
                                existBarcodes.Add(b.Barcode.Trim());
                        }
                    }
                    catch { }
                }
                // 3. å‰ç«¯æäº¤çš„æ¡ç  â†’ åŽ»é‡
                HashSet<string> submitBarcodes = new HashSet<string>(
                    noStockOutSubmit.BarCodeSubmit
                        .Where(b => !string.IsNullOrEmpty(b))
                        .Select(b => b.Trim())
                );
                // 4. æ‰¾å‡ºã€æäº¤äº†ï¼Œä½†ç³»ç»Ÿé‡Œä¸å­˜åœ¨ã€‘的条码
                var missingBarcodes = submitBarcodes.Except(existBarcodes).ToList();
                // 5. å¦‚果有缺失 â†’ æ‹¦æˆªæŠ¥é”™
                if (missingBarcodes.Any())
                {
                    return WebResponseContent.Instance.Error(
                        $"数据异常,以下条码在出库单中未找到或已被清空:{string.Join(",", missingBarcodes)}"
                    );
                }
                List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                Dictionary<int, List<string>> orderIdBarCodeDict = new Dictionary<int, List<string>>();
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs
@@ -127,6 +127,16 @@
        {
            return Service.GetAvailablePickingOrders(outOrder);
        }
        /// <summary>
        /// å•据锁定和解锁
        /// </summary>
        /// <param name="outOrder"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("MovePickingOrders"), AllowAnonymous]
        public WebResponseContent MovePickingOrders(string outOrder)
        {
            return Service.MovePickingOrders(outOrder);
        }
        [HttpPost, HttpGet, Route("BarcodeValidate"), AllowAnonymous]
        public WebResponseContent BarcodeValidate([FromBody] NoStockOutModel noStockOut)