#

zjj

2024-05-30 24db75ff3d25124eb911fbcbbf90b716c1a3c452

#

 pages.json

@@ -223,6 +223,22 @@
                "navigationBarTitleText" : "并板入库",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/order/orderList",
            "style" : 
            {
                "navigationBarTitleText" : "平库下架",
                "enablePullDownRefresh" : false
            }
        },
        {
            "path" : "pages/order/orderDetlList",
            "style" : 
            {
                "navigationBarTitleText" : "平库下架",
                "enablePullDownRefresh" : false
            }
        }
    ],
    "globalStyle": {

 pages/home/home.vue

@@ -50,7 +50,7 @@
                        name: 'orderPutOn',
                        color: 'yellow',
                        cuIcon: 'pullup',
                        url: '/order/orderPutOn'
                        url: '/order/orderList'
                    },
                    {
                        title: '订单组托',

 pages/order/orderComb.vue

@@ -72,7 +72,7 @@
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <button size="mini" @click="reset('warn')">重置</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">上架</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">组托</button>
        </view>
        <!-- 弹窗 -->
        <!-- 修改数量 -->

 pages/order/orderDetlList.vue

New file
@@ -0,0 +1,95 @@
<template>
    <view>
        <view class="card" v-for="item in menuList" @click="chose(item)">			
            <view class="item">订单编号：{{item.orderNo}}</view>
            <view class="item">物料编码：{{item.matnr}}</view>
            <view class="item">批&#12288;&#12288;次：{{item.batch}}</view>
            <view class="item">剩余数量：{{item.enableQty}}</view>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                menuList: [],
                orderNo: ''
            }
        },
        onLoad() {
            let that = this
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
            eventChannel.on('order', function(data) {
                // console.log(data.item);
                that.orderNo = data.orderNo
				
            })
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getOrderNoList(this.orderNo)
        },
        methods: {
            getOrderNoList(orderNo) {
                let that = this
                uni.request({
                    url: this.baseUrl + '/orderDetl/forOrderNo/auth',
                    data: {
                        orderNo: that.orderNo
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },					
                    success(res) {
                        res = res.data
                        that.menuList = res.data
                    }
                })
            },
            chose(item) {
                let that = this
                uni.navigateTo({
                    url: "../pakin/WarehouseOut",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('item', {
                            item: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            // that.matnr = data.data
                            that.input(that.matnr)
                        },
                    },
				
				
                });
            }
        }
    }
</script>

<style>
    .card {
        margin: 20rpx;
        padding: 30rpx;
        background-color: #157ec1;
        border-radius: 20rpx;
        color: #FFF;
    }
    .item {
        width: 100%;
        min-height: 60rpx;
        line-height: 2;
        padding-left: 30rpx;
        color: #FFF;
        font-size: 14px;
    }
</style>

 pages/order/orderList.vue

New file
@@ -0,0 +1,71 @@
<template>
    <view>
        <view class="card" v-for="item in menuList" @click="chose(item)">
            {{item}}
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                menuList: []
            }
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getOrderNoList()
        },
        methods: {
            getOrderNoList() {
                let that = this
                uni.request({
                    url: this.baseUrl + '/outOrder/list/all',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        that.menuList = res.data
                    }
                })
            },
            chose(item) {
                let that = this
                uni.navigateTo({
                    url: "./orderDetlList",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('order', {
                            orderNo: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            // that.matnr = data.data
                            that.input(that.matnr)
                        },
                    },
				
				
                });
            }
        }
    }
</script>

<style>
    .card {
        margin: 20rpx;
        padding: 30rpx;
        background-color: #157ec1;
        border-radius: 20rpx;
        color: #FFF;
    }
</style>

 pages/pakin/WarehouseOut.vue

@@ -2,32 +2,50 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">托盘码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus" @input="barcodeInput()">				
                <view class="item" style="width: 50%;">
                    <view class="code-decs" style="width: 100%;">订单号:{{item.orderNo}}</view>					
                </view>
                <view class="item" style="width: 50%;">
                    <view class="code-decs" style="width: 100%;">物料:{{item.matnr}}</view>					
                </view>
				
				
            </view>
            <view class="item">
                <view class="code-decs">库位码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="locNo" :focus="locNoFocus" @input="locNoInput()">
                <view class="code-decs">库位号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="locNo" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>            
        </view>
        <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>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
                <view class="list-left">
            <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="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="desc">名称：</view>
                        <view class="left-item">{{item.maktx}}</view>
                    </view>
                    <view class="list-left-item">
@@ -47,19 +65,19 @@
                        </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量：</view>
                        <view class="desc">剩余数量：</view>
                        <view class="left-item">{{item.anfme}}</view>
                    </view>
                </view>
                <!-- <view class="list-right">
                <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> -->
            </view>
            </checkbox-group>
        </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>
        <!-- 弹窗 -->
@@ -70,24 +88,25 @@
                    <!-- 标题 -->
                    <view class="title">修改</view>
                    <view class="popup-item">
                        <view class="popup-item-left">编码:</view>
                        <view class="popup-item-left">料号:</view>
                        <view class="popup-item-right">
                            <input type="text" v-model="matnr" disabled="true"
                            <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">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view>
                    <!-- <view class="popup-item">
                    </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>
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">
@@ -102,7 +121,7 @@
            <!-- 提示窗示例 -->
            <uni-popup ref="alertDialog" type="dialog">
                <uni-popup-dialog :type="msgType" confirmText="移除" :title="title" :content="content"
                    @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
                    @confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view>
@@ -125,6 +144,12 @@
                    @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>

@@ -134,11 +159,15 @@
            return {
                baseUrl: '',
                token: '',
                order: '',
                barcode: '',
                barcodeFocus: '',
                dataList: [],
                checkedDataList: [],
                count: 0,
                rowNum: '',
                matnr: '',
                matnr1: '',
                batch: '',
                weight: '',
                msgType1: 'success',
@@ -147,41 +176,96 @@
                title: '',
                content: '',
                barcodeFocus: true,
                locNoFocus: false,
                matFocus: false,
                matData: '',
                removeNum: 0,
                orderNoList: [],
                orderNo: '',
                item:'',
                locNo:''
            }
        },
        onLoad() {
            let that = this
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
            eventChannel.on('item', function(data) {
                // console.log(data.item);
                that.item = data.item

            })
        },
        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])
                    }
                }
                this.dataList = checkedList
            },
            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() {
                var that = this
                let that = this
                // 不设置定时器 会出现扫入的字符串不全
                setTimeout(() => {
                    var len = this.barcode.length
                    if (len != 8) {
                        uni.showToast({
                            title: '托盘码有误请重试',
                            icon: "none",
                            position: 'top'
                        });
                        if(that.locNo != '' && that.barcode != ''){
                            uni.request({
                                url: that.baseUrl + '/locDetl/forLocNoAndBarcode/auth',
                        url: that.baseUrl + '/locDetl/forlocNo/auth',
                                data: {
                                    barcode: that.barcode,
                            orderNo: that.item.orderNo,
                            matnr: that.item.matnr,
                            batch: that.item.batch,
                                    locNo: that.locNo
                                },                        
                                header: {
@@ -205,44 +289,8 @@
                                    }
                                }
                            });
                        }
                        this.barcodeFocuss()
                        return;
                    }					
                    this.focuss()
                }, 200)
            },
            locNoInput(){
                var that = this
                if(that.locNo != '' && that.barcode != ''){
                    uni.request({
                        url: that.baseUrl + '/locDetl/forLocNoAndBarcode/auth',
                        data: {
                            barcode: that.barcode,
                            locNo: that.locNo
                        },						
                        header: {
                            'token': uni.getStorageSync('token')
                        },
                        success(result) {
                            var res = result.data
                            if (res.code === 200) {
                                that.dataList = res.data;
                            } else if (res.code == 403) {
                                that.messageText = res.msg
                                that.messageToggle('error')
                                setTimeout(() => {
                                    uni.reLaunch({
                                        url: '../login/login'
                                    });
                                }, 1000);
                            } else {
                                that.messageText = res.msg
                                that.messageToggle('error')
                            }
                        }
                    });
                }
            },
            // 托盘码有误重置
            barcodeFocuss() {
@@ -255,15 +303,17 @@
            },
            // 商品光标清空重置
            focuss() {
                this.focus = false;
                setTimeout(() => {
                    this.locNo = '';
                    this.locNoFocus = true;
                    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: {
@@ -278,6 +328,7 @@
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            result.data.batch = matnr[2]
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
@@ -317,32 +368,16 @@
                });

            },
            selectMat() {
                let that = this
                uni.navigateTo({
                    url: "../mat/matQuery",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('commonUrl', {
                            commonUrl: ''
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.matnr = data.data
                            that.findMat(that.matnr)
                        },
                    },


                });
                that.matnr = ''
            },
            checkMat(mat) {
                mat['orderNo'] = this.order
                var len = this.dataList.length
                var add = true ,sameItem = false
                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) {
@@ -366,81 +401,46 @@
                        }
                    }
                }

                }
                if (add) {
                    this.dataList.unshift(mat)
                }
            },
            // 修改批号
            revise(item, i) {
                this.matnr = 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() {
                this.messageText = "移除成功"
                this.messageToggle('success')
                this.dataList.splice(this.removeNum, 1)
            },
            // 取消移除
            removeClose() {
                this.$refs.alertDialog.close()
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.matnr = ''
                this.messageText = "修改成功"
                this.messageToggle('success')
                this.$refs.revise.close()
            },
            reviseClose() {
                this.$refs.revise.close()
            },
            changeValue(value) {
                this.count = value
            },
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否下架!'
                this.content = '是否现在下架!'
                this.$refs.combConfirm.open()
            },
            combClose() {
                this.$refs.combConfirm.close()
            },
            comb() {
                uni.vibrateShort();
                let that = this;
				
                if (that.dataList.length === 0) {
                    this.messageText = "托盘码组托数据有误"
                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/WarehouseOut',
                    data:JSON.stringify({
                        barcode: that.barcode,
                        locNo:that.locNo,
                        orderNo: that.item.orderNo,
                        locno: that.locNo,
                        combMats: that.dataList
                    }),                
                    method: 'POST',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
@@ -474,6 +474,7 @@
            // 确认重置
            resetConfirm() {
                this.dataList = []
                this.locNo = ''				
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
@@ -481,12 +482,60 @@
            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.barcode = ''
                this.locNo=''
                this.barcodeFocuss()
            },
            combClose() {
                this.$refs.combConfirm.close()
            },
            // 取消移除
            removeClose() {
                this.$refs.alertDialog.close()
            },
        }
    }
@@ -495,8 +544,29 @@
<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: 300rpx;
        margin-top: 360rpx;
    }

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

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

    .code {
@@ -537,8 +607,9 @@
    }

    .mat-list-title {
        display: flex;
        align-items: center;
        height: 80rpx;
        line-height: 80rpx;
        width: 100%;
        background-color: white;
        position: fixed;
@@ -546,6 +617,8 @@
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
        box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
		

    }
</style>