Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

heshaofeng

7 天以前 375ace27ad6afbc3c83d92add0fb5a0347a6edbf

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

@@ -9,56 +9,49 @@
      class="custom-vol-box"
    >
      <div>
        <!-- å•æ®é€‰æ‹©åŒºåŸŸï¼ˆå¯è¾“入搜索） -->
        <el-form :inline="true" :model="orderForm" style="margin-bottom: 20px; align-items: flex-end;">
          <el-form-item label="出库单据:" name="outboundOrderId">
            <el-select
              v-model="orderForm.outboundOrderId"
              placeholder="请选择或扫描出库单据号"
        <!-- å•æ®è¾“入区域（支持扫码） -->
        <el-form 
          :inline="true" 
          :model="orderForm" 
          style="margin-bottom: 20px; align-items: flex-end;"
          @submit.prevent
        >
          <el-form-item label="出库单据:" name="outboundOrderNo">
            <el-input
              v-model="orderForm.outboundOrderNo"
              placeholder="请输入或扫描出库单据号"
              clearable
              style="width: 220px; margin-right: 10px;"
              @change="handleOrderChange"
              @visible-change="handleOutboundVisibleChange"
              :loading="loading"
              filterable
              :filter-method="filterOutboundOrders"
              @input="handleOutboundScanInput"  
              ref="outboundSelectRef"        
            >
              <el-option
                v-for="order in filteredOutboundOrders"
                :key="order.id"
                :label="order.orderNo"
                :value="order.id"
              ></el-option>
            </el-select>
              @input="handleOutboundInput"
              @keyup.enter="(e) => {
                e.stopPropagation(); // é˜»æ­¢äº‹ä»¶å†’泡
                e.preventDefault(); // é˜»æ­¢é»˜è®¤è¡Œä¸º
                focusBarcodeInputDirectly();
              }"
              ref="outboundInputRef"
            ></el-input>
          </el-form-item>
          <el-form-item label="采购单据:" name="purchaseOrderId">
            <el-select
              v-model="orderForm.purchaseOrderId"
              placeholder="请选择或扫描采购单据号"
          <el-form-item label="采购单据:" name="purchaseOrderNo">
            <el-input
              v-model="orderForm.purchaseOrderNo"
              placeholder="扫码条码后自动填充"
              clearable
              style="width: 220px; margin-right: 10px;"
              @change="handleOrderChange"
              @visible-change="handlePurchaseVisibleChange"
              :loading="loading"
              filterable
              :filter-method="filterPurchaseOrders"
              @input="handlePurchaseScanInput" 
              ref="purchaseSelectRef"
            >
              <el-option
                v-for="order in filteredPurchaseOrders"
                :key="order.id"
                :label="order.orderNo"
                :value="order.id"
              ></el-option>
            </el-select>
              @input="handlePurchaseInput"
              readonly
              ref="purchaseInputRef"
            ></el-input>
          </el-form-item>
        </el-form>

        <!-- ä¸Šæ–¹è¾“入框 -->
        <el-form :inline="true" :model="formData" ref="formRef" style="margin-bottom: 20px; align-items: flex-end;">
        <el-form 
          :inline="true" 
          :model="formData" 
          ref="formRef" 
          style="margin-bottom: 20px; align-items: flex-end;"
          @submit.prevent  
        >
          <el-form-item
            label="扫描条码:"
            style="width: 80%"
@@ -69,10 +62,10 @@
              ref="barcodeInputRef"
              v-model="formData.barcode"
              placeholder="请使用扫码枪扫描条码，或手动输入"
              @keyup.enter="handleScan"
              @keydown.enter="debouncedHandleScan" 
              autofocus
              class="custom-input"
              :disabled="!orderForm.outboundOrderId || !orderForm.purchaseOrderId"
              :disabled="!orderForm.outboundOrderNo || loading"
            ></el-input>
          </el-form-item>
          <el-form-item>
@@ -81,7 +74,7 @@
              size="small" 
              @click="handleScan" 
              class="custom-button"
              :disabled="!orderForm.outboundOrderId || !orderForm.purchaseOrderId || loading"
              :disabled="!orderForm.outboundOrderNo || loading"
            >
              <Search /> ç¡®è®¤æ‰«æ
            </el-button>
@@ -109,7 +102,7 @@
                  </div>
                </transition-group>
                <div class="empty-tip" v-if="scannedBarcodes.length === 0">
                  <span>暂无扫描记录，请先选择单据后扫描条码</span>
                  <span>暂无扫描记录，请先输入出库单据后扫描条码</span>
                </div>
              </el-scrollbar>
            </div>
@@ -123,12 +116,22 @@
            type="primary" 
            size="small" 
            @click="submit" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderId || !orderForm.purchaseOrderId || loading" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderNo || !orderForm.purchaseOrderNo || loading" 
            class="submit-btn"
          >
            <Check /> æäº¤å‡ºåº“
          </el-button>
          <el-button type="text" size="small" @click="showDetailBox = false" class="cancel-btn" :disabled="loading">
          <el-button 
            type="text" 
            size="small" 
            @click="(e) => {
              e.stopPropagation();
              e.preventDefault();
              showDetailBox = false;
            }" 
            class="cancel-btn" 
            :disabled="loading"
          >
            å–消
          </el-button>
        </div>
@@ -138,8 +141,9 @@
</template>

<script setup>
import { ref, reactive, onMounted, nextTick } from 'vue';
import { ref, reactive, onMounted, 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';
@@ -147,210 +151,114 @@
// å“åº”式数据
const showDetailBox = ref(false);
const orderForm = reactive({
  outboundOrderId: "",
  purchaseOrderId: ""
  outboundOrderNo: "",
  purchaseOrderNo: ""
});
const formData = reactive({
  barcode: "",
});
const scannedBarcodes = ref([]);
const outboundOrders = ref([]);
const purchaseOrders = ref([]);
const filteredOutboundOrders = ref([]);
const filteredPurchaseOrders = ref([]);
const loading = ref(false);
// æ–°å¢žï¼šå­˜å‚¨é¦–次扫描的采购单号（用于一致性校验）
const firstPurchaseOrderNo = ref(null);

// æ¨¡æ¿å¼•ç”¨
const formRef = ref(null);
const barcodeInputRef = ref(null);
const outboundSelectRef = ref(null); // æ–°å¢žï¼šå‡ºåº“单select的ref
const purchaseSelectRef = ref(null); // æ–°å¢žï¼šé‡‡è´­å•select的ref
const outboundInputRef = ref(null);
const purchaseInputRef = ref(null);

// ç”¨äºŽé˜²æ­¢è¾“入事件和change事件冲突的锁
const isProcessingScan = ref(false);

// ç»„件挂载时初始化过滤后的列表
// ç»„件挂载时聚焦到出库单输入框
onMounted(() => {
  filteredOutboundOrders.value = [...outboundOrders.value];
  filteredPurchaseOrders.value = [...purchaseOrders.value];
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
});

// ç›‘听扫描列表，若为空则重置首次采购单号
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) => {
    if (timer) clearTimeout(timer);
    timer = setTimeout(() => {
      fn.apply(this, args);
    }, delay);
  };
};

// æ‰“开弹窗
const open = () => {
  showDetailBox.value = true;
  scannedBarcodes.value = [];
  formData.barcode = "";
  orderForm.outboundOrderId = "";
  orderForm.purchaseOrderId = "";
  orderForm.outboundOrderNo = "";
  orderForm.purchaseOrderNo = "";
  // é‡ç½®é¦–次采购单号
  firstPurchaseOrderNo.value = null;
  nextTick(() => {
    barcodeInputRef.value?.focus();
    outboundInputRef.value?.focus();
  });
};

// åŠ è½½å‡ºåº“单据列表
const loadOutboundOrders = async () => {
  if (outboundOrders.value.length > 0) return;
  try {
    loading.value = true;
    const res = await http.get("/api/OutboundPicking/GetAvailablePickingOrders");
    
    if (res.code === 0) {
      outboundOrders.value = res.data.map(orderNo => ({
        id: orderNo,
        orderNo: orderNo
      }));
      filteredOutboundOrders.value = [...outboundOrders.value];
    } else {
      ElMessage.error("加载出库单据失败：" + (res.message || '未知错误'));
    }
  } catch (error) {
    ElMessage.error("加载出库单据异常：" + error.message);
  } finally {
    loading.value = false;
// å‡ºåº“单输入处理（扫码或手动输入）
const handleOutboundInput = (value) => {
  if (value && value.trim()) {
    // å‡ºåº“单号格式验证逻辑（按需保留）
  }
};

// åŠ è½½é‡‡è´­å•æ®åˆ—表
const loadPurchaseOrders = async () => {
  if (purchaseOrders.value.length > 0) return;
  try {
    loading.value = true;
    const res = await http.get("/api/OutboundPicking/GetAvailablePurchaseOrders");
    
    if (res.status === true) {
      purchaseOrders.value = res.data.map(orderNo => ({
        id: orderNo,
        orderNo: orderNo
      }));
      filteredPurchaseOrders.value = [...purchaseOrders.value];
    } else {
      ElMessage.error("加载采购单据失败：" + (res.message || '未知错误'));
    }
  } catch (error) {
    ElMessage.error("加载采购单据异常：" + error.message);
  } finally {
    loading.value = false;
// é‡‡è´­å•è¾“入处理（扫码或手动输入）
const handlePurchaseInput = (value) => {
  if (value && value.trim()) {
    // é‡‡è´­å•å·æ ¼å¼éªŒè¯é€»è¾‘（按需保留）
  }
};

// å‡ºåº“单据过滤方法
const filterOutboundOrders = (value) => {
  if (!value) {
    filteredOutboundOrders.value = [...outboundOrders.value];
  } else {
    const lowerValue = value.toLowerCase();
    filteredOutboundOrders.value = outboundOrders.value.filter(order => 
      order.orderNo.toLowerCase().includes(lowerValue)
    );
  }
};

// é‡‡è´­å•æ®è¿‡æ»¤æ–¹æ³•
const filterPurchaseOrders = (value) => {
  if (!value) {
    filteredPurchaseOrders.value = [...purchaseOrders.value];
  } else {
    const lowerValue = value.toLowerCase();
    filteredPurchaseOrders.value = purchaseOrders.value.filter(order => 
      order.orderNo.toLowerCase().includes(lowerValue)
    );
  }
};

// å‡ºåº“单据下拉框显示/隐藏时触发
const handleOutboundVisibleChange = (visible) => {
  if (visible) {
    loadOutboundOrders();
  } else {
    // å½“下拉框关闭时，如果是扫描操作导致的，清空输入框
    if (isProcessingScan.value) {
        nextTick(() => {
            outboundSelectRef.value?.clearInput();
            isProcessingScan.value = false;
        });
    }
  }
};

// é‡‡è´­å•æ®ä¸‹æ‹‰æ¡†æ˜¾ç¤º/隐藏时触发
const handlePurchaseVisibleChange = (visible) => {
  if (visible) {
    loadPurchaseOrders();
  } else {
    // å½“下拉框关闭时，如果是扫描操作导致的，清空输入框
    if (isProcessingScan.value) {
        nextTick(() => {
            purchaseSelectRef.value?.clearInput();
            isProcessingScan.value = false;
        });
    }
  }
};

// å•æ®é€‰æ‹©å˜åŒ–时触发
const handleOrderChange = () => {
  // å¦‚果是手动选择，则不清空输入框
  isProcessingScan.value = false;
  
  scannedBarcodes.value = [];
  nextTick(() => {
// ç›´æŽ¥è·³è½¬åˆ°æ¡ç è¾“入框（无需先填采购单）
const focusBarcodeInputDirectly = () => {
  if (orderForm.outboundOrderNo.trim()) {
    barcodeInputRef.value?.focus();
  });
};

/**
 * å¤„理出库单扫描输入
 * @param {string} scanText - æ‰«ææžªè¾“入的文本
 */
const handleOutboundScanInput = async (scanText) => {
  // é¿å…å¤„理空字符串或由change事件触发的内部操作
  if (!scanText || isProcessingScan.value) return;

  // æŸ¥æ‰¾å®Œå…¨åŒ¹é…çš„订单
  const matchedOrder = outboundOrders.value.find(order => order.orderNo === scanText);

  if (matchedOrder) {
    isProcessingScan.value = true; // æ ‡è®°ä¸ºæ­£åœ¨å¤„理扫描
    // æ‰‹åŠ¨èµ‹å€¼
    orderForm.outboundOrderId = matchedOrder.id;
    ElMessage.success(`成功选择出库单：${matchedOrder.orderNo}`);
    
    // å»¶è¿Ÿèšç„¦åˆ°ä¸‹ä¸€ä¸ªè¾“入框，确保赋值完成
    setTimeout(() => {
        purchaseSelectRef.value?.focus();
    }, 100);
  }
  // å¦‚果没有匹配项，不做任何事，让el-select保持过滤状态，用户可以手动选择
};

/**
 * å¤„理采购单扫描输入
 * @param {string} scanText - æ‰«ææžªè¾“入的文本
 */
const handlePurchaseScanInput = async (scanText) => {
  if (!scanText || isProcessingScan.value) return;

  const matchedOrder = purchaseOrders.value.find(order => order.orderNo === scanText);

  if (matchedOrder) {
    isProcessingScan.value = true; // æ ‡è®°ä¸ºæ­£åœ¨å¤„理扫描
    orderForm.purchaseOrderId = matchedOrder.id;
    ElMessage.success(`成功选择采购单：${matchedOrder.orderNo}`);
    
    setTimeout(() => {
        barcodeInputRef.value?.focus();
    }, 100);
  } else {
    ElMessage.warning("请先输入有效的出库单据号");
  }
};

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

// æ‰«ææ¡ç å¤„理
  if (res.status !== true) {
    throw new Error(res.message || "查询采购单失败");
  }
  if (!res.data?.purchaseOrderNo) {
    throw new Error("未查询到该条码对应的采购单");
  }
  return res.data.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} å·²æ‰«æè¿‡ï¼Œè¯·å‹¿é‡å¤æ‰«æ`);
    formData.barcode = "";
@@ -360,40 +268,86 @@

  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/BarcodeValidate", {
      outOder: orderForm.outboundOrderId,
      inOder: orderForm.purchaseOrderId,

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

    // æ ¸å¿ƒæ ¡éªŒï¼šé‡‡è´­å•ä¸€è‡´æ€§æ£€æŸ¥
    if (firstPurchaseOrderNo.value) {
      // éžé¦–次扫描，校验采购单号是否一致
      if (purchaseOrderNo !== firstPurchaseOrderNo.value) {
        throw new Error(`当前条码对应的采购单【${purchaseOrderNo}】与首次扫描的采购单【${firstPurchaseOrderNo.value}】不一致，禁止扫描！`);
      }
    } else {
      // é¦–次扫描，记录采购单号
      firstPurchaseOrderNo.value = purchaseOrderNo;
    }

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

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

    if (res.status === true) {
    if (validateRes.status === true) {
      scannedBarcodes.value.push({ barcode });
      ElMessage.success("扫描成功");
      formData.barcode = "";
    } else {
      ElMessage.error("扫描失败：" + (res.message || '验证失败'));
      ElMessage.error("扫描失败：" + (validateRes.message || '条码验证失败'));
    }
  } catch (error) {
    ElMessage.error("扫描验证异常：" + error.message);
    // æ•èŽ·é‡‡è´­å•ä¸ä¸€è‡´ç­‰é”™è¯¯å¹¶æç¤º
    ElMessage.error(error.message);
    // æ¸…空当前输入框，聚焦条码输入框
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
  } finally {
    loading.value = false;
    nextTick(() => barcodeInputRef.value?.focus());
    // å¼ºåˆ¶èšç„¦æ¡ç è¾“入框，避免焦点跳到弹窗外
    nextTick(() => {
      if (barcodeInputRef.value) {
        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 res = await http.post("/api/OutboundPicking/DeleteBarcode", {
      outOder: orderForm.outboundOrderId,
      inOder: orderForm.purchaseOrderId,
      outOder: orderForm.outboundOrderNo,
      inOder: 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 {
      ElMessage.error("删除失败：" + (res.message || '删除失败'));
    }
@@ -416,14 +370,17 @@
  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderId,
      InOderSubmit: orderForm.purchaseOrderId,
      OutOderSubmit: orderForm.outboundOrderNo,
      InOderSubmit: orderForm.purchaseOrderNo,
      BarCodeSubmit: barcodes
    });

    if (res.status === true) {
      ElMessage.success("出库提交成功");
      showDetailBox.value = false;
      // æäº¤æˆåŠŸåŽé‡ç½®çŠ¶æ€
      firstPurchaseOrderNo.value = null;
      scannedBarcodes.value = [];
    } else {
      ElMessage.error("出库提交失败：" + (res.message || '提交失败'));
    }