#

Junjie

2024-10-11 1ae4309fe4fbc19dcdcaa28b1193a2737299b900

#

 pages.json

@@ -32,6 +32,12 @@
            }
        },
        {
            "path": "pages/mat/matQueryByOrder",
            "style": {
                "navigationBarTitleText": "物料"
            }
        },
        {
            "path": "pages/pakin/pakin",
            "style": {
                // "navigationBarTitleText": "组 托"
@@ -222,10 +228,40 @@
            }
        },
        {
            "path" : "pages/order/orderListPickBoard",
            "style" : 
            {
                "navigationStyle": "custom"
            }
        },
        {
            "path" : "pages/order/mergeBoardManyTimes",
            "style" : 
            {
                "navigationStyle": "custom"
            }
        },
        {
            "path" : "pages/pakin/WarehouseOutParallelBoard",
            "style" : 
            {
                "navigationBarTitleText" : "并板途中拣料出库",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/pakin/WarehousePickOutParallelBoard",
            "style" : 
            {
                "navigationBarTitleText" : "拣料途中并板入库",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/pakin/WarehouseOutMergeBoardMany",
            "style" : 
            {
                "navigationBarTitleText" : "并板途中再次并板",
                "enablePullDownRefresh" : false
            }
        },
@@ -259,12 +295,27 @@
            "path" : "pages/order/orderList",
            "style" : 
            {
                // "navigationBarTitleText" : "平库下架",
                "navigationBarTitleText" : "平库下架",
                // "enablePullDownRefresh" : false
                "navigationStyle": "custom"
            }
        },
        {
            "path" : "pages/mat/matInformation",
            "style" : 
            {
                "navigationBarTitleText" : "商品信息查询"
                // "enablePullDownRefresh" : false,
            }
        },
        {
            "path" : "pages/mat/showMatInformation",
            "style" : 
            {
                "navigationBarTitleText" : "商品信息查询"
            }
        },
        {
            "path" : "pages/order/orderDetlList",
            "style" : 
            {

 pages/home/home.vue

@@ -67,7 +67,7 @@
                        name: 'orderPutOn',
                        color: 'yellow',
                        cuIcon: 'pullup',
                        url: '/order/orderPutOn'
                        url: '/order/orderList'
                    },
                    {
                        title: '订单组托',
@@ -85,10 +85,24 @@
                    },
                    {
                        title: '并板途中拣料',
                        name: 'orderListParallelBoard',
                        name: 'ParallelBoard',
                        color: 'green',
                        cuIcon: 'pulldown',
                        url: '/order/orderListParallelBoard'
                    },
                    {
                        title: '拣料途中并板',
                        name: 'PickBoard',
                        color: 'orange',
                        cuIcon: 'pulldown',
                        url: '/order/orderListPickBoard'
                    },
                    {
                        title: '多次并板',
                        name: 'BoardMany',
                        color: 'yellow',
                        cuIcon: 'pulldown',
                        url: '/order/mergeBoardManyTimes'
                    },
                    {
                        title: '制令入库',
@@ -97,6 +111,13 @@
                        cuIcon: 'pulldown',
                        url: '/order/zlOrderPakin'
                    },
                    {
                        title: '商品信息查询',
                        name: 'MatInformation',
                        color: 'red',
                        cuIcon: 'pulldown',
                        url: '/mat/matInformation'
                    },
                    // {
                    //     title: '库存查询',
                    //     name: 'stockQuery',

 pages/mat/matInformation.vue

New file
@@ -0,0 +1,268 @@
<template>
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @confirm="search" />
        </view>
        <scroll-view>
            <view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor" >分类</view>
                    </view>
                </view>
                <view class="tag-item">{{item.name}}</view>
            </view>
        </scroll-view>
        <view>
            <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="showMatInformation(item)">
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor" >商品</view>
                    </view>
                </view>
                <view class="tag-item">商品编号： {{item.matnr}}</view>
                <view class="tag-item">商品名称： {{item.maktx  ? item.maktx : '--'}}</view>
                <view class="tag-item">商品规格： {{item.specs  ? item.specs : '--'}}</view>
            </view>
        </view>
        <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
    </view>
</template>

<script>
    export default {
        data() {
            return {
                tagList: [],
                matList: [],
                reload: false,
                curr:1,
                tag: '分类',
                baColor: "background-color: #0081ff;",
                desc: '商品编号:',
                baseUrl: '',
                token: '',
                status: 'more',
                contentText: {
                    contentdown: '上拉加载更多',
                    contentrefresh: '加载中',
                    contentnomore: '没有更多'
                },
                // 当前tagId
                tagIdNow: 1
            }
        },
        onReachBottom() {
            this.status = 'more';
            this.showMat(this.tagIdNow);
        },
        onLoad() {
            // 没啥用了
            let that = this
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
			
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('commonUrl', function(data) {
                that.commonUrl = data.commonUrl
            })
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.showTag(1)
        },
        methods: {
            search(e) {
                let that = this
                uni.request({
                    url: that.baseUrl + '/mat/pad/search',
                    data: {
                        matnr: e.value
                    },
                    method: "GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200) {
                            that.matList = res.data;
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
						
                    }
                });
            },
            showTag(parentId) {
                let that = this
                uni.request({
                    url: that.baseUrl + '/tag/list/pda/auth',
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    data: {
                        limit: 100000,
                        parentId: parentId
                    },
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        that.tagList = null
                        that.matList = []
                        var res = result.data
                        if (res.code === 200) {
                            if (res.data != null && res.data.length > 0) {
                                that.tagList = res.data
                            } else {
                                that.showMat(parentId)
                            }
                            that.baColor = "background-color: #0081ff;"
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
                });
            },
            showMat(tagId) {
                let that = this
                that.tagIdNow = tagId
                if (tagId == null || tagId == '' || tagId == undefined) {
                    return;
                }
                // wms端 补接口
                // @RequestMapping(value = "/mat/list/pda/page/auth")
                // @ManagerAuth
                // public R pdaPageList(@RequestParam(required = true)Long tagId,
                //                      @RequestParam(defaultValue = "1")Integer curr,
                //                      @RequestParam(defaultValue = "10")Integer limit){
                //     EntityWrapper<Mat> wrapper = new EntityWrapper<>();
                //     wrapper.eq("tag_id", tagId);
                //     wrapper.orderBy("create_time", false);
                //     return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
                // }
                uni.request({
                    url: that.baseUrl + '/mat/list/pda/page/auth',
                    data: {
                        curr:that.curr,
                        limit: 100,
                        tagId: tagId
                    },
                    method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        that.tagList = null
                        var res = result.data
                        if (res.code === 200) {
                            if (res.data.records != null && res.data.records.length > 0) {
                                let list = res.data.records
                                that.matList = that.reload ? list : that.matList.concat(list);
                                that.curr = that.curr + 1
                            }
                            if (res.data.records.length == 0) {
                                that.status = 'noMore'
                            }
                            that.baColor = "background-color: #1cbbb4;"
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
						
                    }
                });
            },
            toPrint(item) {
                let that = this
                uni.navigateTo({
                    url: "../print/print",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('data', {
                            data: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.matnr = data.data
                            that.findMat(that.matnr)
                        },
                    },
				
				
                });
            },
            showMatInformation(item) {
                let that = this
                uni.navigateTo({
                    url: "./showMatInformation",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('data', {
                            data: item
                        })
                    },
                });
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .tag-list {
        width: 94%;
        min-height: 160rpx;
        margin: 10px auto;
        background-color: #FFF;
        border-radius: 5px;
        box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
    }
    .tag {
        display: flex;
        flex-direction: column;
        min-height: 80rpx;
        border-bottom: 1px solid #e2e2e2;
    }
    .wms-tag {
        min-width: 60rpx;
        margin-left: 50rpx;
        margin-top: 30rpx;
        color: #FFF;
        font-size: 14px;
        padding: 4rpx 12rpx;
    }
    .tag-item {
        width: 100%;
        min-height: 60rpx;
        line-height: 2;
        padding-left: 50rpx;
        color: #606266;
        font-size: 14px;
    }
</style>

 pages/mat/matQueryByOrder.vue

New file
@@ -0,0 +1,147 @@
<template>
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="condition" placeholder=" 扫码 / 输入订单号" bgColor="#EEEEEE" @input="search" />
        </view>
        <view>
            <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item)">
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor" >商品</view>
                    </view>
                </view>
                <view class="tag-item">商品编号： {{item.matnr}}</view>
                <view class="tag-item">商品名称： {{item.maktx  ? item.maktx : '--'}}</view>
                <view class="tag-item">商品规格： {{item.specs  ? item.specs : '--'}}</view>
                <view class="tag-item">数量： {{item.anfme  ? item.anfme : '--'}}</view>
            </view>
        </view>
        <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
    </view>
</template>

<script>
    export default {
        data() {
            return {
                tagList: [],
                matList: [],
                condition: '',
                reload: false,
                curr:1,
                tag: '分类',
                baColor: "background-color: #0081ff;",
                desc: '商品编号:',
                baseUrl: '',
                token: '',
                status: 'more',
                contentText: {
                    contentdown: '上拉加载更多',
                    contentrefresh: '加载中',
                    contentnomore: '没有更多'
                },
                // 当前tagId
                tagIdNow: 1
            }
        },
        onReachBottom() {
            this.status = 'more';
            if (this.tagList == null) {
                this.showMat(this.tagIdNow);
            }
        },
        onLoad() {
            // 没啥用了
            let that = this
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
			
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('commonUrl', function(data) {
                that.commonUrl = data.commonUrl
            })
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
        },
        methods: {
            search() {
                let that = this
                that.tagList = []
                that.matList = []
                uni.request({
                    url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
                    data: {
                        orderNo: that.condition
                    },
                    method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200 ) {
                            let tmp = res.data;
                            tmp.forEach((item) => {
                                item.maxNum = item.anfme;
                            })
                            that.matList = tmp;
                        } else if (res.code == 403) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
                });
            },
            findBySelect(item) {
                this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: item});
                uni.navigateBack({
					
                })
				
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .tag-list {
        width: 94%;
        min-height: 160rpx;
        margin: 10px auto;
        background-color: #FFF;
        border-radius: 5px;
        box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
    }
    .tag {
        display: flex;
        flex-direction: column;
        min-height: 80rpx;
        border-bottom: 1px solid #e2e2e2;
    }
    .wms-tag {
        min-width: 60rpx;
        margin-left: 50rpx;
        margin-top: 30rpx;
        color: #FFF;
        font-size: 14px;
        padding: 4rpx 12rpx;
    }
    .tag-item {
        width: 100%;
        min-height: 60rpx;
        line-height: 2;
        padding-left: 50rpx;
        color: #606266;
        font-size: 14px;
    }
</style>

 pages/mat/showMatInformation.vue

New file
@@ -0,0 +1,137 @@
<template>
    <view>
        <view>
            <view class="tag-list">
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor" >商品</view>
                    </view>
                </view>
                <view v-if="matItem != null">
                    <view class="tag-item">商品编号： {{matItem.matnr  ? matItem.matnr : '--'}}</view>
                    <view class="tag-item">商品名称： {{matItem.maktx  ? matItem.maktx : '--'}}</view>
                    <view class="tag-item">商品规格： {{matItem.specs  ? matItem.specs : '--'}}</view>
                </view>
            </view>
			
            <view class="tag-list" v-for="(item,index) in locList" :key="index">
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor2">库存</view>
                    </view>
                </view>
                <view>
                    <view class="tag-item">库位号： {{item.locNo  ? item.locNo : '--'}}</view>
                    <view class="tag-item">托盘码： {{item.zpallet  ? item.zpallet : '--'}}</view>
                    <view class="tag-item">数量： {{item.anfme  ? item.anfme : '--'}}</view>
                </view>
            </view>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                matItem: null,
                locList: [],
                reload: false,
                curr:1,
                tag: '分类',
                baColor: "background-color: #0081ff;",
                baColor2: "background-color: #00aaff;",
                desc: '商品编号:',
                baseUrl: '',
                token: '',
                status: 'more',
                contentText: {
                    contentdown: '上拉加载更多',
                    contentrefresh: '加载中',
                    contentnomore: '没有更多'
                },
            }
        },
        onLoad() {
            let that = this
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
			
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('data', function(data) {
                that.matItem = data.data;
            })
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
			
            this.searchLoc()
        },
        methods: {
            searchLoc() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/mat/pad/searchLoc',
                    data: {
                        matnr: that.matItem.matnr
                    },
                    method: "GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200) {
                            that.locList = res.data;
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
						
                    }
                });
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .tag-list {
        width: 94%;
        min-height: 160rpx;
        margin: 10px auto;
        background-color: #FFF;
        border-radius: 5px;
        box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
    }
    .tag {
        display: flex;
        flex-direction: column;
        min-height: 80rpx;
        border-bottom: 1px solid #e2e2e2;
    }
    .wms-tag {
        min-width: 60rpx;
        margin-left: 50rpx;
        margin-top: 30rpx;
        color: #FFF;
        font-size: 14px;
        padding: 4rpx 12rpx;
    }
    .tag-item {
        width: 100%;
        min-height: 60rpx;
        line-height: 2;
        padding-left: 50rpx;
        color: #606266;
        font-size: 14px;
    }
</style>

 pages/order/mergeBoardManyTimes.vue

New file
@@ -0,0 +1,118 @@
<template>
    <view>
        <view class="status_bar">
            <!-- 这里是状态栏 -->
        </view>
        <uni-nav-bar left-icon="left" background-color="#f8f8f8" title="多次并板" @clickLeft="back"  :fixed="true"
            :border="false" rightWidth="160rpx" leftWidth="160rpx"
            >
            <block slot="right">
                <view class="city">
                    <view>
                        <text class="uni-nav-bar-text">{{store}}</text>
                    </view>
                </view>
            </block>
         </uni-nav-bar>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="wrkNo" placeholder=" 输入托盘码" bgColor="#EEEEEE" @input="search" />
        </view>
        <view class="card" v-for="item in menuList" @click="chose(item.barcode)">
            <view class="item">工作号：{{item.wrkNo}}</view>
            <view class="item">托盘码：{{item.barcode}}</view>
            <view class="item">库位号：{{item.sourceLocNo}}</view>
        </view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                storeId: 0,
                store: '',
                wrkNo: '',
                menuList: []
            }
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.storeId = uni.getStorageSync('store')
            if (this.storeId == 1) {
                this.store = '宁波仓'
            }
            if (this.storeId == 2) {
                this.store = '新昌仓'
            }
            this.getOrderNoList()
        },
        methods: {
            back() {
                uni.navigateBack({})
            },
            getOrderNoList() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/mobile/barcode/list/all',
                    data: "",
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        that.menuList = res.data
                    }
                })
            },
            search() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/mobile/barcode/list/all',
                    data: that.wrkNo,
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        that.menuList = res.data
                    }
                })
            },
            chose(item) {
                let that = this
                uni.navigateTo({
                    url: "../pakin/WarehouseOutMergeBoardMany",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('data', {
                            barcode: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            // that.matnr = data.data
                            that.input(that.matnr)
                        },
                    },
                });
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .card {
        margin: 20rpx;
        padding: 30rpx;
        background-color: #157ec1;
        border-radius: 20rpx;
        color: #FFF;
    }
</style>

 pages/order/orderListPickBoard.vue

New file
@@ -0,0 +1,118 @@
<template>
    <view>
        <view class="status_bar">
            <!-- 这里是状态栏 -->
        </view>
        <uni-nav-bar left-icon="left" background-color="#f8f8f8" title="拣料途中并板" @clickLeft="back"  :fixed="true"
            :border="false" rightWidth="160rpx" leftWidth="160rpx"
            >
            <block slot="right">
                <view class="city">
                    <view>
                        <text class="uni-nav-bar-text">{{store}}</text>
                    </view>
                </view>
            </block>
         </uni-nav-bar>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="wrkNo" placeholder=" 输入托盘码" bgColor="#EEEEEE" @input="search" />
        </view>
        <view class="card" v-for="item in menuList" @click="chose(item.sourceLocNo)">
            <view class="item">工作号：{{item.wrkNo}}</view>
            <view class="item">托盘码：{{item.barcode}}</view>
            <view class="item">库位号：{{item.sourceLocNo}}</view>
        </view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                storeId: 0,
                store: '',
                wrkNo: '',
                menuList: []
            }
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.storeId = uni.getStorageSync('store')
            if (this.storeId == 1) {
                this.store = '宁波仓'
            }
            if (this.storeId == 2) {
                this.store = '新昌仓'
            }
            this.getOrderNoList()
        },
        methods: {
            back() {
                uni.navigateBack({})
            },
            getOrderNoList() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/mobile/barcode/list/pick',
                    data: "",
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        that.menuList = res.data
                    }
                })
            },
            search() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/mobile/barcode/list/pick',
                    data: that.wrkNo,
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        that.menuList = res.data
                    }
                })
            },
            chose(item) {
                let that = this
                uni.navigateTo({
                    url: "../pakin/WarehousePickOutParallelBoard",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('locNo', {
                            locNo: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            // that.matnr = data.data
                            that.input(that.matnr)
                        },
                    },
                });
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .card {
        margin: 20rpx;
        padding: 30rpx;
        background-color: #157ec1;
        border-radius: 20rpx;
        color: #FFF;
    }
</style>

 pages/order/orderPickConfirm.vue

@@ -66,13 +66,13 @@
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
                    </view>
                    <!-- <view class="list-left-item">
                    <view class="list-left-item" v-if="!showChecked">
                        <view class="desc">可用数量：</view>
                        <view class="left-item">
                            {{item.count}}
                        </view>
                    </view> -->
                    <view class="list-left-item">
                    </view>
                    <view class="list-left-item" v-else>
                        <view class="desc">数量：</view>
                        <view class="left-item">{{item.useCount}}</view>
                    </view>

 pages/order/zlOrderPakin.vue

@@ -196,8 +196,8 @@
                bomCode: '',
                bomCodeFocus: true,
                maxAn: 0,
                ck1: false,
                ck2: true,
                ck1: true,
                ck2: false,
                fullPlt: 'N',
                decrees_a: {
                    locNo: '',
@@ -208,10 +208,10 @@
            }
        },
        onLoad() {
            this.dataList = uni.getStorageSync('zlPakinDataList')
            if (this.dataList === '') {
                this.dataList = []
            }
            // this.dataList = uni.getStorageSync('zlPakinDataList')
            // if (this.dataList === '') {
            //     this.dataList = []
            // }
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
@@ -290,7 +290,7 @@
                }, 100);
            },
            // 检验当前物料是否是在当前Bom表中
            checkBom() {
            checkBom(mat) {
                let _this = this
                uni.request({
                    url: _this.baseUrl + '/mobile/pda/decrees/check',
@@ -306,7 +306,8 @@
                        if (res.code === 200) {
                            switch(res.data.status) {
                                case 1:
                                    _this.findMat()
                                    // _this.findMat()
                                    _this.checkMat(mat)
                                    break;
                                case 2:
                                    // 相同制令货物补货
@@ -396,7 +397,7 @@
            selectMat() {
                let that = this
                uni.navigateTo({
                    url: "../mat/matQuery",
                    url: "../mat/matQueryByOrder",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('commonUrl', {
@@ -406,12 +407,10 @@
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.matnr = data.data
                            that.checkBom(that.matnr)
                            that.matnr = data.data.matnr
                            that.checkBom(data.data)
                        },
                    },


                });
                that.matnr = ''
            },
@@ -559,6 +558,7 @@
                            innerAudioContext.play()
                            that.dataList = []
                            uni.setStorageSync('zlPakinDataList', that.dataList);
                            uni.showToast({ title: '组托成功', icon: "success", position: 'top' })
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => {

 pages/pakin/WarehouseOutMergeBoardMany.vue

New file
@@ -0,0 +1,631 @@
<template>
    <view>
        <view class="code">			
            <view class="item">
                <view class="code-decs" style="width: 100%;">托盘码:{{barcode}}</view>		
            </view>
            <view class="item">
                <view class="code-decs">订单号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
        </view>
        <view class="mat-list-title">
            <view style="margin-top: 5px;">商品列表</view>
            <view>
                <button size="mini" type="primary" @click="getChecked">提取</button>
                <!-- <button style="margin-left: 10px;" size="mini" type="primary" @click="reset()">清空</button> -->
            </view>
        </view>
        <scroll-view>
            <checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
                <view class="aside">
                    <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
                </view>
                <view class="list-left" style="margin: 0;">
                    <view class="list-left-item">
                        <view class="desc">No：</view>
                        <view class="left-item">{{i + 1}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">订单号：</view>
                        <view class="left-item">
                            <uni-tag :text="item.orderNo" type="primary"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">料号：</view>
                        <view class="left-item">
                            <uni-tag :text="item.matnr" type="primary"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">名称：</view>
                        <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="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>
                    </view>
                </view>
                <view class="list-right">
                    <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
                    <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
                </view>
            </checkbox-group>
        </scroll-view>
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <!-- <button size="mini" @click="reset('warn')">重置</button> -->
            <button size="mini" type="primary" @click="combConfirm('warn')">并板入库</button>
        </view>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
        <view>
            <uni-popup ref="revise" 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="matnr1" disabled="true"
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </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> -->
                    <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;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="reviseClose">取消</view>
                        <view class="btn-right" @click="reviseConfirm()">修改</view>
                    </view>
                </view>
            </uni-popup>
        </view>
        <!-- 移除确认 -->
        <view>
            <!-- 提示窗示例 -->
            <uni-popup ref="alertDialog" type="dialog">
                <uni-popup-dialog :type="msgType" confirmText="移除" :title="title" :content="content"
                    @confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view>
            <!-- 提示信息弹窗 -->
            <uni-popup ref="message" type="message">
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
        <!-- 确认组托 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                    @confirm="comb" @close="combClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <!-- 确认重置 -->
        <view>
            <uni-popup ref="resetConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                    @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view>
            <!-- 提示信息弹窗 -->
            <uni-popup ref="message" type="message">
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                order: '',
                barcode: '',
                barcodeFocus: '',
                dataList: [],
                checkedDataList: [],
                showChecked: false,
                count: 0,
                rowNum: '',
                matnr: '',
                matnr1: '',
                batch: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
                messageText: '',
                title: '',
                content: '',
                barcodeFocus: true,
                matFocus: false,
                matData: '',
                removeNum: 0,
                orderNoList: [],
                orderNo: '',
                item:'',
                locNo:''
            }
        },
        onLoad() {
            let that = this
            const eventChannel = that.getOpenerEventChannel();
            eventChannel.on('data', function(data) {
                that.barcode = data.barcode
            })
			
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getOrderNoList()
        },
        methods: {
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false:true
            },
            getChecked() {
                var checkedList = []
                for(var i = 0; i < this.dataList.length; i++) {
                    var t = !this.dataList[i].checked
                    if (this.dataList[i].checked) {
                        checkedList.push(this.dataList[i])
                    }
                }
				
                if(checkedList.length == 0) {
                    this.messageText = "请选择并板物料"
                    this.messageToggle('error')
                    return;
                }
				
                this.dataList = checkedList
                this.showChecked = true
            },
            getOrderDet() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/order/list/orderNo',
                    data: {orderNo: that.orderNo} ,
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            that.dataList = res.data
                            for (var i = 0; i < that.dataList.length; i++) {
                                that.$set(that.dataList[i],'checked',false)
                            }
                        }
                    }
                })
            },
            checkboxChange: function (e) {
            },
            getOrderNoList() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/order/list/all',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        for (var i = 0; i < res.data.length; i++) {
                            that.orderNoList.push(res.data[i].order_no)
                        }
                    }
                })
            },

            messageToggle(type) {
                this.msgType1 = type
                this.$refs.message.open()
            },
            // barcode input 事件
            barcodeInput() {
                let that = this
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {									
                    uni.request({
                        url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
                        data: {
                            orderNo: that.orderNo
                        },						
                        header: {
                            'token': uni.getStorageSync('token')
                        },
                        success(result) {
                            var res = result.data
                            if (res.code === 200) {
                                console.log("res.data");
                                console.log(res.data);
                                that.dataList = res.data;
                            } else if (res.code == 403) {
                                that.dataList = [];
                                that.messageText = res.msg
                                that.messageToggle('error')
                                setTimeout(() => {
                                    uni.reLaunch({
                                        url: '../login/login'
                                    });
                                }, 1000);
                            } else {
                                that.dataList = [];
                                that.messageText = res.msg
                                that.messageToggle('error')
                            }
                        }
                    });
                    this.focuss()
                }, 200)
            },
            // 托盘码有误重置
            barcodeFocuss() {
                let that = this;
                that.barcodeFocus = false;
                setTimeout(() => {
                    that.barcode = '';
                    that.barcodeFocus = true;
                }, 100);
            },
            // 商品光标清空重置
            focuss() {
                setTimeout(() => {
                    this.matnr = '';
                    this.matFocus = true;
                }, 100);
            },
            // 搜索物料
            findMat() {
                let that = this
                var matnr = that.matnr.split(";")
                that.order = matnr[0]
                that.matnr = matnr[1]
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
                        matnr: that.matnr
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        result = result.data
                        if (result.code === 200 && result.data) {
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            result.data.batch = matnr[2]
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
                                success: function(res) {
                                    res.eventChannel.emit('mat', {
                                        data: result.data
                                    })
                                },
                                // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
                                events: {
                                    matList: function(data) {
                                        that.checkMat(data.data)
                                        that.focuss()
                                    },
                                },
                            });
                        } 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'
                            })
                        }

                    }
                });

            },
            checkMat(mat) {
                mat['orderNo'] = this.order
                var len = this.dataList.length
                var add = true,
                    sameItem = false
                for (var i = 0; i < len; i++) {
                    if (mat.orderNo != this.dataList[i].orderNo) {
                        add = true
                        break;
                    } else {
                        if (mat.matnr == this.dataList[i].matnr) {
                            for (var j = 0; j < len; j++) {
                                if (mat.batch == this.dataList[j].batch) {
                                    sameItem = true
                                }
                            }
                            // 相同物料 不同批号  新加列表
                            if (mat.batch != this.dataList[i].batch) {
                                this.$forceUpdate() // 强制刷新
                                if (sameItem) {
                                    add = false
                                } else {
                                    add = true
                                }

                            } else {
                                // 相同物料相同批号 数量累加
                                this.dataList[i].anfme += mat.anfme
                                this.$forceUpdate() // 强制刷新
                                add = false
                            }
                        }
                    }

                }
                if (add) {
                    this.dataList.unshift(mat)
                }
            },
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在并板!'
                this.$refs.combConfirm.open()
            },
            comb() {
                uni.vibrateShort();
                let that = this;
                if (that.orderNo === '') {
                    this.messageText = "请输入订单号"
                    this.messageToggle('error')
                    return;
                }
                if (that.barcode === '') {
                    this.messageText = "托盘码不能为空"
                    this.messageToggle('error')
                    return;
                }
                if (that.dataList.length === 0) {
                    this.messageText = "请提取并板物料"
                    this.messageToggle('error')
                    return;
                }
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
                        this.messageText = that.dataList[i].matnr + '数量不能为0'
                        this.messageToggle('error')
                        return;
                    }
                }
                uni.request({
                    url: that.baseUrl + '/mobile/pda/WarehouseOutMergeBoardMany/v1',
                    data: JSON.stringify({
                        barcode: that.barcode,
                        combMats: that.dataList
                    }),
                    method: 'POST',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200) {
                            that.orderNo = ""
                            that.dataList = []
                            // that.resst();
                            that.messageText = "并板成功"
                            that.messageToggle('success')
                        } 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')
                        }
                    }
                });
            },
            reset(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否重置!'
                this.$refs.resetConfirm.open()
            },
            // 确认重置
            resetConfirm() {
                this.dataList = []
                this.locNo = ''				
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
            // 取消重置
            resetClose() {

            },
            // 修改批号
            revise(item, i) {
                this.matnr1 = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.batch = this.dataList[i].batch
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.eject()
            },
            eject(type) {
                this.type = type
                this.$refs.revise.open(type)
            },
            // 列表移除按钮
            remove(item, i, type) {
                this.removeNum = i
                this.msgType = type
                this.title = '警告'
                this.content = '是否移除当前商品!'
                this.$refs.alertDialog.open(i)
            },
            // 确认移除
            removeConfirm(i) {
                this.messageText = "移除成功"
                this.messageToggle('success')
                this.dataList.splice(this.removeNum, 1)
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.messageText = "修改成功"
                this.messageToggle('success')
                this.$refs.revise.close()
                this.$forceUpdate() // 强制刷新
            },
            reviseClose() {
                this.$refs.revise.close()
            },
            changeValue(value) {
                this.count = value
            },
            // 清空
            resst() {
                this.dataList = []
                this.locNo = ''
                this.barcodeFocuss()
            },
            combClose() {
                this.$refs.combConfirm.close()
            },
            // 取消移除
            removeClose() {
                this.$refs.alertDialog.close()
            },
        }
    }
</script>

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

    .list {
        display: flex;
        min-height: 80rpx;
        background-color: #FFF;
        margin: 20rpx 20rpx;
        border-radius: 20rpx;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.2);
    }

    .list:first-child {
        margin-top: 360rpx;
    }

    .list:last-child {
        margin-bottom: 120rpx;
    }

    .aside {
        width: 100rpx;
        /* background-color: #303133; */
        display: flex;
        align-items: center;
        justify-content: center;
    }

    .code {
        width: 100%;
        position: fixed;
        min-height: 200rpx;
        background-color: #FFF;
        z-index: 10;
    }

    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }

    .item input {
        height: 50rpx;
        line-height: 50rpx;
        /* font-family: PingFang SC; uniapp 默认字体不居中 */
        font-size: 36upx;
        font-family: PingFang SC;
        width: 55vw;

    }

    .code-decs {
        width: 20vw;
        font-size: 18px;
        color: #303133;
    }

    .item-right {
        margin-left: auto;
        margin-right: 20rpx;
    }

    .mat-list-title {
    /*     display: flex;
        align-items: center; */
        height: 120rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }
</style>

 pages/pakin/WarehousePickOutParallelBoard.vue

New file
@@ -0,0 +1,632 @@
<template>
    <view>
        <view class="code">			
            <view class="item">
                <view class="code-decs" style="width: 100%;">库位号:{{locNo}}</view>		
            </view>
            <view class="item">
                <view class="code-decs">订单号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
        </view>
        <view class="mat-list-title">
            <view style="margin-top: 5px;">商品列表</view>
            <view>
                <button size="mini" type="primary" @click="getChecked">提取</button>
                <!-- <button style="margin-left: 10px;" size="mini" type="primary" @click="reset()">清空</button> -->
            </view>
        </view>
        <scroll-view>
            <checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
                <view class="aside">
                    <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
                </view>
                <view class="list-left" style="margin: 0;">
                    <view class="list-left-item">
                        <view class="desc">No：</view>
                        <view class="left-item">{{i + 1}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">订单号：</view>
                        <view class="left-item">
                            <uni-tag :text="item.orderNo" type="primary"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">料号：</view>
                        <view class="left-item">
                            <uni-tag :text="item.matnr" type="primary"></uni-tag>
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">名称：</view>
                        <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="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>
                    </view>
                </view>
                <view class="list-right">
                    <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
                    <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
                </view>
            </checkbox-group>
        </scroll-view>
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <!-- <button size="mini" @click="reset('warn')">重置</button> -->
            <button size="mini" type="primary" @click="combConfirm('warn')">并板入库</button>
        </view>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
        <view>
            <uni-popup ref="revise" 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="matnr1" disabled="true"
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </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> -->
                    <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;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="reviseClose">取消</view>
                        <view class="btn-right" @click="reviseConfirm()">修改</view>
                    </view>
                </view>
            </uni-popup>
        </view>
        <!-- 移除确认 -->
        <view>
            <!-- 提示窗示例 -->
            <uni-popup ref="alertDialog" type="dialog">
                <uni-popup-dialog :type="msgType" confirmText="移除" :title="title" :content="content"
                    @confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view>
            <!-- 提示信息弹窗 -->
            <uni-popup ref="message" type="message">
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
        <!-- 确认组托 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                    @confirm="comb" @close="combClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <!-- 确认重置 -->
        <view>
            <uni-popup ref="resetConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                    @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view>
            <!-- 提示信息弹窗 -->
            <uni-popup ref="message" type="message">
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                order: '',
                barcode: '',
                barcodeFocus: '',
                dataList: [],
                checkedDataList: [],
                showChecked: false,
                count: 0,
                rowNum: '',
                matnr: '',
                matnr1: '',
                batch: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
                messageText: '',
                title: '',
                content: '',
                barcodeFocus: true,
                matFocus: false,
                matData: '',
                removeNum: 0,
                orderNoList: [],
                orderNo: '',
                item:'',
                locNo:''
            }
        },
        onLoad() {
            let that = this
            const eventChannel = that.getOpenerEventChannel();
            eventChannel.on('locNo', function(data) {
                that.locNo = data.locNo
            })
			
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getOrderNoList()
        },
        methods: {
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false:true
            },
            getChecked() {
                var checkedList = []
                for(var i = 0; i < this.dataList.length; i++) {
                    var t = !this.dataList[i].checked
                    if (this.dataList[i].checked) {
                        checkedList.push(this.dataList[i])
                    }
                }
				
                if(checkedList.length == 0) {
                    this.messageText = "请选择并板物料"
                    this.messageToggle('error')
                    return;
                }
				
                this.dataList = checkedList
                this.showChecked = true
            },
            getOrderDet() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/order/list/orderNo',
                    data: {orderNo: that.orderNo} ,
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            that.dataList = res.data
                            for (var i = 0; i < that.dataList.length; i++) {
                                that.$set(that.dataList[i],'checked',false)
                            }
                        }
                    }
                })
            },
            checkboxChange: function (e) {
            },
            getOrderNoList() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/order/list/all',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        for (var i = 0; i < res.data.length; i++) {
                            that.orderNoList.push(res.data[i].order_no)
                        }
                    }
                })
            },

            messageToggle(type) {
                this.msgType1 = type
                this.$refs.message.open()
            },
            // barcode input 事件
            barcodeInput() {
                let that = this
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {									
                    uni.request({
                        url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
                        data: {
                            orderNo: that.orderNo
                        },						
                        header: {
                            'token': uni.getStorageSync('token')
                        },
                        success(result) {
                            var res = result.data
                            if (res.code === 200) {
                                console.log("res.data");
                                console.log(res.data);
                                that.dataList = res.data;
                            } else if (res.code == 403) {
                                that.dataList = [];
                                that.messageText = res.msg
                                that.messageToggle('error')
                                setTimeout(() => {
                                    uni.reLaunch({
                                        url: '../login/login'
                                    });
                                }, 1000);
                            } else {
                                that.dataList = [];
                                that.messageText = res.msg
                                that.messageToggle('error')
                            }
                        }
                    });
                    this.focuss()
                }, 200)
            },
            // 托盘码有误重置
            barcodeFocuss() {
                let that = this;
                that.barcodeFocus = false;
                setTimeout(() => {
                    that.barcode = '';
                    that.barcodeFocus = true;
                }, 100);
            },
            // 商品光标清空重置
            focuss() {
                setTimeout(() => {
                    this.matnr = '';
                    this.matFocus = true;
                }, 100);
            },
            // 搜索物料
            findMat() {
                let that = this
                var matnr = that.matnr.split(";")
                that.order = matnr[0]
                that.matnr = matnr[1]
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
                        matnr: that.matnr
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        result = result.data
                        if (result.code === 200 && result.data) {
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            result.data.batch = matnr[2]
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
                                success: function(res) {
                                    res.eventChannel.emit('mat', {
                                        data: result.data
                                    })
                                },
                                // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
                                events: {
                                    matList: function(data) {
                                        that.checkMat(data.data)
                                        that.focuss()
                                    },
                                },
                            });
                        } 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'
                            })
                        }

                    }
                });

            },
            checkMat(mat) {
                mat['orderNo'] = this.order
                var len = this.dataList.length
                var add = true,
                    sameItem = false
                for (var i = 0; i < len; i++) {
                    if (mat.orderNo != this.dataList[i].orderNo) {
                        add = true
                        break;
                    } else {
                        if (mat.matnr == this.dataList[i].matnr) {
                            for (var j = 0; j < len; j++) {
                                if (mat.batch == this.dataList[j].batch) {
                                    sameItem = true
                                }
                            }
                            // 相同物料 不同批号  新加列表
                            if (mat.batch != this.dataList[i].batch) {
                                this.$forceUpdate() // 强制刷新
                                if (sameItem) {
                                    add = false
                                } else {
                                    add = true
                                }

                            } else {
                                // 相同物料相同批号 数量累加
                                this.dataList[i].anfme += mat.anfme
                                this.$forceUpdate() // 强制刷新
                                add = false
                            }
                        }
                    }

                }
                if (add) {
                    this.dataList.unshift(mat)
                }
            },
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在并板!'
                this.$refs.combConfirm.open()
            },
            comb() {
                uni.vibrateShort();
                let that = this;
                if (that.orderNo === '') {
                    this.messageText = "请输入订单号"
                    this.messageToggle('error')
                    return;
                }
                if (that.locNo === '') {
                    this.messageText = "库位号不能为空"
                    this.messageToggle('error')
                    return;
                }
                if (that.dataList.length === 0) {
                    this.messageText = "请提取并板物料"
                    this.messageToggle('error')
                    return;
                }
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
                        this.messageText = that.dataList[i].matnr + '数量不能为0'
                        this.messageToggle('error')
                        return;
                    }
                }
                uni.request({
                    url: that.baseUrl + '/mobile/pda/WarehouseOutPickMerge/v1',
                    data: JSON.stringify({
                        locNo: that.locNo,
                        orderNo: that.orderNo,
                        combMats: that.dataList
                    }),
                    method: 'POST',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200) {
                            that.orderNo = ""
                            that.dataList = []
                            that.resst();
                            that.messageText = "并板成功"
                            that.messageToggle('success')
                        } 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')
                        }
                    }
                });
            },
            reset(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否重置!'
                this.$refs.resetConfirm.open()
            },
            // 确认重置
            resetConfirm() {
                this.dataList = []
                this.locNo = ''				
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
            // 取消重置
            resetClose() {

            },
            // 修改批号
            revise(item, i) {
                this.matnr1 = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.batch = this.dataList[i].batch
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.eject()
            },
            eject(type) {
                this.type = type
                this.$refs.revise.open(type)
            },
            // 列表移除按钮
            remove(item, i, type) {
                this.removeNum = i
                this.msgType = type
                this.title = '警告'
                this.content = '是否移除当前商品!'
                this.$refs.alertDialog.open(i)
            },
            // 确认移除
            removeConfirm(i) {
                this.messageText = "移除成功"
                this.messageToggle('success')
                this.dataList.splice(this.removeNum, 1)
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.messageText = "修改成功"
                this.messageToggle('success')
                this.$refs.revise.close()
                this.$forceUpdate() // 强制刷新
            },
            reviseClose() {
                this.$refs.revise.close()
            },
            changeValue(value) {
                this.count = value
            },
            // 清空
            resst() {
                this.dataList = []
                this.locNo = ''
                this.barcodeFocuss()
            },
            combClose() {
                this.$refs.combConfirm.close()
            },
            // 取消移除
            removeClose() {
                this.$refs.alertDialog.close()
            },
        }
    }
</script>

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

    .list {
        display: flex;
        min-height: 80rpx;
        background-color: #FFF;
        margin: 20rpx 20rpx;
        border-radius: 20rpx;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.2);
    }

    .list:first-child {
        margin-top: 360rpx;
    }

    .list:last-child {
        margin-bottom: 120rpx;
    }

    .aside {
        width: 100rpx;
        /* background-color: #303133; */
        display: flex;
        align-items: center;
        justify-content: center;
    }

    .code {
        width: 100%;
        position: fixed;
        min-height: 200rpx;
        background-color: #FFF;
        z-index: 10;
    }

    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }

    .item input {
        height: 50rpx;
        line-height: 50rpx;
        /* font-family: PingFang SC; uniapp 默认字体不居中 */
        font-size: 36upx;
        font-family: PingFang SC;
        width: 55vw;

    }

    .code-decs {
        width: 20vw;
        font-size: 18px;
        color: #303133;
    }

    .item-right {
        margin-left: auto;
        margin-right: 20rpx;
    }

    .mat-list-title {
    /*     display: flex;
        align-items: center; */
        height: 120rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }
</style>