#

zhou zhou

3 天以前 086363406e7abae8b6debfa2381a998ce604c2c8

#

 pages.json

@@ -37,6 +37,18 @@
            }
        },
        {
            "path": "pages/AGV/CollectionPakin",
            "style": {
                "navigationBarTitleText": "集货区组托"
            }
        },
        {
            "path": "pages/AGV/CollectionInCall",
            "style": {
                "navigationBarTitleText": "集货区入库"
            }
        },
        {
            "path": "pages/AGV/CachePakin",
            "style": {
                "navigationBarTitleText": "缓存区组托"
@@ -58,6 +70,12 @@
            "path": "pages/AGV/AGVStart",
            "style": {
                "navigationBarTitleText": "AGV启动入库"
            }
        },
        {
            "path": "pages/AGV/CallEmptyCar",
            "style": {
                "navigationBarTitleText": "入库区呼叫空车"
            }
        },
        {
@@ -216,14 +234,14 @@
                "navigationBarTitleText": "换板绑定"
            }
        },
		

        {
            "path": "pages/print/qr",
            "style": {
                "navigationBarTitleText": "二维码"
            }
        },
		

        {
            "path": "pages/mat/matList",
            "style": {
@@ -243,22 +261,19 @@
            }
        },
        {
            "path" : "pages/order/orderPakin2",
            "style" : 
            {
                "navigationBarTitleText" : "订单组托",
                "enablePullDownRefresh" : false
            "path": "pages/order/orderPakin2",
            "style": {
                "navigationBarTitleText": "订单组托",
                "enablePullDownRefresh": false
            }
        }
        ,{
            "path" : "pages/order/orderList",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "单据列表",
                "enablePullDownRefresh": false
            }
            
        },
        }, {
            "path": "pages/order/orderList",
            "style": {
                "navigationBarTitleText": "单据列表",
                "enablePullDownRefresh": false
            }

        },
        {
            "path": "pages/order/orderDetlList",
            "style": {
@@ -266,51 +281,54 @@
            }
        },
        {
            "path" : "pages/AGV/AGVSiteList",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "产线叫料",
                "enablePullDownRefresh": false
            }
		    
            "path": "pages/AGV/AGVSiteList",
            "style": {
                "navigationBarTitleText": "产线叫料",
                "enablePullDownRefresh": false
            }

        },
        {
            "path" : "pages/AGV/AGVLineCall",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "产线叫料",
                "enablePullDownRefresh": false
            }
		    
            "path": "pages/AGV/AGVLineCall",
            "style": {
                "navigationBarTitleText": "产线叫料",
                "enablePullDownRefresh": false
            }

        },
        {
            "path" : "pages/AGV/AGVFinishedCall",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "成品呼叫",
                "enablePullDownRefresh": false
            }
		    
            "path": "pages/AGV/AGVFinishedCall",
            "style": {
                "navigationBarTitleText": "成品呼叫",
                "enablePullDownRefresh": false
            }

        },
        {
            "path" : "pages/AGV/AGVStaBind",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "AGV站绑定",
                "enablePullDownRefresh": false
            }
		    
            "path": "pages/AGV/AGVStaBind",
            "style": {
                "navigationBarTitleText": "AGV站绑定",
                "enablePullDownRefresh": false
            }

        },
        {
            "path" : "pages/check/check",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "盘点",
                "enablePullDownRefresh": false
            }
		    
            "path": "pages/check/check",
            "style": {
                "navigationBarTitleText": "盘点",
                "enablePullDownRefresh": false
            }

        },
        {
            "path": "pages/check/checkMatSelected",
            "style": {
                "navigationBarTitleText": "添加商品",
                "enablePullDownRefresh": false
            }

        }
    ],
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "uni-app",
@@ -318,4 +336,4 @@
        "backgroundColor": "#F8F8F8"
    },
    "uniIdRouter": {}
}
}

 pages/check/check.vue

@@ -8,7 +8,9 @@
            </view>            
        </view>
        <view class="mat-list-title">
            商品列表
            <view style="width: 200rpx;"></view>
            <view style="-webkit-flex: 1;flex: 1;">商品列表</view>
            <view style="width: 200rpx; display: flex; justify-content: center; align-items: center;"><button size="mini" type="primary" @click="openAddDialog">添加</button></view>
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
@@ -31,8 +33,8 @@
                        
                    </view>
                    <view class="list-left-item">
                        <view class="desc">规格：</view>
                        <view class="left-item">{{item.specs}}</view>
                        <view class="desc">供应商：</view>
                        <view class="left-item">{{item.suppCode}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">批号：</view>
@@ -121,6 +123,24 @@
                    @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <!-- 添加商品弹窗 -->
        <view>
            <uni-popup ref="addDialog" type="dialog">
                <view class="popup">
                    <view class="title">添加商品</view>
                    <view class="popup-item">
                        <view class="popup-item-left">编码:</view>
                        <view class="popup-item-right">
                            <input type="text" v-model="addMatnr" placeholder="请输入编码">
                        </view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="addClose">取消</view>
                        <view class="btn-right" @click="addConfirm">提交</view>
                    </view>
                </view>
            </uni-popup>
        </view>
    </view>
</template>

@@ -144,7 +164,8 @@
                barcodeFocus: true,
                matFocus: false,
                matData: '',
                pushDisabled:false
                pushDisabled:false,
                addMatnr: ''

            }
        },
@@ -326,6 +347,64 @@
                })
                
            },
            // 打开添加弹窗
            openAddDialog() {
                this.addMatnr = ''
                this.$refs.addDialog.open()
            },
            // 取消添加
            addClose() {
                this.$refs.addDialog.close()
            },
            // 确认添加
            addConfirm() {
                if (!this.addMatnr) {
                    this.messageText = "请输入编码"
                    this.messageToggle('error')
                    return
                }
                let that = this
                uni.request({
                    url: that.baseUrl + '/mat/auth?matnr=' + encodeURIComponent(that.addMatnr),
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'GET',
                    success(res) {
                        res = res.data
                        if (res.code === 200) {
                            if (!res.data) {
                                that.messageText = "未找到该商品"
                                that.messageToggle('error')
                                return
                            }
                            that.$refs.addDialog.close()
                            uni.navigateTo({
                                url: './checkMatSelected',
                                success: function(result) {
                                    result.eventChannel.emit('mat', {data: res.data})
                                },
                                events: {
                                    checkMatList: function(data) {
                                        that.dataList.push(data.data)
                                    }
                                }
                            })
                        } else if (res.code == 403) {
                            that.messageText = res.msg
                            that.messageToggle('error')
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            that.messageText = res.msg
                            that.messageToggle('error')
                        }
                    }
                })
            }
        }
    }
</script>
@@ -374,6 +453,8 @@
    }

    .mat-list-title {
        display: flex;
        align-items: center;
        height: 80rpx;
        line-height: 80rpx;
        width: 100%;

 pages/mat/matSelected.vue

@@ -1,27 +1,29 @@
<template>
    <view>
        <view class="form" v-for="mat in mats">
            <view class="form-item">
            <!-- <view class="form-item">
                <view class="form-item-desc"><text>订单号</text></view>
                <view class="form-item-content"><text>{{mat.orderNo}}</text></view>
            </view>
            </view> -->
            <view class="form-item">
                <view class="form-item-desc"><text>商品编码</text></view>
                <view class="form-item-content"><text>{{mat.matnr}}</text></view>
            </view>
            <view class="form-item">
                <view class="form-item-desc"><text>商品名称</text></view>
                <view class="form-item-content" style="word-break: break-all;line-height: 1.5;"><text>{{mat.maktx}}</text></view>
                <view class="form-item-content" style="word-break: break-all;line-height: 1.5;">
                    <text>{{mat.maktx}}</text>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item-desc"><text>规格</text></view>
                <view class="form-item-content"><text>{{mat.specs}}</text></view>
            </view>
            <view class="form-item">
                <view class="form-item-desc"><text>批号</text></view>
                <view class="form-item-desc"><text>供应商代码</text></view>
                <view class="form-item-content">
                    <view class="form-input">
                        <input type="text" v-model="mat.batch">
                        <input type="text" v-model="mat.standby1">
                    </view>
                </view>
            </view>
@@ -52,8 +54,8 @@
                },
                selectNum: null,
                mats: null,
                baseIP:'',
                basePORT:'',
                baseIP: '',
                basePORT: '',
            }
        },
        onLoad(option) {
@@ -64,20 +66,20 @@
            // #ifndef APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
            // #endif
			

            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('mat', function(data) {
                that.mats = data.data
            })
			
			


        },
        methods: {
            blur() {
				

            },
            focus() {
				

            },
            changeValue(value) {
                this.mats[0].anfme = value
@@ -85,7 +87,11 @@
            },
            back() {
                if (this.mats[0].anfme === 0) {
                    uni.showToast({title: '请输入数量', icon: "none", position: 'top'});
                    uni.showToast({
                        title: '请输入数量',
                        icon: "none",
                        position: 'top'
                    });
                    return;
                }
                console.log("=======>");
@@ -95,9 +101,11 @@
                } else {
                    this.mats[0].anfme = this.mats[0].enableQty
                }
                this.getOpenerEventChannel().emit('matList', {data: this.mats[0]});
                this.getOpenerEventChannel().emit('matList', {
                    data: this.mats[0]
                });
                uni.navigateBack({
					

                })
            }
        }
@@ -106,13 +114,15 @@

<style>
    @import url('../../static/css/wms.css/wms.css');

    .form {
        min-height: 80rpx;
        background-color: #FFF;
        margin-top: 10px;
        color: #606266;
        box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
        box-shadow: 0px 0px 50px 0px rgba(0, 0, 0, 0.2);
    }

    .form-item {
        min-height: 100rpx;
        line-height: 1;
@@ -121,16 +131,19 @@
        display: flex;
        align-items: center;
    }

    .form-item-desc {
        width: 30%;
    }

    .form-item-content {
        width: 60%;
    }
	

    .form-item:last-child {
        border: none;
    }

    .form-input {
        display: flex;
        align-items: center;
@@ -140,7 +153,8 @@
        border-bottom: 1px solid #E4E7ED;
        border-radius: 5rpx;
    }
    .form-input input{

    .form-input input {
        color: #606266;
    }
</style>

 pages/pakin/pakin.vue

@@ -104,7 +104,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='0.01' :max="9999999" color="#747474" @change="changeValue" />
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">
@@ -193,7 +194,7 @@
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
                    if (len >= 9 && len <=8) {
                    if (len >= 9 && len <= 8) {
                        uni.showToast({
                            title: '托盘码有误请重试',
                            icon: "none",
@@ -224,13 +225,12 @@
            },
            // 搜索物料
            findMat() {
                let that = this				
                let m = that.matnr.split(";")	
                let matnr1 = m[0].slice(3)
                let that = this

                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
                        matnr: matnr1
                        matnr: that.matnr
                    },
                    header: {
                        'token': uni.getStorageSync('token')
@@ -246,7 +246,7 @@
                                // 通过eventChannel向被打开页面传送数据
                                success: function(res) {
                                    res.eventChannel.emit('mat', {
                                        data: result.data
                                        data: [result.data]
                                    })
                                },
                                // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
@@ -304,7 +304,8 @@
            },
            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++) {
@@ -320,7 +321,7 @@
                            } else {
                                add = true
                            }
							

                        } else {
                            // 相同物料相同批号 数量累加
                            this.dataList[i].anfme += mat.anfme
@@ -348,7 +349,7 @@
            },
            // 列表移除按钮
            remove(item, i, type) {
                this.removeNum  = i
                this.removeNum = i
                this.msgType = type
                this.title = '警告'
                this.content = '是否移除当前商品!'
@@ -411,7 +412,7 @@
                uni.request({
                    url: that.baseUrl + '/mobile/comb/auth',
                    data: JSON.stringify({
                        barcode: that.barcode,						
                        barcode: that.barcode,
                        combMats: that.dataList
                    }),
                    method: 'POST',
@@ -520,7 +521,8 @@
        text-align: center;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }

    .list:first-child {
        margin-top: 250rpx;
    }
</style>
</style>