Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

2026-01-13 d741e7a7ad7de5045e5c6b6145d9da1783cadecd

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue

@@ -8,6 +8,14 @@
      title="虚拟出入库"
      class="custom-vol-box"
    >
      <!-- æäº¤é®ç½©å±‚：覆盖整个弹窗内容区域 -->
      <div class="submit-mask" v-show="submitLoading">
        <div class="mask-content">
          <el-loading-spinner class="loading-icon" />
          <span class="loading-text">正在提交出库，请稍候...</span>
        </div>
      </div>

      <div>
        <!-- å•æ®è¾“入区域（支持扫码） -->
        <el-form 
@@ -23,12 +31,9 @@
              clearable
              style="width: 220px; margin-right: 10px;"
              @input="handleOutboundInput"
              @keyup.enter="(e) => {
                e.stopPropagation(); // é˜»æ­¢äº‹ä»¶å†’泡
                e.preventDefault(); // é˜»æ­¢é»˜è®¤è¡Œä¸º
                focusBarcodeInputDirectly();
              }"
              @keyup.enter="validateOutboundOrder"
              ref="outboundInputRef"
              :disabled="loading || submitLoading"
            ></el-input>
          </el-form-item>
          <el-form-item label="采购单据:" name="purchaseOrderNo">
@@ -40,6 +45,7 @@
              @input="handlePurchaseInput"
              readonly
              ref="purchaseInputRef"
              :disabled="submitLoading"
            ></el-input>
          </el-form-item>
        </el-form>
@@ -65,7 +71,7 @@
              @keydown.enter="debouncedHandleScan" 
              autofocus
              class="custom-input"
              :disabled="!orderForm.outboundOrderNo || loading"
              :disabled="!orderForm.outboundOrderNo || loading || submitLoading"
            ></el-input>
          </el-form-item>
          <el-form-item>
@@ -74,14 +80,14 @@
              size="small" 
              @click="handleScan" 
              class="custom-button"
              :disabled="!orderForm.outboundOrderNo || loading"
              :disabled="!orderForm.outboundOrderNo || loading || submitLoading"
            >
              <Search /> ç¡®è®¤æ‰«æ
            </el-button>
          </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">
@@ -90,14 +96,43 @@
            <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" :data-index="index">
                    <span class="barcode-text">{{ index + 1 }}. {{ item.barcode }}</span>
                  <div class="barcode-item" v-for="(item, index) in scannedBarcodes" :key="`${item.barcode}-${index}`" :data-index="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>
                    <el-button
                      class="delete-btn"
                      @click="removeItem(index, item.barcode)"
                      icon="Delete"
                      circle
                      :disabled="loading"
                      :disabled="loading || submitLoading"
                    ></el-button>
                  </div>
                </transition-group>
@@ -116,7 +151,7 @@
            type="primary" 
            size="small" 
            @click="submit" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderNo || !orderForm.purchaseOrderNo || loading" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderNo || loading || submitLoading" 
            class="submit-btn"
          >
            <Check /> æäº¤å‡ºåº“
@@ -130,7 +165,7 @@
              showDetailBox = false;
            }" 
            class="cancel-btn" 
            :disabled="loading"
            :disabled="loading || submitLoading"
          >
            å–消
          </el-button>
@@ -141,7 +176,7 @@
</template>

<script setup>
import { ref, reactive, onMounted, nextTick, watch } from 'vue';
import { ref, reactive, onMounted, nextTick } from 'vue';
import { ElMessage } from 'element-plus';
import { Search, Check } from '@element-plus/icons-vue';

@@ -159,8 +194,8 @@
});
const scannedBarcodes = ref([]);
const loading = ref(false);
// æ–°å¢žï¼šå­˜å‚¨é¦–次扫描的采购单号（用于一致性校验）
const firstPurchaseOrderNo = ref(null);
// æ–°å¢žï¼šæäº¤ä¸“属loading状态，控制遮罩层显示
const submitLoading = ref(false);

// æ¨¡æ¿å¼•ç”¨
const formRef = ref(null);
@@ -175,15 +210,7 @@
  });
});

// ç›‘听扫描列表，若为空则重置首次采购单号
watch(scannedBarcodes, (newVal) => {
  if (newVal.length === 0) {
    firstPurchaseOrderNo.value = null;
    orderForm.purchaseOrderNo = ""; // åŒæ­¥æ¸…空采购单输入框
  }
}, { deep: true });

// ç®€å•é˜²æŠ–函数（无需依赖lodash）
// ç®€å•é˜²æŠ–函数
const debounce = (fn, delay = 100) => {
  let timer = null;
  return (...args) => {
@@ -201,28 +228,71 @@
  formData.barcode = "";
  orderForm.outboundOrderNo = "";
  orderForm.purchaseOrderNo = "";
  // é‡ç½®é¦–次采购单号
  firstPurchaseOrderNo.value = null;
  submitLoading.value = false; // æ‰“开弹窗时重置提交loading
  nextTick(() => {
    outboundInputRef.value?.focus();
    outboundInputRef.value?.focus(); // æ‰“开弹窗仍聚焦出库单输入框
  });
};

// å‡ºåº“单输入处理（扫码或手动输入）
/**
 * éªŒè¯å‡ºåº“单据号的有效性
 * æ ¸å¿ƒä¿®æ”¹ï¼šéªŒè¯æˆåŠŸåŽç›´æŽ¥èšç„¦æ¡ç æ‰«ææ¡†ï¼Œå¤±è´¥åˆ™èšç„¦å›žå‡ºåº“单输入框
 */
const validateOutboundOrder = async () => {
  const outboundOrderNo = orderForm.outboundOrderNo.trim();
  if (!outboundOrderNo) {
    return;
  }

  try {
    loading.value = true;
    const res = await http.post(
      `/api/OutboundPicking/GetAvailablePickingOrders?outOrder=`+ outboundOrderNo,
      "验证出库单据号中..."
    );

    if (res.status !== true) {
      // éªŒè¯å¤±è´¥ï¼šæ¸…空输入框，提示错误，聚焦回出库单输入框
      orderForm.outboundOrderNo = "";
      ElMessage.error(res.message || "出库单据号验证失败，请检查单据号是否正确");
      nextTick(() => {
        outboundInputRef.value?.focus(); // å¤±è´¥èšç„¦å‡ºåº“单输入框
      });
      return;
    }

    // éªŒè¯æˆåŠŸï¼šæç¤ºç”¨æˆ·ï¼Œç›´æŽ¥èšç„¦æ¡ç æ‰«ææ¡†ï¼ˆæ ¸å¿ƒä¿®æ”¹ï¼‰
    ElMessage.success("出库单据号验证通过");
    nextTick(() => {
      barcodeInputRef.value?.focus(); // æˆåŠŸç›´æŽ¥è·³è½¬åˆ°æ¡ç æ‰«ææ¡†
    });
  } catch (error) {
    // æŽ¥å£å¼‚常：清空输入框，提示错误，聚焦回出库单输入框
    orderForm.outboundOrderNo = "";
    ElMessage.error(`出库单据号验证异常：${error.message || "网络错误，请重试"}`);
    nextTick(() => {
      outboundInputRef.value?.focus(); // å¼‚常聚焦出库单输入框
    });
  } finally {
    loading.value = false;
  }
};

// å‡ºåº“单输入处理
const handleOutboundInput = (value) => {
  if (value && value.trim()) {
    // å‡ºåº“单号格式验证逻辑（按需保留）
    // å¯ä¿ç•™å‡ºåº“单号格式验证逻辑
  }
};

// é‡‡è´­å•è¾“入处理（扫码或手动输入）
// é‡‡è´­å•è¾“入处理
const handlePurchaseInput = (value) => {
  if (value && value.trim()) {
    // é‡‡è´­å•å·æ ¼å¼éªŒè¯é€»è¾‘（按需保留）
    // å¯ä¿ç•™é‡‡è´­å•å·æ ¼å¼éªŒè¯é€»è¾‘
  }
};

// ç›´æŽ¥è·³è½¬åˆ°æ¡ç è¾“入框（无需先填采购单）
// èšç„¦æ¡ç è¾“入框（复用函数）
const focusBarcodeInputDirectly = () => {
  if (orderForm.outboundOrderNo.trim()) {
    barcodeInputRef.value?.focus();
@@ -232,120 +302,125 @@
};

/**
 * æ ¹æ®æ¡ç æŸ¥è¯¢é‡‡è´­å•æŽ¥å£ï¼ˆå®Œå…¨å¯¹é½ç¤ºä¾‹è¯·æ±‚格式）
 * @param {string} barcode æ¡ç 
 * @returns {Promise<string>} é‡‡è´­å•å·
 * æ ¹æ®æ¡ç æŸ¥è¯¢é‡‡è´­å•å·
 */
const getPurchaseOrderByBarcode = async (barcode) => {
  // å®Œå…¨æŒ‰ç…§ç¤ºä¾‹æ ¼å¼ï¼šurl拼接参数 + ç¬¬äºŒä¸ªå‚数传提示文本
  const res = await http.post(`/api/OutboundPicking/GetPurchaseOrderByBarcode?barCode=${encodeURIComponent(barcode)}`, "查询采购单中...");
  const res = await http.post(`/api/OutboundPicking/GetPurchaseOrderByBarcode?barCode=${encodeURIComponent(barcode)}`, "查询采购单号中...");

  if (res.status !== true) {
    throw new Error(res.message || "查询采购单失败");
    throw new Error(res.message || "查询采购单号失败");
  }
  if (!res.data?.purchaseOrderNo) {
    throw new Error("未查询到该条码对应的采购单");

  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;
  }
  return res.data.purchaseOrderNo;

  return purchaseOrderNo;
};

// æ‰«ææ¡ç æ ¸å¿ƒé€»è¾‘
const handleScan = async () => {
  if (!formRef.value) return;
  // éªŒè¯æ¡ç å¿…å¡«
  await formRef.value.validateField('barcode');

  const barcode = formData.barcode.trim();
  const outboundOrderNo = orderForm.outboundOrderNo.trim();

  // æ£€æŸ¥æ¡ç æ˜¯å¦å·²æ‰«æ
  if (scannedBarcodes.value.some(item => item.barcode === barcode)) {
    ElMessage.warning(`条码 ${barcode} å·²æ‰«æè¿‡ï¼Œè¯·å‹¿é‡å¤æ‰«æ`);
  // æ¡ç åŽ»é‡
  const isDuplicate = scannedBarcodes.value.some(item => item.barcode === barcode);
  if (isDuplicate) {
    ElMessage.warning(`条码【${barcode}】已存在，无需重复扫描`);
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
    nextTick(() => barcodeInputRef.value?.focus()); // åŽ»é‡åŽä»èšç„¦æ¡ç æ¡†
    return;
  }

  try {
    loading.value = true;

    // æ­¥éª¤1：仅传条码查询采购单（使用示例格式的请求）
    // æ­¥éª¤1：查询采购单号
    const purchaseOrderNo = await getPurchaseOrderByBarcode(barcode);

    // æ ¸å¿ƒæ ¡éªŒï¼šé‡‡è´­å•ä¸€è‡´æ€§æ£€æŸ¥
    if (firstPurchaseOrderNo.value) {
      // éžé¦–次扫描，校验采购单号是否一致
      if (purchaseOrderNo !== firstPurchaseOrderNo.value) {
        throw new Error(`当前条码对应的采购单【${purchaseOrderNo}】与首次扫描的采购单【${firstPurchaseOrderNo.value}】不一致，禁止扫描！`);
      }
    if (purchaseOrderNo) {
      orderForm.purchaseOrderNo = purchaseOrderNo;
    } else {
      // é¦–次扫描，记录采购单号
      firstPurchaseOrderNo.value = purchaseOrderNo;
      ElMessage.info("未查询到该条码对应的采购单号，继续验证条码有效性");
      formData.barcode = ""; // æ–°å¢žï¼šéªŒè¯å¤±è´¥æ—¶æ¸…空输入框
      nextTick(() => barcodeInputRef.value?.focus()); // æ–°å¢žï¼šèšç„¦æ¡ç è¾“入框
    }

    // èµ‹å€¼é‡‡è´­å•åˆ°è¾“入框
    orderForm.purchaseOrderNo = purchaseOrderNo;
    ElMessage.success(`成功查询到采购单：${purchaseOrderNo}`);

    // æ­¥éª¤2：调用原有条码验证接口（如需对齐格式可同步修改，此处保留原有格式）
    // æ­¥éª¤2：验证条码并获取物料信息
    const validateRes = await http.post("/api/OutboundPicking/BarcodeValidate", {
      outOder: outboundOrderNo,
      inOder: purchaseOrderNo,
      inOder: purchaseOrderNo || orderForm.purchaseOrderNo,
      barCode: barcode
    });

    if (validateRes.status === true) {
      scannedBarcodes.value.push({ barcode });
      ElMessage.success("扫描成功");
      formData.barcode = "";
      if (!Array.isArray(validateRes.data) || validateRes.data.length === 0) {
        ElMessage.warning("该条码验证成功，但未返回物料信息");
        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} æ¡`);
        formData.barcode = "";
      }
    } else {
      ElMessage.error("扫描失败：" + (validateRes.message || '条码验证失败'));
      formData.barcode = ""; // æ–°å¢žï¼šéªŒè¯å¤±è´¥æ—¶æ¸…空输入框
      nextTick(() => barcodeInputRef.value?.focus()); // æ–°å¢žï¼šèšç„¦æ¡ç è¾“入框
    }
  } catch (error) {
    // æ•èŽ·é‡‡è´­å•ä¸ä¸€è‡´ç­‰é”™è¯¯å¹¶æç¤º
    ElMessage.error(error.message);
    // æ¸…空当前输入框，聚焦条码输入框
    formData.barcode = "";
    formData.barcode = ""; // ä¿ç•™ï¼šæŽ¥å£å¼‚常时清空
    // æ–°å¢žï¼šå¼‚常时也强制聚焦条码框
    nextTick(() => barcodeInputRef.value?.focus());
  } finally {
    loading.value = false;
    // å¼ºåˆ¶èšç„¦æ¡ç è¾“入框，避免焦点跳到弹窗外
    // æ‰«æå®ŒæˆåŽå§‹ç»ˆèšç„¦æ¡ç è¾“入框（方便连续扫描）
    nextTick(() => {
      if (barcodeInputRef.value) {
        barcodeInputRef.value.focus();
        // æ¸…空输入框选中状态（扫码枪可能残留选中）
        if (barcodeInputRef.value.input) {
          barcodeInputRef.value.input.select = () => {};
        }
      barcodeInputRef.value?.focus();
      if (barcodeInputRef.value?.input) {
        barcodeInputRef.value.input.select = () => {};
      }
    });
  }
};

// å¸¦é˜²æŠ–和事件拦截的扫描处理（适配扫码枪）
// å¸¦é˜²æŠ–的扫描处理
const debouncedHandleScan = debounce(async (e) => {
  // é˜»æ­¢äº‹ä»¶å†’泡和默认行为
  e.stopPropagation();
  e.preventDefault();
  await handleScan();
}, 100);

// ç§»é™¤å•æ¡æ‰«æè®°å½•
// ç§»é™¤å•æ¡è®°å½•
const removeItem = async (index, barcode) => {
  try {
    loading.value = true;
    const currentItem = scannedBarcodes.value[index];
    const res = await http.post("/api/OutboundPicking/DeleteBarcode", {
      outOder: orderForm.outboundOrderNo,
      inOder: orderForm.purchaseOrderNo,
      inOder: currentItem?.purchaseOrderNo || orderForm.purchaseOrderNo,
      barCode: barcode
    });

    if (res.status === true) {
      scannedBarcodes.value.splice(index, 1);
      ElMessage.success("删除成功");
      // è‹¥åˆ é™¤åŽæ— æ¡ç ï¼Œè‡ªåŠ¨é‡ç½®é¦–次采购单号和采购单输入框
      if (scannedBarcodes.value.length === 0) {
        firstPurchaseOrderNo.value = null;
        orderForm.purchaseOrderNo = "";
      }
    } else {
@@ -355,6 +430,8 @@
    ElMessage.error("删除条码异常：" + error.message);
  } finally {
    loading.value = false;
    // åˆ é™¤åŽä»èšç„¦æ¡ç è¾“入框
    nextTick(() => barcodeInputRef.value?.focus());
  }
};

@@ -362,31 +439,37 @@
const submit = async () => {
  if (scannedBarcodes.value.length === 0) {
    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.value = true;
    // å¼€å¯æäº¤loading，显示遮罩层
    submitLoading.value = true;
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderNo,
      InOderSubmit: orderForm.purchaseOrderNo,
      InOderSubmit: purchaseOrderNos.join(',') || '',
      BarCodeSubmit: barcodes
    });

    if (res.status === true) {
      ElMessage.success("出库提交成功");
      showDetailBox.value = false;
      // æäº¤æˆåŠŸåŽé‡ç½®çŠ¶æ€
      firstPurchaseOrderNo.value = null;
      scannedBarcodes.value = [];
      orderForm.purchaseOrderNo = "";
    } else {
      ElMessage.error("出库提交失败：" + (res.message || '提交失败'));
      nextTick(() => barcodeInputRef.value?.focus()); // æäº¤å¤±è´¥èšç„¦æ¡ç æ¡†
    }
  } catch (error) {
    ElMessage.error("出库提交异常：" + error.message);
    nextTick(() => barcodeInputRef.value?.focus()); // å¼‚常聚焦条码框
  } finally {
    // å…³é—­æäº¤loading，隐藏遮罩层
    submitLoading.value = false;
    loading.value = false;
  }
};
@@ -411,9 +494,35 @@
  opacity: 0;
  transform: translateX(30px);
}
/* åˆ é™¤åŠ¨ç”» */
.barcode-item-transition-move {
  transition: transform 1s ease;
}

/* æ–°å¢žï¼šæäº¤é®ç½©å±‚样式 */
.submit-mask {
  position: absolute;
  top: 0;
  left: 0;
  width: 100%;
  height: 100%;
  background-color: rgba(255, 255, 255, 0.85);
  display: flex;
  justify-content: center;
  align-items: center;
  z-index: 100;
  border-radius: inherit;
}
.mask-content {
  display: flex;
  flex-direction: column;
  align-items: center;
  gap: 12px;
  color: #409eff;
  font-size: 15px;
}
.loading-icon {
  font-size: 24px;
  animation: el-loading-circle 1.5s linear infinite;
}

.scan-list {
@@ -463,26 +572,47 @@
.barcode-item {
  display: flex;
  justify-content: space-between;
  align-items: center;
  padding: 10px 15px;
  align-items: flex-start;
  padding: 15px;
  border-bottom: 1px solid #f7f7f7;
  transition: background-color 0.2s ease;
}
.barcode-item:hover {
  background-color: #fafafa;
}
/* ä¸ºå¥‡æ•°è¡Œæ·»åŠ è½»å¾®çš„背景色 */
.barcode-item:nth-child(odd) {
  background-color: #f9f9f9;
}
.barcode-text {
.barcode-detail {
  flex: 1;
  display: grid;
  grid-template-columns: repeat(4, 1fr);
  gap: 8px 15px;
  font-size: 14px;
  color: #666;
  transition: color 0.2s;
}
.barcode-item:hover .barcode-text {
  color: #409eff;
@media (max-width: 1200px) {
  .barcode-detail {
    grid-template-columns: repeat(3, 1fr);
  }
}
@media (max-width: 992px) {
  .barcode-detail {
    grid-template-columns: repeat(2, 1fr);
  }
}
.detail-row {
  display: flex;
  align-items: center;
}
.label {
  color: #999;
  margin-right: 5px;
  white-space: nowrap;
}
.value {
  color: #666;
  flex: 1;
  word-break: break-all;
}

.delete-btn {
@@ -490,6 +620,8 @@
  font-size: 16px;
  transition: all 0.2s;
  opacity: 0.7;
  margin-left: 10px;
  flex-shrink: 0;
}
.barcode-item:hover .delete-btn {
  opacity: 1;
@@ -565,7 +697,6 @@
</style>

<style>
/* å…¨å±€æ ·å¼éƒ¨åˆ†ä¿æŒä¸å˜ */
.text-button:hover {
  background-color: #f0f9eb !important;
}