#

whycq

2025-01-13 9b37d74d9e60a9117ff1611679682ecf2a3233ad

#

 manifest.json

@@ -2,12 +2,8 @@
    "name" : "中扬WMS",
    "appid" : "__UNI__DA5854D",
    "description" : "",
<<<<<<< HEAD
    "versionName" : "20250108A",
=======
    "versionName" : "20241128A",
>>>>>>> 248ef3ba3de9994dc83d2b36690542893f9fb6e6
    "versionCode" : 136,
    "versionCode" : 137,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/phyz/checkLocDetl/locDetl.vue

@@ -11,7 +11,7 @@
                <view>货架码：{{containerDetl.barcode}}</view>
                <view>库存品类：{{containerDetl.count}}</view>
            </view>
            <view class="list-right" @click="goToLocDetl(containerDetl)">
            <view class="list-right" @click="goToLocDetl(containerDetl,'con')">
                <uni-icons type="right" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
@@ -23,7 +23,7 @@
                <view>货架码：{{locDetl.barcode}}</view>
                <view>库存品类：{{locDetl.count}}</view>
            </view>
            <view class="list-right" @click="goToLocDetl(locDetl)">
            <view class="list-right" @click="goToLocDetl(locDetl,'loc')">
                <uni-icons type="right" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
@@ -122,7 +122,6 @@
                    method: 'POST',
                    success(res) {
                        res = res.data
                        console.log(res);
                        if (res.code === 200) {
                            if (res.data.containerCode.length > 0) {
                                _this.dataList = res.data.containerCode
@@ -152,7 +151,7 @@
                    }
                })
            },
            goToLocDetl(item) {
            goToLocDetl(item,type) {
                let _this = this
                if (item.data.length <= 0) {
                    uni.showToast({ title: '没有库存', icon: "error", position: 'top' })
@@ -162,8 +161,11 @@
                    url: "./locDetlList",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('item', {
                            item: item
                        // res.eventChannel.emit('item', {
                        //     item: item
                        // })
                        res.eventChannel.emit('baseInfo', {
                            info: {locNo:_this.locNo,barcode:_this.barcode,type: type}
                        })
                    },
                    events: {

 pages/phyz/checkLocDetl/locDetl2.vue

@@ -11,7 +11,7 @@
                <view>货架码：{{containerDetl.barcode}}</view>
                <view>库存品类：{{containerDetl.count}}</view>
            </view>
            <view class="list-right" @click="goToLocDetl(containerDetl)">
            <view class="list-right" @click="goToLocDetl(containerDetl,'con')">
                <uni-icons type="right" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
@@ -23,7 +23,7 @@
                <view>货架码：{{locDetl.barcode}}</view>
                <view>库存品类：{{locDetl.count}}</view>
            </view>
            <view class="list-right" @click="goToLocDetl(locDetl)">
            <view class="list-right" @click="goToLocDetl(locDetl,'loc')">
                <uni-icons type="right" size="25"  color="#fff"></uni-icons>
            </view>
        </view>
@@ -162,8 +162,11 @@
                    url: "./locDetlList2",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('item', {
                            item: item
                        // res.eventChannel.emit('item', {
                        //     item: item
                        // })
                        res.eventChannel.emit('baseInfo', {
                            info: {locNo:_this.locNo,barcode:_this.barcode,type: type}
                        })
                    },
                    events: {

 pages/phyz/checkLocDetl/locDetlList.vue

@@ -71,6 +71,7 @@
                orderNo: '',
                threeCode: '',
                processSts$: '',
                type: '',
                processSts$List: ['待加工','已加工','无需加工']
            }
        },
@@ -81,17 +82,51 @@
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('item', function(data) {
            // eventChannel.on('item', function(data) {
            //     console.log(data);
            //     _this.locNo = data.item.locNo
            //     _this.barcode = data.item.barcode
            //     for (let k of data.item.data) {
            //         k['count'] = k.anfme
            //     }
            //     _this.dataList = data.item.data
            // })
            eventChannel.on('baseInfo', function(data) {
                console.log(data);
                _this.locNo = data.item.locNo
                _this.barcode = data.item.barcode
                for (let k of data.item.data) {
                    k['count'] = k.anfme
                }
                _this.dataList = data.item.data
                _this.getLocDetl(data.info.locNo,data.info.barcode)
                _this.locNo = data.info.locNo
                _this.barcode = data.info.barcode
                _this.type = data.info.type
            })
        },
        methods: {
            getLocDetl(locNo,barcode) {
                let _this = this 
                let param = {locNo:locNo,containerCode: barcode}
                uni.request({
                    url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
                    header: {'token': uni.getStorageSync('token')},
                    data: param,
                    method: 'POST',
                    success(res) {
                        res = res.data
                        console.log(res);
                        if (res.code === 200) {
                            if (_this.type == 'con') {
                                _this.dataList = res.data.containerCode
                            } else {
                                _this.dataList = res.data.locNo
                            }
							
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                })
            },
            add() {
                let _this = this
                uni.navigateTo({

 pages/phyz/checkLocDetl/locDetlList2.vue

@@ -81,17 +81,51 @@
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('item', function(data) {
            // eventChannel.on('item', function(data) {
            //     console.log(data);
            //     _this.locNo = data.item.locNo
            //     _this.barcode = data.item.barcode
            //     for (let k of data.item.data) {
            //         k['count'] = k.anfme
            //     }
            //     _this.dataList = data.item.data
            // })
            eventChannel.on('baseInfo', function(data) {
                console.log(data);
                _this.locNo = data.item.locNo
                _this.barcode = data.item.barcode
                for (let k of data.item.data) {
                    k['count'] = k.anfme
                }
                _this.dataList = data.item.data
                _this.getLocDetl(data.info.locNo,data.info.barcode)
                _this.locNo = data.info.locNo
                _this.barcode = data.info.barcode
                _this.type = data.info.type
            })
        },
        methods: {
            getLocDetl(locNo,barcode) {
                let _this = this 
                let param = {locNo:locNo,containerCode: barcode}
                uni.request({
                    url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
                    header: {'token': uni.getStorageSync('token')},
                    data: param,
                    method: 'POST',
                    success(res) {
                        res = res.data
                        console.log(res);
                        if (res.code === 200) {
                            if (_this.type == 'con') {
                                _this.dataList = res.data.containerCode
                            } else {
                                _this.dataList = res.data.locNo
                            }
							
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                })
            },
            add() {
                let _this = this
                uni.navigateTo({

 pages/phyz/stationManage/confirmProcessed.vue

@@ -120,13 +120,43 @@
            const eventChannel = this.getOpenerEventChannel();
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('item', function(data) {
                console.log(data);
                for (let k of data.item) {
                    k['maxCount'] = k.anfme
                    _this.getWrkDetl(k.wrkNo)
                }
                _this.dataList = require('lodash').cloneDeep(data.item)
                // _this.dataList = require('lodash').cloneDeep(data.item)
            })
        },
        methods: {
            // 获取工作明细
            getWrkDetl(wrkNo) {
                let _this = this
                uni.request({
                    url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
                    header: {'token': uni.getStorageSync('token')},
                    data: {
                        curr: 1,
                        limit: 1000,
                        wrk_no: wrkNo
                    },
                    method: 'GET',
                    success(res) {
                        res = res.data
                        if (res.code === 200) {
                            for (let k of res.data.records) {
                                k['maxCount'] = k.anfme
                            }
                            _this.dataList = res.data.records
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                })
            },
            processed() {
                this.$refs.process.open()
            },

 pages/phyz/stationManage/pickAgain.vue

@@ -69,7 +69,7 @@
                _this.pickList = data.wrkDetls
                _this.wrkNo = data.wrkDetls[0].wrkNo
                _this.locNo = data.item.sourceLocNo
                _this.getLocDetl(data.item.sourceLocNo)
                _this.getWrkDetl(data.wrkDetls[0].wrkNo)
            })
        },
        methods: {
@@ -124,6 +124,32 @@
                    },
                })
            },
            // 获取工作明细
            getWrkDetl(wrkNo) {
                let _this = this
                uni.request({
                    url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
                    header: {'token': uni.getStorageSync('token')},
                    data: {
                        curr: 1,
                        limit: 1000,
                        wrk_no: wrkNo
                    },
                    method: 'GET',
                    success(res) {
                        res = res.data
                        if (res.code === 200) {
                            _this.pickList = res.data.records
                            _this.getLocDetl(_this.locNo)
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                })
            },
            // 已选拣料列表
            chosed(wrkDetls,locDetls) {
                console.log(wrkDetls,locDetls);