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

647556386

2026-02-06 3fb6a51a60230f42be4db54cc4371a7106b322a4

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/outbound/outPicking.vue

@@ -9,6 +9,8 @@
                    <i class="el-icon-document"></i>
                    <span class="order-label">订单号：</span>
                    <span class="order-value">{{ orderNo }}</span>
                    <span class="order-label" style="margin-left: 20px;">产线名称：</span>
                    <span class="order-value">{{ orderInfo?.departmentName || '' }}</span>
                </div>
                <div class="order-status">
                    <el-tag v-if="orderInfo" :type="getStatusType(orderInfo.orderStatus)" size="medium"
@@ -409,6 +411,42 @@
                }
            }
        },

        // ============== æ–°å¢žï¼šæ ¹æ®æ‰˜ç›˜å·èŽ·å–订单号（核心功能） ==============
        async getOrderNoByPallet(palletCode) {
            if (!palletCode) {
                this.$message.warning('托盘号不能为空');
                return null;
            }

            try {
                this.showFullScreenLoading();
                // è°ƒç”¨èŽ·å–订单号的接口
                const response = await this.http.get(`/api/OutboundOrder/GetOrderNoByPalletCode?palletCode=${palletCode}`);

                if (response.status && response.data) {
                    const validOrderNo = response.data;
                    this.playSuccessAudio();
                    this.$message.success(`成功获取订单号：${validOrderNo}`);
                    return validOrderNo;
                } else {
                    this.playErrorAudio();
                    const errorMsg = response.message || '该托盘号未关联任何订单';
                    this.$message.error(errorMsg);
                    return null;
                }
            } catch (error) {
                this.playErrorAudio();
                const errorMsg = `获取订单号异常：${error.message || '网络错误'}`;
                this.$message.error(errorMsg);
                console.error("【托盘号查订单号接口异常】", error);
                return null;
            } finally {
                this.hideFullScreenLoading();
            }
        },
        // ============== æ–°å¢žç»“束 ==============

        // æ’­æ”¾æˆåŠŸéŸ³é¢‘
        playSuccessAudio() {
            try {
@@ -435,11 +473,13 @@
        initPage() {
            // ä»Žè·¯ç”±å‚数获取订单号
            this.orderNo = this.$route.query.orderNo || ''
            if (!this.orderNo) {
                this.$message.error('订单号不能为空')
                this.$router.back()
                return
            }
            // ============== å¾®è°ƒï¼šæ³¨é‡Šå¼ºåˆ¶è¿”回逻辑，兼容托盘号查订单号 ==============
            // if (!this.orderNo) {
            //     this.$message.error('订单号不能为空')
            //     this.$router.back()
            //     return
            // }
            // ============== å¾®è°ƒç»“束 ==============

            // åŠ è½½è®¢å•ä¿¡æ¯
            this.loadOrderInfo()
@@ -619,10 +659,20 @@
        },

        handlePalletScan(flag = true) {
            if (this.scanForm.palletCode) {
                this.loadPalletData(flag)
            } else {
            const palletCode = this.scanForm.palletCode.trim();
            if (!palletCode) {
                return;
            }
            // å…ˆæ ¹æ®æ‰˜ç›˜å·èŽ·å–订单号
            this.getOrderNoByPallet(palletCode).then((orderNo) => {
                if (orderNo) {
                    // èµ‹å€¼è®¢å•å·ï¼Œä¾›åŽç»­é€»è¾‘使用
                    this.orderNo = orderNo;
                    // åˆ·æ–°è®¢å•ä¿¡æ¯
                    this.loadOrderInfo();
                }
                this.loadPalletData(flag);
            });
        },

        handleMaterialScan() {