#

whycq

2024-10-26 b4109c203742424cc795bdca9ca1e00d5602e241

#

 pages.json

@@ -331,7 +331,35 @@
                "navigationStyle": "custom"
            }
        }
    ],
        ,{
            "path" : "pages/order/orderPickConfirm2",
            "style" :
            {
                // "navigationBarTitleText" : "并板入库",
                // "enablePullDownRefresh" : false
                "navigationStyle": "custom"
            }
        }
        ,{
            "path" : "pages/order/pickOrderList",
            "style" :                                                                                    
            {
                // "navigationBarTitleText": "订单物料",
                // "enablePullDownRefresh": false
                "navigationStyle": "custom"
            }
            
        }
        ,{
            "path" : "pages/pakin/pickOrderList",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "订单物料",
                "enablePullDownRefresh": false
            }
            
        }
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "uni-app",

 pages/home/home.vue

@@ -81,7 +81,7 @@
                        name: 'orderPickConfirm',
                        color: 'green',
                        cuIcon: 'pulldown',
                        url: '/order/orderPickConfirm'
                        url: '/order/orderPickConfirm2'
                    },
                    {
                        title: '并板途中拣料',

 pages/order/orderPickConfirm2.vue

New file
@@ -0,0 +1,531 @@
<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="code">
            <view class="item">
                <view class="code-decs">库位号:</view>
                <uni-combox :candidates="locNoList" placeholder="请选择库位号" v-model="locNo"
                    @input="getLocNoList"></uni-combox>
            </view>
            <view class="item">
                <view class="code-decs">站点:</view>
                <uni-combox :candidates="staList" placeholder="请选择站点" v-model="sta"
                    @input="getPickStaList"></uni-combox>
                    <button size="mini" type="primary" @click="getMat">提取物料</button>
            </view>
            <!-- <view class="item">
                <view class="code-decs">物料号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" @input="getMatList()">
            </view> -->
        </view>
        <view class="mat-list-title">
            <view>商品列表</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：{{i + 1}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">订单号：{{item.orderNo}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">料号：{{item.matnr}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">批号：{{item.batch}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">可用数量：{{item.count}}</view>
                    </view>
                    <view class="list-left-item" >
                        <view class="desc">数量：{{item.useCount}}</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='1' :max="mastCount" 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: '',
                storeId: 0,
                store: '',
                locNo: '',
                locNoList: [],
                sta: '106',
                staList: [],
                dataList: [],
                checkedDataList: [],
                matnr: '',
                showChecked: false,
                count: 0,
                rowNum: '',
                matnr1: '',
                batch: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
                messageText: '',
                title: '',
                content: '',
                matFocus: false,
                matData: '',
                removeNum: 0,
                orderNoList: [],
                orderNo: '',
                mastCount: 0
            }
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getPickStaList()
            // this.getMatList()
            this.getLocNoList()
            this.storeId = uni.getStorageSync('store')
            if (this.storeId == 1) {
                this.store = '宁波仓'
            }
            if (this.storeId == 2) {
                this.store = '新昌仓'
            }
        },
        methods: {
            back() { uni.navigateBack({}) },
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false : true
            },
            getMat() {
                let _this = this
                uni.navigateTo({
                    url: './pickOrderList',
                    success(res) {
                        res.eventChannel.emit('matList', {
                            matList: _this.dataList
                        })
                    },
                    events: {
                        sMat: function(data) {
                            _this.dataList.push(data.data)
                            console.log(data);
                        }
                    }
                })
            },
			
            getLocNoList() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/mobile/loc/f/list',
                    header: { 'token': uni.getStorageSync('token') },
                    data: { locNo: that.locNo },
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            let data = res.data
                            let list = []
                            data.forEach((item) => {
                                list.push(item.locNo)
                            })
                            that.locNoList = list;
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                })
            },
            getPickStaList() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/mobile/pick/sta/list',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            let data = res.data
                            let list = []
                            data.forEach((item) => {
                                list.push(item.stnNo)
                            })
                            that.staList = list;
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                })
            },
            getMatList() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/mobile/pick/mat/list',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    data: {
                        matnr: that.matnr,
                    },
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            that.showChecked = false
                            that.dataList = res.data
                            for (var i = 0; i < that.dataList.length; i++) {
                                that.$set(that.dataList[i], 'checked', false)
                            }
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                })
				
            },
            getChecked() {
                let checkedList = this.checkedDataList;
                for (var i = 0; i < this.dataList.length; i++) {
                    var t = !this.dataList[i].checked
                    if (this.dataList[i].checked) {
                        let data = this.dataList[i]
                        data.useCount = data.count
                        checkedList.push(data)
                    }
                }
                this.matnr = ""
                this.checkedDataList = checkedList;
                this.switchCheckedList()
            },
            switchCheckedList() {
                this.dataList = this.checkedDataList;
                this.showChecked = true;
            },
            checkboxChange: function(e) {},
            messageToggle(type) {
                this.msgType1 = type
                this.$refs.message.open()
            },
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在并板!'
                this.$refs.combConfirm.open()
            },
            comb() {
                uni.vibrateShort();
                let that = this;
                if (that.dataList.length === 0) {
                    uni.showToast({ title: "请选择并板商品", icon: "error", position: 'center' })
                    return;
                }
                if (that.locNo == '') {
                    uni.showToast({ title: "库位号不能为空", icon: "error", position: 'center' })
                    return;
                }
                if (that.sta == '') {
                    uni.showToast({ title: "站点不能为空", icon: "error", position: 'center' })
                    return;
                }
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].useCount == 0 || that.dataList[i].useCount == '') {
                        uni.showToast({ title: "并板数量不能为0", icon: "error", position: 'center' })
                        return;
                    }
                }
				
                let param = {
                        locNo: that.locNo,
                        staNo: that.sta,
                        list: that.dataList
                }
                uni.request({
                    url: that.baseUrl + '/mobile/pick/in',
                    data: JSON.stringify(param),
                    method: 'POST',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200) {
                            that.resst();
                            uni.showToast({ title: "并板成功", icon: "success", position: 'center' })
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "success", position: 'center' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "success", position: 'center' })
                        }
                    }
                });
            },
            reset(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否重置!'
                this.$refs.resetConfirm.open()
            },
            // 确认重置
            resetConfirm() {
                this.dataList = []
                this.orderNo = ''
                this.barcode = ''
                this.checkedDataList = []
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
            // 取消重置
            resetClose() {

            },
            // 修改批号
            revise(item, i) {
                this.matnr1 = this.dataList[i].matnr
                this.count = this.dataList[i].useCount
                this.batch = this.dataList[i].batch
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.mastCount = this.dataList[i].count
                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].useCount = this.count
                this.dataList[this.rowNum].batch = this.batch
                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.checkedDataList = []
                this.locNo = ''
                this.sta = ''
            },
            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: 330rpx;
    }

    .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;
        justify-content: center;
        height: 80rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }
</style>

 pages/order/pickOrderList.vue

New file
@@ -0,0 +1,169 @@
<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="code">
            <view style="display: flex;align-items: center;">
                <view style="width: 70rpx;padding-left: 20rpx;" @click="changeST">{{searchType}}</view>
                <view style="flex: 1;margin-left: -8rpx;">
                    <uni-search-bar  v-model="searchValue"
                        maxlength="500" ancel="cancel" @confirm="getMatList()" @clear="clear" placeholder="输入 / 扫描">
                    </uni-search-bar>
                </view>
				
            </view>
            <view class="code-title">
                <view></view>
                <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 总数量：- {{total}} -</view>
            </view>
        </view>
		
        <view class="order__list" v-for="(orderDetl,index) in dataList" :key="index">
            <view class="order__list__left">
                <view>No：{{index + 1}}</view>
                <view>订单号：{{orderDetl.orderNo}}</view>
                <view>料号：{{orderDetl.matnr}}</view>
                <view>批号：{{orderDetl.batch}}</view>
                <view>可用数量：{{orderDetl.count}}</view>
            </view>
            <view class="order__list__right" @click="addItem(orderDetl)">
                <uni-icons type="folder-add" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
        <view style="height: 100rpx;width: 100%;text-align: center;line-height: 100rpx;">- 已经到底了 -</view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                storeId: 0,
                store: '',
                total: 0,
                searchType: '物料',
                searchValue: '',
                dataList: [],
                selectedList: []
            }
        },
        onShow() {
            let _this = this
            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 = '新昌仓'
            }
            const eventChannel = this.getOpenerEventChannel();
            eventChannel.on('matList', function(data) {
                _this.selectedList = data.matList
            })
            this.getMatList()
        },
        methods: {
            back() { uni.navigateBack({}) },
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false : true
            },
            changeST() {
                if (this.searchType == '物料') this.searchType = '订单' 
                else this.searchType = '物料'
            },
            getMatList() {
                let that = this
                let searchParam = {}
                if (this.searchType == '物料') searchParam = {matnr: that.searchValue}
                else searchParam = {orderNo: that.searchValue}
                console.log(searchParam);
                uni.request({
                    url: that.baseUrl + '/mobile/pick/mat/list',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    data: searchParam,
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            that.total = res.data.length
                            const result1 = res.data.filter(obj1 => 
                                !that.selectedList.some(obj2 => obj1.matnr === obj2.matnr && obj1.orderNo === obj2.orderNo)
                            );
                            that.dataList = result1
                            that.total = result1.length
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                })
				
            },
            addItem(mat) {
                this.getOpenerEventChannel().emit('sMat', {data: mat});
                uni.navigateBack({
					
                })
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .code {
        background-color: #d9d9d9;
        z-index: 99;
        position: sticky;
        top: 0rpx;
        left: 0;
    }
    .code-title {
        display: flex;
    }
    .order__list {
        margin: 20rpx;
        font-size: 14px;
        background-color: #fff;
        border-radius: 20rpx;
        border: 1px solid #eeeeee;
        display: flex;
        position: relative;
        background-color: #3eb689;
        color: #FFF;
    }
    .order__list__left {
        flex: 1;
        padding: 20rpx;
        position: relative;
    }
    .order__list__right {
        width: 70rpx;
        border-left: 1px solid #eeeeee;
        display: flex;
        align-items: center;
        justify-content: center;
    }
</style>

 pages/pakin/WarehouseOutMergeBoardMany.vue

@@ -2,66 +2,35 @@
    <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 class="code-decs" style="width: 70%;">托盘码:{{barcode}}</view>	
                    <button size="mini" type="primary" @click="getMat">提取物料</button>
            </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 class="desc">No：{{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 class="desc">订单号：{{item.orderNo}}</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 class="desc">料号：{{item.matnr}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">名称：</view>
                        <view class="left-item">{{item.maktx}}</view>
                        <view class="desc">批号：{{item.batch}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">规格：</view>
                        <view class="left-item">{{item.specs}}</view>
                        <view class="desc">可用数量：{{item.count}}</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 class="list-left-item" >
                        <view class="desc">数量：{{item.useCount}}</view>
                    </view>
                </view>
                <view class="list-right">
@@ -100,7 +69,7 @@
                    <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"
                            <uni-number-box :value="count" :step='1' :max="mastCount" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
@@ -178,7 +147,8 @@
                orderNoList: [],
                orderNo: '',
                item:'',
                locNo:''
                locNo:'',
                mastCount: 0
            }
        },
        onLoad() {
@@ -195,6 +165,22 @@
            this.getOrderNoList()
        },
        methods: {
            getMat() {
                let _this = this
                uni.navigateTo({
                    url: '../order/pickOrderList',
                    success(res) {
                        res.eventChannel.emit('matList', {
                            matList: _this.dataList
                        })
                    },
                    events: {
                        sMat: function(data) {
                            _this.dataList.push(data.data)
                        }
                    }
                })
            },
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false:true
@@ -419,11 +405,6 @@
            comb() {
                uni.vibrateShort();
                let that = this;
                if (that.orderNo === '') {
                    this.messageText = "请输入订单号"
                    this.messageToggle('error')
                    return;
                }
                if (that.barcode === '') {
                    this.messageText = "托盘码不能为空"
                    this.messageToggle('error')
@@ -434,12 +415,8 @@
                    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;
                    }
                for (let item of this.dataList) {
                    item['anfme'] = item.useCount
                }
                uni.request({
                    url: that.baseUrl + '/mobile/pda/WarehouseOutMergeBoardMany/v1',
@@ -454,9 +431,7 @@
                    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) {
@@ -494,10 +469,11 @@
            // 修改批号
            revise(item, i) {
                this.matnr1 = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.count = this.dataList[i].useCount
                this.batch = this.dataList[i].batch
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.mastCount = this.dataList[i].count
                this.eject()
            },
            eject(type) {
@@ -519,7 +495,7 @@
                this.dataList.splice(this.removeNum, 1)
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].useCount = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.messageText = "修改成功"
@@ -563,7 +539,7 @@
    }

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

    .list:last-child {
@@ -581,7 +557,7 @@
    .code {
        width: 100%;
        position: fixed;
        min-height: 200rpx;
        min-height: 70rpx;
        background-color: #FFF;
        z-index: 10;
    }
@@ -589,7 +565,7 @@
    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        height: 70rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }
@@ -618,11 +594,11 @@
    .mat-list-title {
    /*     display: flex;
        align-items: center; */
        height: 120rpx;
        height: 60rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        margin-top: 70rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;

 pages/pakin/WarehouseOutParallelBoard.vue

@@ -5,11 +5,11 @@
                <view class="item" style="width: 50%;">
                    <view class="code-decs" style="width: 100%;">库位号:{{item.locNo}}</view>                    
                </view>
                <view class="item" style="width: 50%;">
            </view>
            <view class="item">
                <view class="item" style="width: 90%;">
                    <view class="code-decs" style="width: 100%;">物料:{{item.matnr}}</view>                    
                </view>
				
				
            </view>
            <view class="item">
                <view class="code-decs">订单号:</view>
@@ -20,7 +20,7 @@
        <view class="mat-list-title">
            <view style="width: 200rpx;"></view>
            <view style="-webkit-flex: 1;flex: 1;">商品列表</view>
            <view style="width: 200rpx;"><button size="mini" type="primary" @click="reset()">清空</button></view>
            <view style="width: 200rpx;"></view>
        </view>
        <scroll-view>
            <checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
@@ -77,7 +77,7 @@
        </scroll-view>
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <!-- <button size="mini" @click="reset('warn')">重置</button> -->
            <button size="mini" @click="reset('warn')">清空</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">当前库位拣选</button>
        </view>
        <!-- 弹窗 -->
@@ -586,7 +586,7 @@
    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        height: 70rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }

 pages/pakin/WarehousePickOutParallelBoard.vue

@@ -2,66 +2,40 @@
    <view>
        <view class="code">            
            <view class="item">
                <view class="code-decs" style="width: 100%;">库位号:{{locNo}}</view>		
                <view class="code-decs" style="width: 70%;">库位号:{{locNo}}</view>	
                    <button size="mini" type="primary" @click="getMat">提取物料</button>
            </view>
            <view class="item">
            <!-- <view class="item">
                <view class="code-decs">订单号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
            </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 class="desc">No：{{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 class="desc">订单号：{{item.orderNo}}</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 class="desc">料号：{{item.matnr}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">名称：</view>
                        <view class="left-item">{{item.maktx}}</view>
                        <view class="desc">批号：{{item.batch}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">规格：</view>
                        <view class="left-item">{{item.specs}}</view>
                        <view class="desc">可用数量：{{item.count}}</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 class="list-left-item" >
                        <view class="desc">数量：{{item.useCount}}</view>
                    </view>
                </view>
                <view class="list-right">
@@ -100,7 +74,7 @@
                    <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"
                            <uni-number-box :value="count" :step='1' :max="mastCount" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
@@ -178,7 +152,8 @@
                orderNoList: [],
                orderNo: '',
                item:'',
                locNo:''
                locNo:'',
                mastCount: 0
            }
        },
        onLoad() {
@@ -195,6 +170,22 @@
            this.getOrderNoList()
        },
        methods: {
            getMat() {
                let _this = this
                uni.navigateTo({
                    url: '../order/pickOrderList',
                    success(res) {
                        res.eventChannel.emit('matList', {
                            matList: _this.dataList
                        })
                    },
                    events: {
                        sMat: function(data) {
                            _this.dataList.push(data.data)
                        }
                    }
                })
            },
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false:true
@@ -419,11 +410,11 @@
            comb() {
                uni.vibrateShort();
                let that = this;
                if (that.orderNo === '') {
                    this.messageText = "请输入订单号"
                    this.messageToggle('error')
                    return;
                }
                // if (that.orderNo === '') {
                //     this.messageText = "请输入订单号"
                //     this.messageToggle('error')
                //     return;
                // }
                if (that.locNo === '') {
                    this.messageText = "库位号不能为空"
                    this.messageToggle('error')
@@ -434,18 +425,14 @@
                    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;
                    }
                for (let item of this.dataList) {
                    item['anfme'] = item.useCount
                }
                uni.request({
                    url: that.baseUrl + '/mobile/pda/WarehouseOutPickMerge/v1',
                    data: JSON.stringify({
                        locNo: that.locNo,
                        orderNo: that.orderNo,
                        // orderNo: that.orderNo,
                        combMats: that.dataList
                    }),
                    method: 'POST',
@@ -495,10 +482,11 @@
            // 修改批号
            revise(item, i) {
                this.matnr1 = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.count = this.dataList[i].useCount
                this.batch = this.dataList[i].batch
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.mastCount = this.dataList[i].count
                this.eject()
            },
            eject(type) {
@@ -520,7 +508,7 @@
                this.dataList.splice(this.removeNum, 1)
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].useCount = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.messageText = "修改成功"
@@ -537,7 +525,6 @@
            // 清空
            resst() {
                this.dataList = []
                this.locNo = ''
                this.barcodeFocuss()
            },
            combClose() {
@@ -564,7 +551,7 @@
    }

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

    .list:last-child {
@@ -582,7 +569,7 @@
    .code {
        width: 100%;
        position: fixed;
        min-height: 200rpx;
        min-height: 70rpx;
        background-color: #FFF;
        z-index: 10;
    }
@@ -590,7 +577,7 @@
    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        height: 70rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }
@@ -619,11 +606,11 @@
    .mat-list-title {
    /*     display: flex;
        align-items: center; */
        height: 120rpx;
        height: 60rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        margin-top: 70rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;

 pages/pakin/pickOrderList.vue

New file
@@ -0,0 +1,154 @@
<template>
    <view>
		 
        <view class="code">
            <view style="display: flex;align-items: center;">
                <view style="width: 70rpx;padding-left: 20rpx;" @click="changeST">{{searchType}}</view>
                <view style="flex: 1;margin-left: -8rpx;">
                    <uni-search-bar  v-model="searchValue"
                        maxlength="500" ancel="cancel" @confirm="getMatList()" @clear="clear" placeholder="输入 / 扫描">
                    </uni-search-bar>
                </view>
				
            </view>
            <view class="code-title">
                <view></view>
                <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 总数量：- {{total}} -</view>
            </view>
        </view>
		
        <view class="order__list" v-for="(orderDetl,index) in dataList" :key="index">
            <view class="order__list__left">
                <view>No：{{index + 1}}</view>
                <view>订单号：{{orderDetl.orderNo}}</view>
                <view>料号：{{orderDetl.matnr}}</view>
                <view>批号：{{orderDetl.batch}}</view>
                <view>可用数量：{{orderDetl.count}}</view>
            </view>
            <view class="order__list__right" @click="addItem(orderDetl)">
                <uni-icons type="folder-add" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
        <view style="height: 100rpx;width: 100%;text-align: center;line-height: 100rpx;">- 已经到底了 -</view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                storeId: 0,
                store: '',
                total: 0,
                searchType: '物料',
                searchValue: '',
                dataList: [],
                selectedList: []
            }
        },
        onShow() {
            let _this = this
            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 = '新昌仓'
            }
            const eventChannel = this.getOpenerEventChannel();
            eventChannel.on('matList', function(data) {
                _this.selectedList = data.matList
            })
            this.getMatList()
        },
        methods: {
            back() { uni.navigateBack({}) },
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false : true
            },
            changeST() {
                if (this.searchType == '物料') this.searchType = '订单' 
                else this.searchType = '物料'
            },
            getMatList() {
                let that = this
                let searchParam = {}
                if (this.searchType == '物料') searchParam = {matnr: that.searchValue}
                else searchParam = {orderNo: that.searchValue}
                uni.request({
                    url: that.baseUrl + '/orderDetl/forOrderNo/mergePakin/v1',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    data: searchParam,
                    method: 'GET',
                    success(res) {
                        res = res.data;
                        if (res.code === 200) {
                            that.total = res.data.length
                            const result1 = res.data.filter(obj1 => 
                                !that.selectedList.some(obj2 => obj1.matnr === obj2.matnr && obj1.orderNo === obj2.orderNo)
                            );
                            that.dataList = result1
                            that.total = result1.length
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                })
				
            },
            addItem(mat) {
                this.getOpenerEventChannel().emit('sMat', {data: mat});
                uni.navigateBack({
					
                })
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .code {
        background-color: #d9d9d9;
        z-index: 99;
        position: sticky;
        top: 0rpx;
        left: 0;
    }
    .code-title {
        display: flex;
    }
    .order__list {
        margin: 20rpx;
        font-size: 14px;
        background-color: #fff;
        border-radius: 20rpx;
        border: 1px solid #eeeeee;
        display: flex;
        position: relative;
        background-color: #3eb689;
        color: #FFF;
    }
    .order__list__left {
        flex: 1;
        padding: 20rpx;
        position: relative;
    }
    .order__list__right {
        width: 70rpx;
        border-left: 1px solid #eeeeee;
        display: flex;
        align-items: center;
        justify-content: center;
    }
</style>

 static/css/wms.css/wms.css

@@ -35,7 +35,7 @@
    min-height: 40rpx;
    display: flex;
    align-items: center;
    width: 30%;
    width: 70%;
}
.left-item {
    display: flex;