Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

whycq

2024-06-06 c48093016b1511ce8b33ffb49062a3bf7a1aed16

Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "中扬WMS",
    "appid" : "__UNI__DA5854D",
    "description" : "",
    "versionName" : "20240527A",
    "versionCode" : 112,
    "versionName" : "20240603B",
    "versionCode" : 116,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/phyz/bcp/bcpDbList.vue

@@ -61,7 +61,7 @@
                        </view>
                    </view>
                    <view class="btn filter-btn">
                        <view class="btn-right" @click="filterConfirm()">开始调拨</view>
                        <button class="btn-right" @click="filterConfirm()" :disabled="isAutoDis">开始调拨</button>
                    </view>
                </view>
            </uni-popup>
@@ -93,7 +93,8 @@
                allCheckBtnTitle: '全选',
                floorList: ['2楼','3楼'],
                floor: '',
                moveType: ''
                moveType: '',
                isAutoDis: false
            }
        },
        onShow() {
@@ -276,6 +277,7 @@
            },
            filterConfirm() {
                console.log(this.dbList);
                this.isAutoDis = true
                if (this.floor == '') {
                    uni.showToast({ title: '请选择调拨楼层', icon: "error", position: 'top' })
                    return
@@ -288,6 +290,7 @@
                    data: param,
                    method: 'POST',
                    success(res) {
                        _this.isAutoDis = false
                        console.log(res);
                        res = res.data
                        if (res.code === 200) {
@@ -300,6 +303,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        } 
                    },
                    fail(res) {
                        _this.isAutoDis = false
                    }
                })
                this.$refs.filter.close('bottom')

 pages/phyz/checkLocDetl/locDetl.vue

@@ -44,8 +44,8 @@
                        </view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="changeClose()">取消</view>
                        <view class="btn-right" @click="changeCount()">修改</view>
                        <button class="btn-left" @click="changeClose()">取消</button>
                        <button class="btn-right" @click="changeCount()" :disabled="changeDis">修改</button>
                    </view>
                </view>
            </uni-popup>
@@ -54,7 +54,7 @@
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <button size="mini" type="primary" @click="changeSts('warn')">更改库位状态</button>
            <button size="mini" type="primary" @click="changeStart('warn')">纠正库位</button>
            <button size="mini" type="primary" @click="changeStart('warn')" :disabled="changeStartDis">纠正库位</button>
        </view>
    </view>
</template>
@@ -90,7 +90,9 @@
                    {title: 'O.空库位',val: 'O'},
                    {title: 'X.禁用',val: 'X'},
                ],
                sourceLoc: ''
                sourceLoc: '',
                changeDis: false,
                changeStartDis: false
            }
        },
        onShow() {
@@ -206,6 +208,7 @@
                        _this.sourceLoc[key] = ''
                    }
                })
                _this.changeDis = true
                uni.request({
                    url: `${_this.baseUrl}/agv/locMast/update/auth`,
                    header: {
@@ -216,6 +219,7 @@
                    method: 'POST',
                    success(res) {
                        res = res.data
                        _this.changeDis = false
                        if (res.code === 200) {
                            uni.showToast({ title: res.msg, icon: "success", position: 'top' })
                            _this.$refs.chageDetl.close()
@@ -228,11 +232,15 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.changeDis = false
                    }
                })
            },
            changeStart() {
                let _this = this
                _this.changeStartDis = true
                let param = {locNo:_this.locNo,containerCode: _this.barcode}
                uni.request({
                    url: `${_this.baseUrl}/agvMobile/update/detl/v1`,
@@ -241,6 +249,7 @@
                    method: 'POST',
                    success(res) {
                        res = res.data
                        _this.changeStartDis = false
                        if (res.code === 200) {
                            uni.showToast({ title: res.msg, icon: "success", position: 'top' })
                            _this.$refs.chageDetl.close()
@@ -253,6 +262,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.changeStartDis = false
                    }
                })
            }

 pages/phyz/checkLocDetl/locMove.vue

@@ -52,7 +52,7 @@
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="checkClose">取消</view>
                        <view class="btn-right" @click="checkConfirm()">确认</view>
                        <view class="btn-right" @click="checkConfirm()" :disabled="checkDis">确认</view>
                    </view>
                </view>
            </uni-popup>
@@ -77,7 +77,8 @@
                item: '',
                floorList: ['1F','2F','3F'],
                floor: '',
                locMast: null
                locMast: null,
                checkDis: false
            }
        },
        onShow() {
@@ -193,6 +194,7 @@
            },
            checkConfirm() {
                let _this = this
                _this.checkDis = true
                uni.request({
                    url: `${_this.baseUrl}/agvMobile/hand/control/locMove`,
                    header: {'token': uni.getStorageSync('token'),
@@ -203,6 +205,7 @@
                    }),
                    method: 'POST',
                    success(res) {
                        _this.checkDis = false
                        res = res.data
                        if (res.code === 200) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
@@ -214,7 +217,11 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        } 
                    },
                    fail(res) {
                        _this.checkDis = false
                    }
					
                })
            }
            

 pages/phyz/order/orderCar.vue

@@ -50,8 +50,8 @@
                        <view class="popup-item-right"><input type="text" v-model="agvDevp"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="agvStartClose()">取消</view>
                        <view class="btn-right" @click="agvStartConfirm()">入库</view>
                        <button class="btn-left" @click="agvStartClose()">取消</button>
                        <button class="btn-right" @click="agvStartConfirm()" :disabled="agvStartDis">入库</button>
                    </view>
                </view>
            </uni-popup>
@@ -69,6 +69,7 @@
                index: 0,
                barcode: '',
                agvDevp: '',
                agvStartDis: false
            }
        },
        onShow() {
@@ -151,6 +152,7 @@
            },
            comb(combMats) {
                let _this = this;
                this.agvStartDis = true
                uni.request({
                    url: _this.baseUrl + '/agvMobile/start/pakin/auth',
                    data: JSON.stringify({
@@ -165,6 +167,7 @@
                    },
                    success(result) {
                        var res = result.data
                        _this.agvStartDis = false
                        if (res.code === 200) {
                            _this.orderCarList = []
                            _this.$refs.agvStart.close()
@@ -179,6 +182,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.agvStartDis = false
                    }
                });
            },

 pages/phyz/orderOut/orderCheck.vue

@@ -56,7 +56,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')" :disabled="combDis">立即出库</button>
        </view>
    </view>
</template>
@@ -69,7 +69,8 @@
                token: '',
                data: {},
                option: '',
                count: 0
                count: 0,
                combDis: false
            }
        },
        onShow() {
@@ -139,6 +140,7 @@
            },
            combConfirm() {
                let _this = this
                _this.combDis = true
                if (_this.data.anfme == 0) {
                    uni.showToast({ title: '出库数量不能为0！', icon: "error", position: 'top'})
                    return
@@ -152,6 +154,7 @@
                    data: combList,
                    method: 'POST',
                    success(res) {
                        _this.combDis = true
                        res = res.data
                        if (res.code === 200) {
                            uni.hideLoading({})
@@ -167,6 +170,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.combDis = false
                    }
                })
            }

 pages/phyz/stationManage/stationDetl.vue

@@ -72,8 +72,8 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="emptyPakinClose">取消</view>
                        <view class="btn-right" @click="emptyPakinConfirm()">入库</view>
                        <button class="btn-left" @click="emptyPakinClose">取消</button>
                        <button class="btn-right" @click="emptyPakinConfirm()" :disabled="emptyPakinDis">入库</button>
                    </view>
                </view>
            </uni-popup>
@@ -89,7 +89,7 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="doBackClose">取消</view>
                        <button class="btn-left" @click="doBackClose">取消</button>
                        <button class="btn-right" @click="doBackConfirm()" :disabled="doBackDis">退库</button>
                    </view>
                </view>
@@ -107,8 +107,8 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="containerMoveOutClose">取消</view>
                        <view class="btn-right" @click="containerMoveOut()">确认出库</view>
                        <button class="btn-left" @click="containerMoveOutClose">取消</button>
                        <button class="btn-right" @click="containerMoveOut()" :disabled="containerMoveOutDis">确认出库</button>
                    </view>
                </view>
            </uni-popup>
@@ -125,8 +125,8 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="containerMoveOutClose">取消</view>
                        <view class="btn-right" @click="containerMoveOut2()">确认离场</view>
                        <button class="btn-left" @click="containerMoveOutClose">取消</button>
                        <button class="btn-right" @click="containerMoveOut2()" :disabled="containerMoveOut2Dis">确认离场</button>
                    </view>
                </view>
            </uni-popup>
@@ -143,8 +143,8 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="pickInClose">取消</view>
                        <view class="btn-right" @click="pickIn()">确认拣料</view>
                        <button class="btn-left" @click="pickInClose">取消</button>
                        <button class="btn-right" @click="pickIn()" :disabled="pickInDis">确认拣料</button>
                    </view>
                </view>
            </uni-popup>
@@ -166,8 +166,8 @@
                        </view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="emptyOutClose">取消</view>
                        <view class="btn-right" @click="emptyOutConfirm()">出库</view>
                        <button class="btn-left" @click="emptyOutClose">取消</button>
                        <button class="btn-right" @click="emptyOutConfirm()" :disabled="emptyOutDis">出库</button>
                    </view>
                </view>
            </uni-popup>
@@ -184,8 +184,8 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="allocationInClose">取消</view>
                        <view class="btn-right" @click="allocationInConfirm()">确认进场</view>
                        <button class="btn-left" @click="allocationInClose">取消</button>
                        <button class="btn-right" @click="allocationInConfirm()" :disabled="allocationInDis">确认进场</button>
                    </view>
                </view>
            </uni-popup>
@@ -220,8 +220,8 @@
                        <view class="popup-item-right"><input type="text" v-model="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="empInClose">取消</view>
                        <view class="btn-right" @click="empInConfirm()">确认进场</view>
                        <button class="btn-left" @click="empInClose">取消</button>
                        <button class="btn-right" @click="empInConfirm()" :disabled="empInDis">确认进场</button>
                    </view>
                </view>
            </uni-popup>
@@ -271,6 +271,13 @@
                waitPakins: [],
                dis: true,
                sec: '',
                emptyPakinDis: false,
                containerMoveOutDis: false,
                containerMoveOut2Dis: false,
                pickInDis: false,
                emptyOutDis: false,
                allocationInDis: false,
                empInDis: false,
                doBackDis: false
            }
        },
@@ -387,6 +394,7 @@
            },
            emptyPakinConfirm() {
                let _this = this;
                _this.emptyPakinDis = true
                if (this.barcode.length != 6) {
                    uni.showToast({ title: '货架条码异常', icon: "error", position: 'top' })
                    return
@@ -402,6 +410,7 @@
                    header: { 'token': uni.getStorageSync('token') },
                    success(res) {
                        var res = res.data
                        _this.emptyPakinDis = false
                        if (res.code === 200) {
                            setTimeout(()=> {
                                _this.barcode = ''
@@ -414,6 +423,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.emptyPakinDis = false
                    }
                });
            },
@@ -425,6 +437,7 @@
            },
            emptyOutConfirm() {
                this.emptyOutClose()
                this.emptyOutDis = true
                let _this = this;
                let params = []
                let param = { devNo: this.station.devNo, containerType: this.containerType, }
@@ -436,6 +449,7 @@
                    header: { 'token': uni.getStorageSync('token') },
                    success(res) {
                        var res = res.data
                        _this.emptyOutDis = false
                        if (res.code === 200) {
                            setTimeout(()=> {
                                _this.containerType = ''
@@ -448,6 +462,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.emptyOutDis = false
                    }
                });
            },
@@ -606,6 +623,7 @@
                this.$refs.doContainerMoveOut.close()
            },
            containerMoveOut() {
                this.containerMoveOutDis = true
                let _this = this
                let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
                uni.request({
@@ -615,6 +633,7 @@
                    method: 'POST',
                    success(res) {
                        res = res.data
                        _this.containerMoveOutDis = false
                        if (res.code === 200) {
                            _this.$refs.doContainerMoveOut.close()
                            setTimeout(()=> {
@@ -628,6 +647,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.containerMoveOutDis = false
                    }
                })
            },
@@ -640,6 +662,7 @@
                this.$refs.doContainerMoveOut2.close()
            },
            containerMoveOut2() {
                this.containerMoveOut2Dis = true
                let _this = this
                let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
                uni.request({
@@ -649,6 +672,7 @@
                    method: 'POST',
                    success(res) {
                        res = res.data
                        _this.containerMoveOut2Dis = false
                        if (res.code === 200) {
                            _this.$refs.doContainerMoveOut2.close()
                            setTimeout(()=> {
@@ -662,6 +686,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.containerMoveOut2Dis = false
                    }
                })
            },
@@ -692,6 +719,7 @@
                this.$refs.doPickIn.close()
            },
            pickIn() {
                this.pickInDis = true
                let _this = this
                uni.request({
                    url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
@@ -699,6 +727,7 @@
                    data: {devNo: _this.station.devNo,barcode: _this.barcode},
                    method: 'POST',
                    success(res) {
                        _this.pickInDis = false
                        res = res.data 
                        if (res.code === 200) {
                            _this.$refs.doPickIn.close()
@@ -710,6 +739,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        _this.pickInDis = false
                    }
                })
            },
@@ -738,7 +770,8 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                    },
					
                });
            },
            allocationOut() {
@@ -769,7 +802,7 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                    },
                });
            },
            // 空架离场
@@ -807,6 +840,7 @@
                this.$refs.allocationIn.close()
            },
            allocationInConfirm() {
                this.allocationInDis = true
                let that = this
                let params = []
                let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -817,6 +851,7 @@
                    data: {devNo: that.station.devNo, barcode: that.barcode},
                    method: 'POST',
                    success(result) {
                        that.allocationInDis = false
                        var res = result.data
                        if (res.code === 200) {
                            that.$refs.allocationIn.close()
@@ -831,6 +866,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        that.allocationInDis = false
                    }
                });
            },
@@ -841,6 +879,7 @@
                this.$refs.empIn.close()
            },
            empInConfirm() {
                this.empInDis = true
                let that = this
                let params = []
                let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -851,6 +890,7 @@
                    data: {devNo: that.station.devNo, barcode: that.barcode},
                    method: 'POST',
                    success(result) {
                        that.empInDis = false
                        var res = result.data
                        if (res.code === 200) {
                            that.$refs.empIn.close()
@@ -865,6 +905,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        that.empInDis = false
                    }
                });
            },
@@ -886,6 +929,7 @@
                    data: {devNo: that.station.devNo, barcode: that.barcode},
                    method: 'POST',
                    success(result) {
                        that.doBackDis = false
                        var res = result.data
                        if (res.code === 200) {
                            that.$refs.doBack.close()
@@ -901,6 +945,9 @@
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    },
                    fail(res) {
                        that.doBackDis = false
                    }
                });
            },