root/hht-oulun-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
xiangxy
2025-07-17 20:02:06 +08:00
parent d89e9a2087
commit 4d9fc3b83d
8 changed files with 401 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pages/common/mater-list.vue
View File

@@ -18,28 +18,16 @@
<table>
<thead>
<tr>
<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 dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.material_spec}}</td>
<td>{{e.unit_id}}</td>
<td>{{e.single_weight}}</td>
<td>{{e.pcsn}}</td>
<td>{{e.qty}}</td>
<td>{{e.vehicle_code}}</td>
<td>{{e.stor_code}}</td>
<td>{{e.material_code}}</td>
</tr>
</tbody>
</table>
@@ -93,7 +81,7 @@
this._getMaterialList()
},
async _getMaterialList () {
let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '', this.$route.query.code)
// this.dataList = res.data
this.totalCount = res.totalElements
if (res.totalElements > 0) {

31
pages/entry/mater-group.vue
View File

@@ -4,14 +4,6 @@
<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">
<search-box v-model="val1"/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">载具编码</span>
@@ -68,11 +60,27 @@
<NumberInput v-model="currentData.qty" />
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">地面站点</span>
</view>
<view class="zd-col-17">
<search-box v-model="val3"/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">源单编码</span>
</view>
<view class="zd-col-17">
<search-box v-model="val1"/>
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || !val3}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
</view>
</view>
</template>
@@ -93,6 +101,7 @@
title: '',
val1: '',
val2: '',
val3: '',
currentData: {},
options: [],
index: '',
@@ -120,13 +129,13 @@
},
async _groupPlate () {
this.disabled = true
if (JSON.stringify(this.currentData) === '{}') {
if (JSON.stringify(this.currentData) === '{}' || !this.val3) {
this.disabled = false
return
}
try {
this.currentData.stor_code = this.index
let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1)
let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1, this.val3)
uni.showToast({
title: res.message,
icon: 'none'

153
pages/entry/mater-group2.vue Normal file
View File

@@ -0,0 +1,153 @@
<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">
<search-box v-model="val2"/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料信息</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料规格</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料编码</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" 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">
<input type="text" class="filter_input" v-model="currentData.pcsn">
</view>
</view> -->
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料数量</span>
</view>
<view class="zd-col-17">
<NumberInput v-model="currentData.qty" />
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">地面站点</span>
</view>
<view class="zd-col-17">
<search-box v-model="val3"/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">源单编码</span>
</view>
<view class="zd-col-17">
<search-box v-model="val1"/>
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || !val3}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
import {groupPlate} from '@/utils/getData3.js'
export default {
components: {
NavBar,
SearchBox,
NumberInput
},
data() {
return {
title: '',
val1: '',
val2: '',
val3: '',
currentData: {},
options: [],
index: '',
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
onShow() {
if (this.$store.getters.publicObj !== '') {
this.currentData = this.$store.getters.publicObj
}
},
methods: {
toJump () {
uni.navigateTo({
url: '/pages/common/mater-list?title=查询物料&code=YZHJ'
})
},
toEmpty () {
this.currentData = {}
this.index = ''
this.disabled = false
},
async _groupPlate () {
this.disabled = true
if (JSON.stringify(this.currentData) === '{}' || !this.val3) {
this.disabled = false
return
}
try {
this.currentData.stor_code = this.index
let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1, this.val3)
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled = false
} catch (e) {
this.disabled = false
}
}
}
}
</script>
<style lang="stylus">
</style>

4
pages/home/home.vue
View File

@@ -41,8 +41,8 @@
return {
userName: '',
menuList: [
{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group2'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}]},
{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/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/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},

1
pages/outbound/line-callmater.vue
View File

@@ -113,6 +113,7 @@
let res = await getRegion('YZHJ')
if (res) {
this.options = res
this.index = res[0].value
} else {
this.options =[]
}

195
pages/outbound/quhuo-confirm.vue Normal file
View File

@@ -0,0 +1,195 @@
<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">
<search-box
v-model="val1"
@handleChange="handleChange"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料规格</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料编号</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料批次</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.pcsn" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料数量</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.qty" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">出库数量</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" :class="{'hightlight': currentData.qty !== currentData.frozen_qty}" v-model="currentData.frozen_qty" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-8">
<span class="filter_label">自动送回空载具</span>
</view>
<view class="relative zd-col-16">
<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7" style="width: 45%;">
<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>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id || (this.isChecked && !this.index)}" :disabled="disabled" @tap="_confirm('1')">确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {getReturnPoint, iosOutgetVehicleMaterial, confirm} from '@/utils/getData3.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
val1: '',
options: [],
index: '',
currentData: {},
disabled: false,
isDiff: false,
isChecked: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
this._getReturnPoint()
},
methods: {
setWStatus () {
this.isChecked = !this.isChecked
},
clearUp () {
this.code = ''
this.disabled = false
},
selectChange (e) {
this.index = e
},
handleChange (e) {
if (e) {
this._iosOutgetVehicleMaterial(e)
}
},
async _getReturnPoint () {
try {
let res = await getReturnPoint()
if (res) {
this.options = res
} else {
this.options =[]
}
} catch (e) {
this.options = []
}
},
async _iosOutgetVehicleMaterial (e) {
try {
let res = await iosOutgetVehicleMaterial(e)
if (res.code === '200') {
this.currentData = res.data[0]
} else {
this.currentData = {}
}
} catch (e) {
this.currentData = {}
}
},
async _confirm (type) {
this.disabled = true
if (!this.val1 || !this.currentData.group_id) {
this.disabled = false
return
}
if (this.isChecked && !this.index) {
this.disabled = false
return
}
let checkflag = this.isChecked === false ? '0' : '1'
try {
let res = await confirm(this.currentData.group_id, this.val1, type, checkflag, this.index)
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
}
}
}
}
</script>
<style lang="stylus">
.hightlight
color #f00
</style>