chen.lin
22 小时以前 3e4321e342c1b009dbeea6b186d148148529756a
单号调整
5个文件已修改
30 ■■■■ 已修改文件
checkOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hans.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/inspect/report.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/matnrPalletising.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/rece/other.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
checkOrder.vue
@@ -148,7 +148,7 @@
                if (code === 200) {                    
                    if (Object.keys(data).length === 0){
                        uni.showToast({
                            title: "未查询到波次数据",
                            title: "未查询到数据",
                            icon: "none",
                            position: 'top'
                        })
locale/zh-Hans.json
@@ -41,7 +41,7 @@
        "modifyBind": "任务明细换绑"
    },
    "other":{
        "asnNo":"ASN单号"
        "asnNo":"WMS单号"
        
    }
    
pages/inspect/report.vue
@@ -2,8 +2,8 @@
    <view class="has-foot">
        <form>
            <view class="cu-form-group ">
                <view class="title">ASN单号</view>
                <input placeholder="选择ASN单号" v-model="asnCode"></input>
                <view class="title">WMS单号</view>
                <input placeholder="选择WMS单号" v-model="asnCode"></input>
                <text class='cuIcon-search text-blue' @click="search"></text>
            </view>
        </form>
pages/listing/matnrPalletising.vue
@@ -20,8 +20,8 @@
<!--                    &lt;!&ndash; <text class='cuIcon-search text-blue' @click="search"></text> &ndash;&gt;-->
<!--                </view>-->
                <view class="cu-form-group">
                    <view class="title">ASN单号</view>
                    <input placeholder="请输入ASN单号" v-model="asnCode" @input="onAsnCodeInput" @confirm="onAsnCodeConfirm"></input>
                    <view class="title">WMS单号</view>
                    <input placeholder="请输入WMS单号" v-model="asnCode" @input="onAsnCodeInput" @confirm="onAsnCodeConfirm"></input>
                </view>
            </form>
            <view class="flex solid-bottom padding-sm justify-between">
@@ -174,7 +174,7 @@
                }
            },
            onAsnCodeInput(e) {
                // 扫描ASN单号时自动触发查询
                // 扫描WMS单号时自动触发查询
                if (e.detail && e.detail.value && e.detail.value.trim() !== '') {
                    this.asnCode = e.detail.value;
                    // 延迟一下再查询,避免频繁请求
@@ -182,13 +182,13 @@
                        clearTimeout(this.asnCodeTimer);
                    }
                    this.asnCodeTimer = setTimeout(() => {
                        // 扫描ASN单号时,自动加载该订单的物料信息
                        // 扫描WMS单号时,自动加载该订单的物料信息
                        this.getDet();
                    }, 500);
                }
            },
            onAsnCodeConfirm() {
                // 确认输入ASN单号时,立即触发查询
                // 确认输入WMS单号时,立即触发查询
                if (this.asnCode && this.asnCode.trim() !== '') {
                    this.getDet();
                }
@@ -215,7 +215,7 @@
                if ((!that.matnrCode || that.matnrCode.trim() === '') && 
                    (!that.asnCode || that.asnCode.trim() === '')) {
                    uni.showToast({
                        title: "请输入物料编码或ASN单号",
                        title: "请输入物料编码或WMS单号",
                        icon: "none",
                        position: 'top'
                    })
@@ -352,12 +352,12 @@
                            // 都有跟踪码,跟踪码相同则认为是同一物料
                            return existingItem.trackCode === item.trackCode;
                        }
                        // 物料编码相同,检查ASN单号(如果有ASN单号,ASN单号不同则允许添加)
                        // 物料编码相同,检查WMS单号(如果有单号,单号不同则允许添加)
                        if (existingItem.asnCode && item.asnCode) {
                            // 都有ASN单号,ASN单号相同则认为是同一物料
                            // 都有WMS单号,单号相同则认为是同一物料
                            return existingItem.asnCode === item.asnCode;
                        }
                        // 物料编码相同,但都没有跟踪码和ASN单号(都是从物料信息表获取的),认为是同一物料
                        // 物料编码相同,但都没有跟踪码和WMS单号(都是从物料信息表获取的),认为是同一物料
                        if (existingItem.matnrCode === item.matnrCode &&
                            !existingItem.trackCode && !item.trackCode && 
                            !existingItem.asnCode && !item.asnCode) {
pages/rece/other.vue
@@ -2,8 +2,8 @@
    <view class="has-foot">
        <form>
            <view class="cu-form-group margin-top" v-show="!isconfirm">
                <view class="title">ASN单号</view>
                <input placeholder="请扫描ASN单号" v-model="asncode" focus></input>
                <view class="title">WMS单号</view>
                <input placeholder="请扫描WMS单号" v-model="asncode" focus></input>
                <text class='cuIcon-close text-gray margin-right-xs' v-show="asncode!==''" @click="clearCode"></text>
                <!-- <text class='cuIcon-search text-blue' @click="search"></text> -->
            </view>