This commit is contained in:
2024-08-09 13:53:23 +08:00
parent 03e0d44dd6
commit 615af3a957
8 changed files with 502 additions and 107 deletions

168
pages/check/check-task.vue Normal file
View File

@@ -0,0 +1,168 @@
<template>
<view class="zd_container">
<!-- 盘点作业 -->
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">托盘码</span>
</view>
<view class="zd-col-24">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">盘点单</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">盘点仓库</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.form_data.stor_code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">创建时间</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.create_time">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">作业数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.dtl">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">已盘作业数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.finish_dtl">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">物料名称</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.material_name">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">物料编码</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.material_code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">物料批次</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.material_spec">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">盘点货位</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.children_form_Data.end_struct_code">
</view>
</view>
<view class="zd-row">
<view class="zd-col-10">
<span class="filter_label">盘点数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.check_qty">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(data) === JSON.stringify({form_data: {}, children_form_Data: {}})}" :disabled="disabled" @tap="_checkSaveCheckTask">盘点确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {checkByVehicle, checkSaveCheckTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
val1: '',
data: {form_data: {}, children_form_Data: {}},
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
console.log(JSON.stringify(this.data))
},
methods: {
handleChange (e) {
this._checkByVehicle(e)
},
async _checkByVehicle (e) {
let res = await checkByVehicle(e)
this.data = res.data
},
clearUp () {
this.val1 = ''
this.data = {form_data: {}, children_form_Data: {}}
},
async _checkSaveCheckTask () {
this.disabled = true
if (JSON.stringify(this.data) === JSON.stringify({form_data: {}, children_form_Data: {}})) {
this.disabled = false
return
}
try {
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,
icon: 'none'
})
this.clearUp()
} else {
this.disabled = false
}
} catch (e) {
this.disabled = false
}
}
}
}
</script>
<style lang="stylus">
</style>

View File

@@ -46,7 +46,7 @@
{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', path: '/pages/in/store-info'}]},
{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
{title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]},
{title: '任务管理', path: 'RF06', sonTree: [{title: '设备作业管理', path: '/pages/task/equip-task-manage'}]}
{title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]}
],
show: false,
secM: [],

View File

@@ -58,7 +58,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {FormTypes, pmFormData} from '@/utils/mork2.js'
import {pmFormData2} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -67,8 +67,6 @@
data() {
return {
title: '',
options: [],
index: '',
val1: '',
dataList: [],
pkId: '',
@@ -87,26 +85,15 @@
},
onLoad (options) {
this.title = options.title
this._FormTypes()
},
methods: {
async _FormTypes () {
let res = await FormTypes()
this.options = [...res]
this.options.map(el => {
this.$set(el, 'text', el.lable)
})
},
selectChange (e) {
this.index = e
},
searchList () {
this.dataList = []
this.pageNum = 1
this._pmFormData()
},
async _pmFormData () {
let res = await pmFormData(this.pageNum + '', this.pageSize + '', this.val1, this.index)
let res = await pmFormData2(this.pageNum + '', this.pageSize + '', 'Picking', '10', this.val1)
if (res.code === '200') {
this.totalCount = res.totalElements
if (res.totalElements > 0) {
@@ -134,7 +121,6 @@
}
},
toEmpty () {
this.index = ''
this.val1 = ''
this.dataList = []
this.pageNum = 1
@@ -147,7 +133,7 @@
},
toSure () {
if (this.pkId) {
this.$store.dispatch('setPublicArr', [this.pkObj])
this.$store.dispatch('setPublicObj', this.pkObj)
uni.navigateBack()
}
}

View File

@@ -9,80 +9,110 @@
<span class="filter_label">拣选单据</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" @click="toJump">
<input type="text" class="filter_input" @click="toJump" v-model="data.code">
</view>
</view>
<view class="zd-row">
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">返回时间</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">料箱编码</span>
</view>
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">拣选仓库</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.vehicle_code">
</view>
</view>
<view class="zd-row">
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">拣选载具</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">车间</span>
</view>
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">车间</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.product_area">
</view>
</view>
<view class="zd-row">
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">拣选站台</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">拣选仓库</span>
</view>
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">创建时间</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.stor_code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">拣选站台</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.point_code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料名称</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.material_name">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.qty">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">拣选数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.assign_qty">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移出料箱</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.out_pick_vehicle">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移出数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.out_qty">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">是否人工搬运</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.is_move">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移入料箱</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.in_pick_vehicle">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移入数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.in_qty">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">扫码出库确认</button>
<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(data) === '{}'}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
</view>
</view>
</template>
@@ -90,7 +120,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {ioStorageOut} from '@/utils/getData2.js'
import {savePickTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -98,14 +128,17 @@
},
data() {
return {
code: '',
data: {},
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
onShow() {
if (this.$store.getters.publicObj !== '') {
this.data = this.$store.getters.publicObj
}
},
methods: {
toJump () {
@@ -114,17 +147,17 @@
})
},
clearUp () {
this.code = ''
this.data = {}
this.disabled = false
},
async _ioStorageOut () {
async _savePickTask () {
this.disabled = true
if (!this.code) {
if (JSON.stringify(this.data) === '{}') {
this.disabled = false
return
}
try {
let res = await ioStorageOut(this.code)
let res = await savePickTask(this.data)
if (res.code === '200') {
uni.showToast({
title: res.msg,

View File

@@ -1,19 +0,0 @@
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="stylus">
</style>

183
pages/task/task-manage.vue Normal file
View File

@@ -0,0 +1,183 @@
<template>
<view class="zd_container">
<!-- 任务管理 -->
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">任务类型</span>
</view>
<view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">载具编码</span>
</view>
<view class="zd-col-24 filter_select">
<search-box
v-model="val1"
/>
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th>任务类型</th>
<th>任务编码</th>
<th>载具编码</th>
<th>状态</th>
<th>起点</th>
<th>终点</th>
<th>创建时间</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
<td>{{e.task_type}}</td>
<td>{{e.task_code}}</td>
<td>{{e.vehicle_code}}</td>
<td>{{e.status}}</td>
<td>{{e.point_code1}}</td>
<td>{{e.point_code2}}</td>
<td>{{e.create_time}}</td>
</tr>
</tbody>
</table>
</view>
</view>
<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {getStatusEnum, schBaseTask, saveCheckTask} from '@/utils/mork2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
title: '',
options: [],
index: '',
val1: '',
dataList: [],
pkId: '',
reload: false,
status: 'more',
contentText: {
contentdown: '查看更多',
contentrefresh: '加载中',
contentnomore: '没有更多'
},
totalCount: 0,
pageNum: 1,
pageSize: 10,
disabled: false
};
},
onLoad (options) {
this.title = options.title
this._getStatusEnum()
},
methods: {
async _getStatusEnum () {
let res = await getStatusEnum()
this.options = [...res]
this.options.map(el => {
this.$set(el, 'text', el.label)
})
},
selectChange (e) {
this.index = e
},
searchList () {
this.dataList = []
this.pageNum = 1
this._schBaseTask()
},
async _schBaseTask () {
let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.index, this.val1)
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'
}
}
},
onReachBottom () {
if (this.totalCount > this.dataList.length) {
this.status = 'loading'
setTimeout(() => {
this.pageNum++
this._schBaseTask()
}, 1000)
} else { //停止加载
this.status = 'noMore'
}
},
toCheck (e) {
this.pkId = e.e.task_code === this.pkId ? '' : e.task_code
},
async toSure (status) {
this.disabled = true
if (!this.pkId) {
this.disabled = false
return
}
try {
let res = await saveCheckTask(this.pkId, status)
if (res.code === '200') {
this.index = ''
this.val1 = ''
this.dataList = []
this.pkId = ''
uni.showToast({
title: res.desc,
icon: 'none'
})
} else {
uni.showToast({
title: res.desc,
icon: 'none'
})
}
this.disabled = false
} catch (e) {
this.disabled = false
}
}
}
}
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
.msg_wrapper
height auto
min-height 30%
</style>