skyouc
11 小时以前 6e81e03ae020c149481bb840f26466029b76d5c7
no message
5个文件已修改
225 ■■■■■ 已修改文件
pages/AGV/AGVOutCall.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/CacheInCall.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/CachePakin.vue 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/pakin/PakinBind.vue 110 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/css/wms.css/wms.css 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/AGV/AGVOutCall.vue
@@ -133,46 +133,7 @@
                    this.matFocus = true;
                }, 100);
            },
            // 搜索物料
            getSites() {
                let that = this
                let staResults = [];
                uni.request({
                    url: that.baseUrl + '/mobile/cache/locs',
                    header: {
                        'token':uni.getStorageSync('token')
                    },
                    method: 'GET',
                    success(result) {
                        result = result.data
                        if (result.code === 200 && result.data) {
                            staResults.push(...result.data);
                            staResults.forEach(item => {
                                that.staList.push(item?.locNo)
                            })
                            console.log(that.staList);
                        } else if (result.code == 403) {
                            uni.showToast({
                                title: result.msg,
                                icon: "none",
                                position: 'top'
                            })
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({
                                title: result.msg,
                                icon: "none",
                                position: 'top'
                            })
                        }
                    }
                });
            },
            selectMat() {
                let that = this
                uni.navigateTo({
pages/AGV/CacheInCall.vue
@@ -9,10 +9,10 @@
                <view class="code-decs">托盘码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" >
            </view>
            <view class="item">
<!--             <view class="item">
                <view class="code-decs">目标库位:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="tarSite" >
            </view>
            </view> -->
        </view>
        <view class="mat-list-title">
        </view>
@@ -276,8 +276,8 @@
                    url: that.baseUrl + '/mobile/cache/agv/call',
                    data: JSON.stringify({
                        orgSite: that.orgSite,
                        barcode: that.barcode,
                        tarSite: that.tarSite
                        barcode: that.barcode
                        // tarSite: that.tarSite
                    }),
                    method: 'POST',
                    header: {
pages/AGV/CachePakin.vue
@@ -48,21 +48,11 @@
                        <view class="left-item">{{item.maktx}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">规格:</view>
                        <view class="left-item">{{item.specs}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">批号:</view>
                        <view class="desc">供应商:</view>
                        <view class="left-item">
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                            <uni-tag :text="item.supCode" type="warning"></uni-tag>
                        </view>
                    </view>
                    <!-- <view class="list-left-item">
                        <view class="desc">重量:</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量:</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -94,13 +84,11 @@
                        </view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                        <view class="desc">供应商:</view>
                        <view class="left-item">
                            <uni-tag :text="supCode" type="warning"></uni-tag>
                        </view>
                    </view>
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
@@ -157,7 +145,7 @@
                count: 0,
                rowNum: '',
                matnr: '',
                batch: '',
                supCode: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
@@ -193,19 +181,19 @@
            },
            barcodeInput() {
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
                    if (len != 8) {
                        uni.showToast({
                            title: '托盘码有误请重试',
                            icon: "none",
                            position: 'top'
                        });
                        this.barcodeFocuss()
                        return;
                    }
                    this.focuss()
                }, 200)
                // setTimeout(() => {
                //     var len = this.barcode.length
                //     if (len != 8) {
                //         uni.showToast({
                //             title: '托盘码有误请重试',
                //             icon: "none",
                //             position: 'top'
                //         });
                //         this.barcodeFocuss()
                //         return;
                //     }
                //     this.focuss()
                // }, 200)
            },
            // 托盘码有误重置
            barcodeFocuss() {
@@ -242,7 +230,7 @@
                        if (result.code === 200 && result.data) {
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            that.matData['supCode'] = ''
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
@@ -312,12 +300,12 @@
                for (var i = 0; i < len; i++) {
                    if (mat.matnr == this.dataList[i].matnr) {
                        for (var j = 0; j < len; j++) {
                            if (mat.batch == this.dataList[j].batch) {
                            if (mat.supCode == this.dataList[j].supCode) {
                                sameItem = true
                            }
                        }
                        // 相同物料 不同批号  新加列表
                        if (mat.batch != this.dataList[i].batch) {
                        if (mat.supCode != this.dataList[i].supCode) {
                            this.$forceUpdate() // 强制刷新
                            if (sameItem) {
                                add = false
@@ -341,7 +329,7 @@
            revise(item, i) {
                this.matnr = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.batch = this.dataList[i].batch
                this.supCode = this.dataList[i].supCode
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.eject()
@@ -370,7 +358,7 @@
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].supCode = this.supCode
                this.dataList[this.rowNum].weight = this.weight
                this.matnr = ''
                this.messageText = "修改成功"
@@ -417,7 +405,8 @@
                    data: JSON.stringify({
                        orderNo: that.orderNo,
                        barcode: that.barcode,
                        combMats: that.dataList
                        combMats: that.dataList,
                        type: '1'
                    }),
                    method: 'POST',
                    header: {
pages/pakin/PakinBind.vue
@@ -7,6 +7,11 @@
                    @input="barcodeInput()">
            </view>
            <view class="item">
                <view class="code-decs">台车托盘:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="carBarcode" :focus="orderNoFocus"
                    @input="orderNoInput()">
            </view>
            <view class="item">
                <view class="code-decs">BS码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
                <view class="item-right">
@@ -15,15 +20,10 @@
                    <uni-icons type="right" color="#c1c1c1"></uni-icons>
                </view>
            </view>
            <view class="item">
                <view class="code-decs">台车:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" :focus="orderNoFocus"
                    @input="orderNoInput()">
            </view>
        </view>
        <view class="mat-list-title">
            商品列表
        </view>
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
                <view class="list-left">
@@ -48,21 +48,15 @@
                        <view class="left-item">{{item.maktx}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">供应商:</view>
                        <view class="left-item">
                            <uni-tag :text="item.suppCode" type="warning"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">规格:</view>
                        <view class="left-item">{{item.specs}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">批号:</view>
                        <view class="left-item">
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <!-- <view class="list-left-item">
                        <view class="desc">重量:</view>
                        <view class="left-item">
                            <uni-tag :text="item.weight" type="warning"></uni-tag>
                        </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量:</view>
                        <view class="left-item">{{item.anfme}}</view>
@@ -94,8 +88,8 @@
                        </view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                        <view class="popup-item-left">供应商:</view>
                        <view class="popup-item-right"><input type="text" v-model="suppCode"></view>
                    </view>
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
@@ -104,7 +98,8 @@
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
                            <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">
@@ -152,12 +147,14 @@
                baseUrl: '',
                token: '',
                barcode: '',
                carBarcode: '',
                bsCode: '',
                orderNo: null,
                dataList: [],
                count: 0,
                rowNum: '',
                matnr: '',
                batch: '',
                suppCode: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
@@ -186,26 +183,26 @@
            // barcode input 事件
            orderNoInput() {
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.orderNo.length
                    // this.barcodeFocuss()
                }, 200)
                // setTimeout(() => {
                //     var len = this.orderNo.length
                //     // this.barcodeFocuss()
                // }, 200)
            },
            barcodeInput() {
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
                    if (len != 8) {
                        uni.showToast({
                            title: '托盘码有误请重试',
                            icon: "none",
                            position: 'top'
                        });
                        this.barcodeFocuss()
                        return;
                    }
                    this.focuss()
                }, 200)
                // setTimeout(() => {
                //     var len = this.barcode.length
                //     if (len != 8) {
                //         uni.showToast({
                //             title: '托盘码有误请重试',
                //             icon: "none",
                //             position: 'top'
                //         });
                //         this.barcodeFocuss()
                //         return;
                //     }
                //     this.focuss()
                // }, 200)
            },
            // 托盘码有误重置
            barcodeFocuss() {
@@ -232,7 +229,8 @@
                    method: 'POST',
                    data: {
                        barcode: that.barcode,
                        bsCode: that.matnr
                        bsCode: that.matnr,
                        carBarcode: that.carBarcode
                    },
                    header: {
                        'token': uni.getStorageSync('token')
@@ -242,7 +240,7 @@
                        if (result.code === 200 && result.data) {
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            that.matData['suppCode'] = ''
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
@@ -282,12 +280,12 @@
            },
            selectMat() {
                let that = this
                if (that.orderNo == null || that.orderNo == undefined ) {
                if (that.orderNo == null || that.orderNo == undefined) {
                    that.messageText = '请填写订单编号!!'
                    that.messageToggle('error')
                    return;
                }
                uni.navigateTo({
                    url: "../mat/matQuery",
                    success: function(res) {
@@ -308,23 +306,24 @@
            },
            checkMat(mat) {
                var len = this.dataList.length
                var add = true ,sameItem = false
                var add = true,
                    sameItem = false
                for (var i = 0; i < len; i++) {
                    if (mat.matnr == this.dataList[i].matnr) {
                        for (var j = 0; j < len; j++) {
                            if (mat.batch == this.dataList[j].batch) {
                            if (mat.suppCode == this.dataList[j].suppCode) {
                                sameItem = true
                            }
                        }
                        // 相同物料 不同批号  新加列表
                        if (mat.batch != this.dataList[i].batch) {
                        if (mat.suppCode != this.dataList[i].suppCode) {
                            this.$forceUpdate() // 强制刷新
                            if (sameItem) {
                                add = false
                            } else {
                                add = true
                            }
                        } else {
                            // 相同物料相同批号 数量累加
                            this.dataList[i].anfme += mat.anfme
@@ -341,7 +340,8 @@
            revise(item, i) {
                this.matnr = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.batch = this.dataList[i].batch
                this.suppCode = this.dataList[i].suppCode
                this.bsCode = this.dataList[i].threeCode
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.eject()
@@ -352,7 +352,7 @@
            },
            // 列表移除按钮
            remove(item, i, type) {
                this.removeNum  = i
                this.removeNum = i
                this.msgType = type
                this.title = '警告'
                this.content = '是否移除当前商品!'
@@ -370,7 +370,7 @@
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].suppCode = this.suppCode
                this.dataList[this.rowNum].weight = this.weight
                this.matnr = ''
                this.messageText = "修改成功"
@@ -413,11 +413,12 @@
                    }
                }
                uni.request({
                    url: that.baseUrl + '/mobile/comb/auth',
                    url: that.baseUrl + '/mobile/cache/comb/auth',
                    data: JSON.stringify({
                        orderNo: that.orderNo,
                        barcode: that.barcode,
                        combMats: that.dataList
                        combMats: that.dataList,
                        type: '0'
                    }),
                    method: 'POST',
                    header: {
@@ -478,8 +479,9 @@
    @import url('../../static/css/wms.css/wms.css');
    .list:first-child {
        margin-top: 460rpx;
        margin-top: 420rpx;
    }
    .code {
        width: 100%;
        position: fixed;
@@ -529,4 +531,4 @@
        text-align: center;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }
</style>
</style>
static/css/wms.css/wms.css
@@ -16,7 +16,9 @@
    display: flex;
    flex-direction: column;
    margin-left: 20rpx;
    padding: 15rpx;
    width: 80vw;
    font-size: 28rpx;
}
.list-left-item {
    min-height: 40rpx;
@@ -61,6 +63,7 @@
    background-color: #FFF;
    border-radius: 25rpx;
}
.title {
    height: 100rpx;
    line-height: 100rpx;