diff --git a/pages.json b/pages.json index 32be0a3..54578d8 100644 --- a/pages.json +++ b/pages.json @@ -305,6 +305,14 @@ "navigationStyle": "custom" } + } + ,{ + "path" : "pages/outbound/line-callmater", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/outbound/shelf-bind", diff --git a/pages/carry/call-carry.vue b/pages/carry/call-carry.vue index bbbbcf6..34ac321 100644 --- a/pages/carry/call-carry.vue +++ b/pages/carry/call-carry.vue @@ -84,7 +84,7 @@ let res = await transfConfirm(this.val1, this.index, this.val2) this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/check/check-task.vue b/pages/check/check-task.vue index b8721a4..558d9b1 100644 --- a/pages/check/check-task.vue +++ b/pages/check/check-task.vue @@ -148,13 +148,13 @@ let res = await checkSaveCheckTask(this.data.children_id, this.data.children_vehicle_code, this.data.check_qty, this.data.children_qty) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index e402078..1cede0d 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -95,18 +95,19 @@ async _getMaterialList () { let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '') if (res.code === '200') { - this.totalCount = res.totalElements - if (res.totalElements > 0) { - const dataMap = res.content - this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap) - this.reload = false - } else { - this.dataList = [] - } - if (this.totalCount == this.dataList.length) { - this.reload = false - this.status = 'noMore' - } + this.dataList = res.data + // this.totalCount = res.totalElements + // if (res.totalElements > 0) { + // const dataMap = res.content + // this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap) + // this.reload = false + // } else { + // this.dataList = [] + // } + // if (this.totalCount == this.dataList.length) { + // this.reload = false + // this.status = 'noMore' + // } } }, onReachBottom () { diff --git a/pages/entry/bill-to-store.vue b/pages/entry/bill-to-store.vue index 2a75801..7396a23 100644 --- a/pages/entry/bill-to-store.vue +++ b/pages/entry/bill-to-store.vue @@ -326,7 +326,7 @@ } this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/entry/check-to-store.vue b/pages/entry/check-to-store.vue index 4fc47bf..a1e79fb 100644 --- a/pages/entry/check-to-store.vue +++ b/pages/entry/check-to-store.vue @@ -228,7 +228,7 @@ let obj = Object.assign(this.currentData, {single_weight: this.sWeight, pcsn: this.pcsn, qty: this.qty}) let res = await checkMaterConfirm(obj) uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue index 3250200..d09060d 100644 --- a/pages/entry/empty-tray-to-store.vue +++ b/pages/entry/empty-tray-to-store.vue @@ -116,13 +116,13 @@ let res = await pdaPalletIostorinvIn(this.val1, this.index) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/empty-vehicle-instore.vue b/pages/entry/empty-vehicle-instore.vue index acecd6c..f8e534c 100644 --- a/pages/entry/empty-vehicle-instore.vue +++ b/pages/entry/empty-vehicle-instore.vue @@ -120,13 +120,13 @@ let res = await emptyconfirmIn(this.val1, this.val2, this.index2, '1', this.index) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue index 85b133b..592bec6 100644 --- a/pages/entry/group-to-store.vue +++ b/pages/entry/group-to-store.vue @@ -143,7 +143,7 @@ } this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/entry/groupplate-instore.vue b/pages/entry/groupplate-instore.vue index fed5fad..2fd738e 100644 --- a/pages/entry/groupplate-instore.vue +++ b/pages/entry/groupplate-instore.vue @@ -160,13 +160,13 @@ let res = await confirmIn(this.val1, this.val2, this.index) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue index 9d33921..b3baa93 100644 --- a/pages/entry/mater-group-to-store.vue +++ b/pages/entry/mater-group-to-store.vue @@ -217,7 +217,7 @@ this.currentData.stor_code = this.index let res = await groupMaterIn(this.index, this.currentData) uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue index 93f3379..4c653f3 100644 --- a/pages/entry/mater-group.vue +++ b/pages/entry/mater-group.vue @@ -9,7 +9,7 @@ 源单编码 - + @@ -17,7 +17,7 @@ 载具编码 - + @@ -49,7 +49,7 @@ 物料编码 - + @@ -81,7 +81,6 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import NumberInput from '@/components/NumberInput.vue' - import {storList, getStructCount} from '@/utils/getData2.js' import {groupPlate} from '@/utils/getData3.js' export default { components: { @@ -97,85 +96,27 @@ currentData: {}, options: [], index: '', - disabled: false, - kwData: {} + disabled: false }; }, onLoad (options) { this.title = options.title }, - onShow () { + onShow() { if (this.$store.getters.publicObj !== '') { this.currentData = this.$store.getters.publicObj - if(this.currentData.stor_code !== '' && this.currentData.stor_code !== null && this.currentData.stor_code !== undefined) { - this.options.map(el => { - if (el.value === this.currentData.stor_code) { - this.index = el.value - } - }) - } else { - if (this.currentData.vehicle_code && this.currentData.vehicle_code.charAt(0).toUpperCase() === 'T') { - this.index ='FStockPallet' - } else { - this.index ='FStockId' - } - } - if (this.currentData.vehicle_code) { - this._getStructCount(this.currentData.vehicle_code) - } else { - this.kwData = {} - } - this.$store.dispatch('setPublicObj', '') } }, methods: { - selectChange (e) { - this.index = e - }, - async _storList () { - let res = await storList() - if (res.code === '200') { - this.options = [...res.content] - this.options.map(el => { - this.$set(el, 'text', el.label) - }) - } - }, toJump () { uni.navigateTo({ url: '/pages/common/mater-list?title=查询物料' }) }, - handleChange (e) { - if (e) { - if (e.charAt(0).toUpperCase() === 'T') { - this.index ='FStockPallet' - } else { - this.index ='FStockId' - } - this._getStructCount(e) - } - }, - async _getStructCount (e) { - try { - let res = await getStructCount(e) - if (res) { - this.kwData = res - } else { - this.kwData = {} - } - } catch (e) { - this.kwData = {} - } - }, - handleDel () { - this.index = '' - }, toEmpty () { this.currentData = {} this.index = '' this.disabled = false - this.kwData = {} }, async _groupPlate () { this.disabled = true @@ -187,7 +128,7 @@ this.currentData.stor_code = this.index let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1) uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/pick-yl-return-store.vue b/pages/entry/pick-yl-return-store.vue index 08caa0e..eaee367 100644 --- a/pages/entry/pick-yl-return-store.vue +++ b/pages/entry/pick-yl-return-store.vue @@ -104,9 +104,9 @@ this._getReturnMaterial(e) } }, - async _getVehicleMaterial (e) { + async _getReturnMaterial (e) { try { - let res = await getVehicleMaterial(this.val1, this.index) + let res = await getReturnMaterial(this.val1) if (res) { this.currentData = res } else { @@ -146,13 +146,13 @@ let res = await confirmReturnMaterial(this.currentData) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue index b359c49..8246b0b 100644 --- a/pages/entry/qualified-to-store.vue +++ b/pages/entry/qualified-to-store.vue @@ -203,7 +203,7 @@ } this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/home/home.vue b/pages/home/home.vue index f31cf20..c00738f 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -42,7 +42,7 @@ userName: '', menuList: [ {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]}, - {title: '出库管理', path: 'RF02', sonTree: [{title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]} + {title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]} // {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]}, // {title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}, {title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]} // {title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]}, diff --git a/pages/login/login.vue b/pages/login/login.vue index 0918463..c38a881 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -103,7 +103,7 @@ }) } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } diff --git a/pages/mode/command.vue b/pages/mode/command.vue index 911033a..1eb0ded 100644 --- a/pages/mode/command.vue +++ b/pages/mode/command.vue @@ -75,7 +75,7 @@ let res = await toCommandTP(this.val1, '1', this.val2, check) this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/mode/pick.vue b/pages/mode/pick.vue index 79875e4..9b09608 100644 --- a/pages/mode/pick.vue +++ b/pages/mode/pick.vue @@ -66,7 +66,7 @@ let res = await pinkStartStop(this.val1, this.index) this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/mode/switch-in-out.vue b/pages/mode/switch-in-out.vue index 18a2165..77a580f 100644 --- a/pages/mode/switch-in-out.vue +++ b/pages/mode/switch-in-out.vue @@ -66,7 +66,7 @@ let res = await switchInOut(this.val1, this.index) this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue index 89741db..f960b20 100644 --- a/pages/outbound/bill-out-store.vue +++ b/pages/outbound/bill-out-store.vue @@ -161,7 +161,7 @@ } } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } @@ -207,14 +207,14 @@ let res = await outStorageConfirm(obj) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.toEmpty() } this.disabled = false uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) } catch (e) { diff --git a/pages/outbound/ctu-vehicle-outstore.vue b/pages/outbound/ctu-vehicle-outstore.vue index 1d6ea96..fa53446 100644 --- a/pages/outbound/ctu-vehicle-outstore.vue +++ b/pages/outbound/ctu-vehicle-outstore.vue @@ -97,13 +97,13 @@ let res = await vehicleOutConfirm(this.index, this.val1, this.val2) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/outbound/empty-vehicle-outstore.vue b/pages/outbound/empty-vehicle-outstore.vue index f66e4a3..dcd5a52 100644 --- a/pages/outbound/empty-vehicle-outstore.vue +++ b/pages/outbound/empty-vehicle-outstore.vue @@ -85,13 +85,13 @@ let res = await vehicleOutConfirm(this.index, this.val1) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/outbound/line-callmater.vue b/pages/outbound/line-callmater.vue new file mode 100644 index 0000000..7854345 --- /dev/null +++ b/pages/outbound/line-callmater.vue @@ -0,0 +1,196 @@ + + + diff --git a/pages/outbound/line-transfer.vue b/pages/outbound/line-transfer.vue index 9a2c4e2..a242251 100644 --- a/pages/outbound/line-transfer.vue +++ b/pages/outbound/line-transfer.vue @@ -112,13 +112,13 @@ let res = await transferConfirm(this.val1, this.val2, this.index2) if (res.code === '200') { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.clearUp() } else { uni.showToast({ - title: res.msg, + title: res.message, icon: 'none' }) this.disabled = false diff --git a/pages/outbound/mater-outstore.vue b/pages/outbound/mater-outstore.vue index 792e737..9a3f6bd 100644 --- a/pages/outbound/mater-outstore.vue +++ b/pages/outbound/mater-outstore.vue @@ -1,6 +1,6 @@