From e8a2cf10fab374d39165e0b6961d0b0f9d21c3fa Mon Sep 17 00:00:00 2001 From: xiangxy Date: Thu, 13 Nov 2025 09:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E9=87=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.vue | 2 +- pages/zw/jb-lower-mater.vue | 2 +- pages/zw/ltzp.vue | 22 +++++++++++++--- pages/zw/manual-returnmater.vue | 46 +++++++++++++++++++++++++++++++-- pages/zw/wl-groupplate.vue | 20 ++++++++++++-- utils/getData4.js | 6 +++++ 6 files changed, 89 insertions(+), 9 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 63f0d0f..32a5a52 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -42,7 +42,7 @@ userName: '', menuList: [ {title: '原料管理', path: 'RF04', sonTree: [{title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}, {title: '物料组盘', path: '/pages/zw/wl-groupplate'}, {title: '点位更新', path: '/pages/zw/confirm-quhuo'}]}, - {title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]}, + {title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包出桶', path: '/pages/zw/jb-lower-mater'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]}, {title: '缓存管理', path: 'RF06', sonTree: [{title: '料桶盘点', path: '/pages/zw/materbox-instore'}, {title: '物料入库', path: '/pages/zw/ltzp'}]}, {title: '产线管理', path: 'RF02', sonTree: [{title: '手工叫料', path: '/pages/zw/manual-callmater'}, {title: '手工退料', path: '/pages/zw/manual-returnmater'}]}, {title: '作业管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/zw/zygl'}]}, diff --git a/pages/zw/jb-lower-mater.vue b/pages/zw/jb-lower-mater.vue index 7c09e14..d189f51 100644 --- a/pages/zw/jb-lower-mater.vue +++ b/pages/zw/jb-lower-mater.vue @@ -86,7 +86,7 @@ - + diff --git a/pages/zw/ltzp.vue b/pages/zw/ltzp.vue index 39a50a7..bac159d 100644 --- a/pages/zw/ltzp.vue +++ b/pages/zw/ltzp.vue @@ -33,7 +33,7 @@ 物料单重(kg) - + @@ -52,13 +52,21 @@ - + + + + 料桶编码 + + + + @@ -73,7 +81,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import NumberInput from '@/components/NumberInput.vue' - import {suppList, combination} from '@/utils/getData4.js' + import {vehiclelist, suppList, combination} from '@/utils/getData4.js' export default { components: { @@ -87,12 +95,15 @@ currentData: {}, options: [], index: '', + options1: [], + index1: '', disabled: false }; }, onLoad (options) { this.title = options.title this._suppList() + this._vehiclelist() }, onShow () { if (this.$store.getters.publicObj !== '') { @@ -116,6 +127,11 @@ this.options = [] } }, + /** 料桶编码下拉框*/ + async _vehiclelist () { + let res = await vehiclelist() + this.options1 = [...res] + }, toJump () { uni.navigateTo({ url: '/pages/common/mater-list?title=查询物料' diff --git a/pages/zw/manual-returnmater.vue b/pages/zw/manual-returnmater.vue index ae28619..a35fe10 100644 --- a/pages/zw/manual-returnmater.vue +++ b/pages/zw/manual-returnmater.vue @@ -32,7 +32,7 @@ - + @@ -104,12 +104,54 @@ } catch (e) { } }, - async _checkoutbillBackMaterial () { + // async _checkoutbillBackMaterial () { + // this.disabled = true + // if (!this.index2 || (!this.qty && this.index4 === '1') || !this.index4) { + // this.disabled = false + // return + // } + // try { + // const qty = this.index4 !== '2' ? this.qty : null + // let res = await checkoutbillBackMaterial(this.index2, this.index4, qty) + // if (res.code === '200') { + // uni.showToast({ + // title: res.message, + // icon: 'none' + // }) + // this.clearUp() + // } else { + // uni.showToast({ + // title: res.message, + // icon: 'none' + // }) + // this.disabled = false + // } + // } catch (e) { + // this.disabled = false + // } + // } + toSure () { this.disabled = true if (!this.index2 || (!this.qty && this.index4 === '1') || !this.index4) { this.disabled = false return } + if (Number(this.qty) > 2000) { + uni.showModal({ + title: '提示', + content: '输入的重量'+ Number(this.qty) +'过大，是否继续？', + confirmColor: '#ff6a00', + success: (res) => { + if (res.confirm) { + this._checkoutbillBackMaterial() + } else if (res.cancel) { + this.disabled = false + } + } + }) + } + }, + async _checkoutbillBackMaterial () { try { const qty = this.index4 !== '2' ? this.qty : null let res = await checkoutbillBackMaterial(this.index2, this.index4, qty) diff --git a/pages/zw/wl-groupplate.vue b/pages/zw/wl-groupplate.vue index 9c6de3d..0a96f89 100644 --- a/pages/zw/wl-groupplate.vue +++ b/pages/zw/wl-groupplate.vue @@ -86,7 +86,7 @@ - + @@ -192,12 +192,28 @@ this.currentData = {} this.disabled = false }, - async _zwgroupPlate () { + toSure () { this.disabled = true if (JSON.stringify(this.currentData) === '{}' || !this.val1 || !this.index) { this.disabled = false return } + if (Number(this.currentData.qty) > 2000) { + uni.showModal({ + title: '提示', + content: '输入的重量'+ Number(this.currentData.qty) +'过大，是否继续？', + confirmColor: '#ff6a00', + success: (res) => { + if (res.confirm) { + this._zwgroupPlate() + } else if (res.cancel) { + this.disabled = false + } + } + }) + } + }, + async _zwgroupPlate () { try { this.currentData.stor_code = this.index let selobj = this.options2.find(item => item.value === this.currentData.supp_code) diff --git a/utils/getData4.js b/utils/getData4.js index 6e4bc9d..1d95eee 100644 --- a/utils/getData4.js +++ b/utils/getData4.js @@ -344,6 +344,12 @@ export const combination = (vcode, pcsn, mid, spcode, spname, sweight) => reques data: {vehicle_code: vcode, pcsn: pcsn, material_id: mid, supp_code: spcode, supp_name: spname, single_weight: sweight} }) +// 料桶组盘-可用载具数组 +export const vehiclelist = () => request({ + url:'api/pda/jb/vehiclelist', + data: {} +}) + // 确认取货 export const pickUp = (pcode, pstatus, vcode) => request({ url:'api/pda/iosOut/pickUp',