This commit is contained in:
2025-05-13 18:09:14 +08:00
parent 6b39159b16
commit 5c10c86068
11 changed files with 155 additions and 854 deletions

View File

@@ -25,7 +25,7 @@
} }
} }
,{ ,{
"path" : "pages/manage/cbj-carry", "path" : "pages/manage/smck",
"style" : "style" :
{ {
"navigationStyle": "custom" "navigationStyle": "custom"
@@ -33,23 +33,7 @@
} }
,{ ,{
"path" : "pages/manage/press-carry", "path" : "pages/manage/hnby",
"style" :
{
"navigationStyle": "custom"
}
}
,{
"path" : "pages/manage/mater-scrap",
"style" :
{
"navigationStyle": "custom"
}
}
,{
"path" : "pages/manage/man-sort",
"style" : "style" :
{ {
"navigationStyle": "custom" "navigationStyle": "custom"
@@ -73,7 +57,7 @@
} }
,{ ,{
"path" : "pages/manage/yzhnml-carry", "path" : "pages/manage/yzmlby",
"style" : "style" :
{ {
"navigationStyle": "custom" "navigationStyle": "custom"
@@ -81,15 +65,7 @@
} }
,{ ,{
"path" : "pages/manage/vehicle-unbind", "path" : "pages/manage/bcpjb",
"style" :
{
"navigationStyle": "custom"
}
}
,{
"path" : "pages/manage/group-task",
"style" : "style" :
{ {
"navigationStyle": "custom" "navigationStyle": "custom"

View File

@@ -32,15 +32,12 @@
return { return {
userName: '', userName: '',
menuList: [ menuList: [
{id: 1, title: '拆包机搬运', icon: 'RF01', path: '/pages/manage/cbj-carry'},
{id: 2, title: '压机搬运', icon: 'RF02', path: '/pages/manage/press-carry'},
{id: 3, title: '物料报废', icon: 'RF03', path: '/pages/manage/mater-scrap'},
{id: 4, title: '人工分拣', icon: 'RF04', path: '/pages/manage/man-sort'},
{id: 5, title: '任务管理', icon: 'RF05', path: '/pages/manage/task-manage'}, {id: 5, title: '任务管理', icon: 'RF05', path: '/pages/manage/task-manage'},
{id: 6, title: '指令管理', icon: 'RF06', path: '/pages/manage/inst-manage'}, {id: 6, title: '指令管理', icon: 'RF06', path: '/pages/manage/inst-manage'},
{id: 7, title: '压制混碾满料搬运', icon: 'RF07', path: '/pages/manage/yzhnml-carry'}, {id: 4, title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hnby'},
{id: 8, title: '条码解绑', icon: 'RF08', path: '/pages/manage/vehicle-unbind'}, {id: 3, title: '扫码出库', icon: 'RF07', path: '/pages/manage/smck'},
{id: 9, title: '组盘查看', icon: 'RF09', path: '/pages/manage/group-task'} {id: 7, title: '压制满料搬运', icon: 'RF02', path: '/pages/manage/yzmlby'},
{id: 8, title: '半成品解绑', icon: 'RF08', path: '/pages/manage/bcpjb'}
], ],
show: false, show: false,
secM: [] secM: []

View File

@@ -8,7 +8,7 @@
<span class="filter_label">区域</span> <span class="filter_label">区域</span>
</view> </view>
<view class="zd-col-17 filter_select"> <view class="zd-col-17 filter_select">
<uni-data-select v-model="index1" :localdata="options1" @change="change"></uni-data-select> <uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
@@ -40,9 +40,9 @@
data() { data() {
return { return {
title: '', title: '',
options1: [{value: 0, text: '困料区域', point: []}, {value: 1, text: '缓存货架区域', point: []}], options1: [{value: 1, text: '缓存货架区域', point: []}],
index1: '', index1: '',
options2: [], options2: this.generateArray('CRYHCHJ', '出入窑缓存货架'),
index2: '', index2: '',
disabled: false disabled: false
}; };
@@ -50,37 +50,21 @@
onLoad (options) { onLoad (options) {
this.title = options.title this.title = options.title
}, },
created () {
let point1 = []
for (let i = 0; i < 56; i++) {
if (i >= 9) {
point1.push({value: `KLHW${i+1}`, text: `困料货位${i+1}`})
} else {
point1.push({value: `KLHW0${i+1}`, text: `困料货位0${i+1}`})
}
}
let point2 = []
for (let i = 0; i < 44; i++) {
if (i >= 9) {
point2.push({value: `HCHJ${i+1}`, text: `缓存货架${i+1}`})
} else {
point2.push({value: `HCHJ0${i+1}`, text: `缓存货架0${i+1}`})
}
}
this.options1[0].point = point1
this.options1[1].point = point2
},
methods: { methods: {
change (e) { generateArray(prefix, suffix) {
this.options1.map((el, i) => { const array = []
if (e === i) { for (let i = 1; i <= 136; i++) {
this.options2 = el.point array.push({
} value: `${prefix}${String(i).padStart(2, '0')}`,
}) text: `${suffix}${String(i).padStart(2, '0')}`
})
}
return array
}, },
clearUp () { clearUp () {
this.index1 = '' this.index1 = ''
this.index2 = '' this.index2 = ''
this.disabled = false
}, },
async _vehicleUnbind () { async _vehicleUnbind () {
this.disabled = true this.disabled = true

View File

@@ -1,274 +0,0 @@
<template>
<view class="zd_container">
<nav-bar :title="title"></nav-bar>
<view class="zd-row jccenter tab-item-wraper">
<view class="zd-col-16 zd-row">
<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">叫料</view>
<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">满料</view>
<view class="tab-item" :class="{'tab-item_active': tab === 3}" @tap="tab=3">送空盅</view>
</view>
</view>
<view class="zd_content zd_content_1">
<view class="zd_wrapper">
<view v-show="tab === 2" class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">载具编码</span>
</view>
<view class="zd-col-17 filter_select">
<search-box
v-model="val1"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">点位</span>
</view>
<view class="zd-col-17 filter_select">
<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
</view>
</view>
<view v-show="tab === 3" class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">下个点位类型</span>
</view>
<view class="zd-col-17 filter_select">
<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
</view>
</view>
</view>
<view v-show="tab === 1" class="zd_wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th>点位编码</th>
<th>产品牌号</th>
<th>入库时间</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList1" :key="e.pointCode" @click="toChose1(e)" :class="{'checked': e.pointCode === pkId1}">
<td>{{e.pointCode}}</td>
<td>{{e.materialCode}}</td>
<td>{{e.instorageTime}}</td>
</tr>
</tbody>
</table>
</view>
</view>
<view v-show="tab === 2" class="zd_wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th class="fontcol1">工单编号</th>
<th>计划数量</th>
<th>实际数量</th>
<th>计划重量</th>
<th>实际重量</th>
<th>物料标识</th>
<th>泥料编码</th>
<th>批次号</th>
<th>生产日期</th>
<th>载具类型</th>
<th>点位编码</th>
<th>点位名称</th>
<th>区域编码</th>
<th>区域名称</th>
<th>工单状态</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList2" :key="i" @click="toChose2(e)" :class="{'checked': e.workorder_code === pkId2}">
<td class="fontcol1">{{e.workorder_code}}</td>
<td>{{e.plan_qty}}</td>
<td>{{e.real_qty}}</td>
<td>{{e.plan_weight}}</td>
<td>{{e.real_weight}}</td>
<td>{{e.material_ratio}}</td>
<td>{{e.raw_material_code}}</td>
<td>{{e.produce_order}}</td>
<td>{{e.produce_date}}</td>
<td>{{e.vehicle_type}}</td>
<td>{{e.point_code}}</td>
<td>{{e.point_name}}</td>
<td>{{e.region_code}}</td>
<td>{{e.region_name}}</td>
<td>{{['未生产', '已下发', '生产中', '暂停', '完成', '暂存中'][Number(e.workorder_status) - 1]}}</td>
</tr>
</tbody>
</table>
</view>
</view>
</view>
<view v-show="tab === 1" class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="index1 = ''">清空</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !pkId1 || !index1}" :disabled="disabled1" @tap="_cbjqlTask">拆包机叫料</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !index1}" @tap="show = true">呼叫空盅</button>
</view>
<view v-show="tab === 2" class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="index1 = '', val1 = ''">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !pkId2 || !val1 || !index1}" :disabled="disabled2" @tap="_cbjmlTask">满料入库</button>
</view>
<view v-show="tab === 3" class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="index2 = '', index1 = ''">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button>
</view>
<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop-line"></view>
<view class="msg_content">
<view class="zd-row">
<view class="zd-col-24">
<span class="filter_label">确定是否呼叫空蛊</span>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
<button class="zd-col-11 button-primary" :disabled="disabled3" @tap="_cbjqkTask">确定</button>
</view>
</view>
<view v-if="show" class="msg_mask"></view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {unpackShelfInfo, getCbjPoint, cbjqlTask, hnWorkOrder,cbjmlTask,cbjqkTask, cbjskTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
tab: 1,
title: '',
options1: [],
index1: '',
dataList1: [],
pkId1: '',
val1: '',
dataList2: [],
pkId2: '',
disabled1: false,
disabled2: false,
disabled3: false,
show: false,
options2: [{value: 'CBJXLW', text: '拆包机下料位'},{value: 'KLHW', text: '困料货架'}],
index2: '',
val2: '',
disabled4: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
this._unpackShelfInfo()
this._getCbjPoint()
this._hnWorkOrder()
},
methods: {
/**货架上未拆包料盅信息 */
async _unpackShelfInfo () {
let res = await unpackShelfInfo()
this.dataList1 = [...res]
},
/** 拆包机点位下拉框*/
async _getCbjPoint () {
let res = await getCbjPoint()
this.options1 = [...res]
},
toChose1 (e) {
this.pkId1 = this.pkId1 === e.pointCode ? '' : e.pointCode
},
/** 拆包机叫料 */
async _cbjqlTask () {
this.disabled1 = true
if (!this.pkId1 || !this.index1) {
this.disabled1 = false
return
}
try {
let res = await cbjqlTask(this.pkId1, this.index1)
this.pkId1 = ''
this.disabled1 = false
this._unpackShelfInfo()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled1 = false
}
},
/** 查询混碾工单 */
async _hnWorkOrder () {
let res = await hnWorkOrder()
this.dataList2 = [...res]
},
toChose2 (e) {
this.pkId2 = this.pkId2 === e.workorder_code ? '' : e.workorder_code
},
/** 满料入库 */
async _cbjmlTask () {
this.disabled2 = true
if (!this.pkId2 || !this.val1 || !this.index1) {
this.disabled2 = false
return
}
try {
let res = await cbjmlTask(this.pkId2, this.val1, this.index1)
this.pkId2 = ''
this.disabled2 = false
this._hnWorkOrder()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled2 = false
}
},
/** 呼叫空盅 */
async _cbjqkTask () {
this.disabled3 = true
try {
let res = await cbjqkTask(this.index1)
this.show = false
this.disabled3 = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled3 = false
}
},
/** 拆包机空料位送空蛊 */
async _cbjskTask () {
this.disabled4 = true
try {
let res = await cbjskTask(this.index2, this.index1)
this.disabled4 = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled4 = false
}
}
}
}
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
.msg_wrapper
height auto
min-height 30%
</style>

View File

@@ -1,102 +0,0 @@
<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-17 filter_select">
<search-box
v-model="val1"
/>
</view>
</view>
</view>
<view v-if="JSON.stringify(obj) !== '{}'" class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">重量</span>
</view>
<view class="zd-col-17 filter_select">
<input type="number" class="filter_input" v-model="obj.material_weight" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">数量</span>
</view>
<view class="zd-col-17 filter_select">
<input type="number" class="filter_input" v-model="obj.material_qty" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">牌号</span>
</view>
<view class="zd-col-17 filter_select">
<input type="text" class="filter_input" v-model="obj.material_code" disabled>
</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': !val1}" :disabled="disabled" @tap="_zpxxTask">确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {zpxxTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
title: '',
val1: '',
obj: {},
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
},
methods: {
clearUp () {
this.val1 = ''
this.obj = {}
},
async _zpxxTask () {
this.disabled = true
if (!this.val1) {
this.disabled = false
return
}
try {
let res = await zpxxTask(this.val1)
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
this.obj = res
} catch (e) {
this.disabled = false
}
}
}
}
</script>
<style lang="stylus">
</style>

100
pages/manage/hnby.vue Normal file
View File

@@ -0,0 +1,100 @@
<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-17 filter_select">
<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-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-17 filter_select">
<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-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-17 filter_select">
<input type="number" class="filter_input" v-model="val1">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled1" @tap="_pdaHnby">混碾搬运</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import {pdaHnby} from '@/utils/getData2.js'
export default {
components: {
NavBar
},
data() {
return {
title: '',
options1: this.generateArray('HNJ', 'DJW'),
index1: '',
options2: this.generateArray('YJ', 'SLW01'),
index2: '',
val1: null,
disabled1: false
};
},
onLoad (options) {
this.title = options.title
},
methods: {
generateArray(prefix, suffix) {
const array = []
for (let i = 1; i <= 8; i++) {
array.push({
value: `${prefix}${String(i).padStart(2, '0')}${suffix}`,
text: `${prefix}${String(i).padStart(2, '0')}${suffix}`
})
}
return array
},
clearUp () {
this.index1 = ''
this.index2 = ''
this.val1 = null
this.disabled1 = false
},
async _pdaHnby () {
this.disabled1 = true
if (!this.index1 || !this.index2) {
this.disabled1 = false
return
}
try {
let res = await pdaHnby(this.index1, this.index2, this.val1)
this.disabled1 = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled1 = false
}
}
}
}
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
</style>

View File

@@ -1,115 +0,0 @@
<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-8">
<span class="filter_label">人工分拣点位</span>
</view>
<view class="zd-col-15 filter_select">
<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-8">
<span class="filter_label">缓存货架点位</span>
</view>
<view class="zd-col-15 filter_select">
<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled1" @tap="_rgfjqlTask">叫料</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !index1}" :disabled="disabled2" @tap="_rgfjskTask">送空盘</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {rgfjPoint,hchjPoint,rgfjqlTask,rgfjskTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
title: '',
options1: [],
index1: '',
options2: [],
index2: '',
disabled1: false,
disabled2: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
this._rgfjPoint()
this._hchjPoint()
},
methods: {
/** 下拉框*/
async _rgfjPoint () {
let res = await rgfjPoint()
this.options1 = [...res]
},
async _hchjPoint () {
let res = await hchjPoint()
this.options2 = [...res]
},
clearUp () {
this.index1 = ''
this.index2 = ''
this.disabled1 = false
this.disabled2 = false
},
async _rgfjqlTask () {
this.disabled1 = true
if (!this.index1 || !this.index2) {
this.disabled1 = false
return
}
try {
let res = await rgfjqlTask(this.index2, this.index1)
this.disabled1 = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled1 = false
}
},
async _rgfjskTask () {
this.disabled2 = true
if (!this.index1) {
this.disabled2 = false
return
}
try {
let res = await rgfjskTask(this.index1)
this.disabled2 = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled2 = false
}
}
}
}
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
</style>

View File

@@ -1,156 +0,0 @@
<template>
<view class="zd_container">
<nav-bar :title="title"></nav-bar>
<view class="zd-row jccenter tab-item-wraper">
<view class="zd-col-16 zd-row">
<view class="tab-item" :class="{'tab-item_active': tab === 1}" @tap="tab=1">回库</view>
<view class="tab-item" :class="{'tab-item_active': tab === 2}" @tap="tab=2">点对点</view>
</view>
</view>
<view class="zd_content zd_content_1">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-5">
<span class="filter_label">上料位</span>
</view>
<view class="zd-col-19 filter_select">
<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
</view>
</view>
</view>
<view v-show="tab === 2" class="zd_wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th>点位编码</th>
<th>产品牌号</th>
<th>入库时间</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="e.pointCode" @click="toChose(e)" :class="{'checked': e.pointCode === pkId}">
<td>{{e.pointCode}}</td>
<td>{{e.materialCode}}</td>
<td>{{e.instorageTime}}</td>
</tr>
</tbody>
</table>
</view>
</view>
</view>
<view v-show="tab === 1" class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="index1 = ''">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="toPop">强制回货架</button>
</view>
<view v-show="tab === 2" class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="index1 = ''">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !pkId}" :disabled="disabled" @tap="_yzqlTask">请求上料位</button>
</view>
<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop-line"></view>
<view class="msg_content">
<view class="zd-row">
<view class="zd-col-24">
<span class="filter_label">确定是否强制回货架</span>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_qzhhjTask">确定</button>
</view>
</view>
<view v-if="show" class="msg_mask"></view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {yjslwPointList, qzhhjTask,packShelfInfo,yzqlTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
tab: 1,
title: '',
options1: [],
index1: '',
show: false,
disabled: false,
dataList: [],
pkId: ''
};
},
onLoad (options) {
this.title = options.title
},
created () {
this._yjslwPointList()
this._packShelfInfo()
},
methods: {
/** 下拉框*/
async _yjslwPointList () {
let res = await yjslwPointList()
this.options1 = [...res]
},
toPop () {
if (this.index1) {
this.show = true
}
},
/** 强制回货架 */
async _qzhhjTask () {
this.disabled = true
try {
let res = await qzhhjTask(this.index1)
this.show = false
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
/** 查询货架上已拆包料盅信息 */
async _packShelfInfo () {
let res = await packShelfInfo()
this.dataList = [...res]
},
toChose (e) {
this.pkId = this.pkId === e.pointCode ? '' : e.pointCode
},
/** 困料货架点对点到布料机上料位 */
async _yzqlTask () {
this.disabled = true
try {
let res = await yzqlTask(this.pkId, this.index1)
this.disabled = false
this.pkId = ''
this._packShelfInfo()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
}
}
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
.msg_wrapper
height auto
min-height 30%
</style>

View File

@@ -5,7 +5,7 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-5"> <view class="zd-col-5">
<span class="filter_label">载具编码</span> <span class="filter_label">扫码出库</span>
</view> </view>
<view class="zd-col-19 filter_select"> <view class="zd-col-19 filter_select">
<search-box <search-box
@@ -16,30 +16,16 @@
</view> </view>
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-22 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toPop">物料报废</button> <button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_pdaSmck">扫码出库</button>
</view> </view>
<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop-line"></view>
<view class="msg_content">
<view class="zd-row">
<view class="zd-col-24">
<span class="filter_label">确定是否执行物料报废</span>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_materialScrap">确定</button>
</view>
</view>
<view v-if="show" class="msg_mask"></view>
</view> </view>
</template> </template>
<script> <script>
import NavBar from '@/components/NavBar.vue' import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue' import SearchBox from '@/components/SearchBox.vue'
import {materialScrap} from '@/utils/getData2.js' import {pdaSmck} from '@/utils/getData2.js'
export default { export default {
components: { components: {
NavBar, NavBar,
@@ -49,7 +35,6 @@
return { return {
title: '', title: '',
val1: '', val1: '',
show: false,
disabled: false disabled: false
}; };
}, },
@@ -57,16 +42,14 @@
this.title = options.title this.title = options.title
}, },
methods: { methods: {
toPop () { clearUp () {
if (this.val1) { this.val1 = null
this.show = true this.disabled = false
}
}, },
async _materialScrap () { async _pdaSmck () {
this.disabled = true this.disabled = true
try { try {
let res = await materialScrap(this.val1) let res = await pdaSmck(this.val1)
this.show = false
this.disabled = false this.disabled = false
this.val1 = '' this.val1 = ''
uni.showToast({ uni.showToast({

View File

@@ -67,7 +67,7 @@
data() { data() {
return { return {
title: '', title: '',
options1: [{value: 0, text: '混碾区域', point: []}, {value: 1, text: '压制区域', point: []}], options1: [{value: 1, text: '压制区域', point: []}],
index1: '', index1: '',
options2: [], options2: [],
index2: '', index2: '',

View File

@@ -24,102 +24,43 @@ export const handLogin = (user, password) => request({
/** /**
* 混碾搬运 * 混碾搬运
*/ */
// 查询货架上未拆包料盅信息 export const pdaHnby = (sp, ep, weight) => request({
export const unpackShelfInfo = () => request({ url:'api/pda/hnby',
url:'api/pda/unpackShelfInfo',
data: {}
})
// 查询拆包机点位
export const getCbjPoint = () => request({
url:'api/pda/getCbjPoint',
data: {}
})
// 拆包机叫料
export const cbjqlTask = (sp, ep) => request({
url:'api/pda/cbjqlTask',
data: { data: {
startPoint: sp, startPoint: sp,
endPoint: ep endPoint: ep,
weight: weight
} }
}) })
// 查询混碾工单
export const hnWorkOrder = () => request({
url:'api/pda/hnWorkOrder',
data: {}
})
// 拆包机下料位满料入货架
export const cbjmlTask = (code, bcode, sp) => request({
url:'api/pda/cbjmlTask',
data: {orderCode: code,barCode: bcode,startPoint: sp}
})
// 拆包机下料位叫空蛊
export const cbjqkTask = (ep) => request({
url:'api/pda/cbjqkTask',
data: {endPoint: ep}
})
// 拆包机空料位送空蛊
export const cbjskTask = (type, sp) => request({
url:'api/pda/cbjskTask',
data: {nextType: type, startPoint: sp}
})
/** /**
* 压机搬运 * 扫码出库
*/ */
// 压机上料位下拉框 export const pdaSmck = (code) => request({
export const yjslwPointList = () => request({ url:'api/pda/smck',
url:'api/pda/yjslwPointList',
data: {}
})
// 压机上料位强制回货架
export const qzhhjTask = (code) => request({
url:'api/pda/qzhhjTask',
data: {deviceCode: code}
})
// 查询货架上已拆包料盅信息
export const packShelfInfo = () => request({
url:'api/pda/packShelfInfo',
data: {}
})
// 困料货架点对点到布料机上料位
export const yzqlTask = (sp, ep) => request({
url:'api/pda/yzqlTask',
data: {startPoint: sp, endPoint: ep}
})
/**
* 物料报废
*/
// 物料报废
export const materialScrap = (code) => request({
url:'api/pda/materialScrap',
data: { data: {
barCode: code barCode: code
} }
}) })
/** /**
* 人工分拣 * 压制满料搬运
*/ */
// 查询人工分拣点位 export const mlTask = (code, vcode, weight, qty) => request({
export const rgfjPoint = () => request({ url:'api/pda/mlTask',
url:'api/pda/rgfjPoint', data: {
data: {} deviceCode: code,
vehicle_code: vcode,
weight: weight,
qty: qty
}
}) })
// 查询缓存货架点位 /**
export const hchjPoint = () => request({ * 半成品解绑
url:'api/pda/hchjPoint', */
data: {} export const vehicleUnbind = (code) => request({
}) url:'api/pda/vehicleUnbind',
// 人工分拣叫料 data: {
export const rgfjqlTask = (sp, code) => request({ point_code: code
url:'api/pda/rgfjqlTask', }
data: {startPoint: sp, deviceCode: code}
})
// 人工分拣送空盘
export const rgfjskTask = (code) => request({
url:'api/pda/rgfjskTask',
data: {deviceCode: code}
}) })
/** /**
@@ -159,36 +100,3 @@ export const handInst = (type, id) => request({
inst_uuid: id inst_uuid: id
} }
}) })
/**
* 压制混碾满料搬运
*/
export const mlTask = (code, vcode, weight, qty) => request({
url:'api/pda/mlTask',
data: {
deviceCode: code,
vehicle_code: vcode,
weight: weight,
qty: qty
}
})
/**
* 条码解绑
*/
export const vehicleUnbind = (code) => request({
url:'api/pda/vehicleUnbind',
data: {
point_code: code
}
})
/**
* 组盘查看
*/
export const zpxxTask = (code) => request({
url:'api/pda/zpxxTask',
data: {
vehicle_code: code
}
})