cl
9 天以前 57abd1f3d312ca35ae9b8cc625afc23f233b85d6
pda无单据组托优化
2个文件已修改
35 ■■■■ 已修改文件
pages/listing/matnrPalletising.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/index.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/matnrPalletising.vue
@@ -161,6 +161,10 @@
            // 单行可组盘上限:计划 - 已组托 - 已上架,不能超过该值(与后端一致)
            getItemAvailableMax(item) {
                if (!item) return this.max;
                // 无WMS单号时允许自由输入,不按单据可组盘数量限制
                if (!item.asnCode || String(item.asnCode).trim() === '') {
                    return this.max;
                }
                const avail = item.availablePalletQty != null && item.availablePalletQty !== undefined
                    ? item.availablePalletQty
                    : (Number(item.anfme || 0) - Number(item.workQty || 0) - Number(item.qty || 0));
@@ -277,18 +281,20 @@
                        return;
                    }
                    for (var i = 0; i < data.length; i++) {
                        // 优先使用接口返回的可组盘数量(order/add 改数量后 = 计划 - 已组托 - 已上架),否则本地计算
                        if (data[i].availablePalletQty != null && data[i].availablePalletQty !== undefined) {
                        // 无WMS单号时默认组盘数量为0,由用户输入
                        if (!data[i].asnCode || String(data[i].asnCode).trim() === '') {
                            data[i].receiptQty = 0;
                        } else if (data[i].availablePalletQty != null && data[i].availablePalletQty !== undefined) {
                            // 有单据时优先使用接口返回的可组盘数量
                            data[i].receiptQty = data[i].availablePalletQty;
                        } else {
                            let anfme = data[i].anfme || 0;
                            let workQty = data[i].workQty || 0;
                            let qty = data[i].qty || 0;
                            data[i].receiptQty = anfme - workQty - qty;
                        }
                        // 确保可组盘数量不为负数
                        if (data[i].receiptQty < 0) {
                            data[i].receiptQty = 0;
                            if (data[i].receiptQty < 0) {
                                data[i].receiptQty = 0;
                            }
                        }
                        data[i].selected = true;
                    }
pages/login/index.vue
@@ -172,8 +172,24 @@
                project: ''
            }
        }
        // 仅开发/模拟构建且未配置过地址时填充本机联调默认;发行包为 production,不注入(保持空)
        this.applyDevUrlDefaultsIfNeeded()
    },
    methods:{
        applyDevUrlDefaultsIfNeeded() {
            if (process.env.NODE_ENV === 'production') {
                return
            }
            const u = this.url
            if (u && (u.ip || u.port || u.project)) {
                return
            }
            this.url = {
                ip: '127.0.0.1',
                port: '8082',
                project: 'rsf-server'
            }
        },
        async onLogin() {
            const {
                code,
@@ -283,6 +299,7 @@
        },
        // 设置窗口开启按钮
        settings() {
            this.applyDevUrlDefaultsIfNeeded()
            this.$refs.inputDialog.open('')
        },
        // 设置窗口关闭按钮