root/xiMenZi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

需求

Browse Source
This commit is contained in:
蔡玲
2024-09-23 14:03:33 +08:00
parent 67f5a69dc7
commit 5ddfe64d93
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/nladmin-ui/src/views/wms/produceScreen/index.vue
View File

@@ -275,7 +275,15 @@ export default {
this.show = true
this.emptyObj.device_code = e.name
} else if (type === 'SCANER') {
crudProduceScreen.fabOrders({ device_code: this.screenData.in_code }).then(res => {
const arr = []
if (JSON.stringify(this.screenData) !== '{}') {
this.screenData.region_points.map(el => {
if (el.type === '0') {
arr.push(el.device_code)
}
})
}
crudProduceScreen.fabOrders({ device_code: arr }).then(res => {
this.options2 = [...res]
})
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
@@ -284,7 +292,9 @@ export default {
this.popList.push({ order_code: '', material_qty: '' })
this.show = true
} else if (type === 'BACK') {
crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
const arr = []
arr.push(this.popData.device_code)
crudProduceScreen.fabOrders({ device_code: arr }).then(res => {
this.popList = [...res]
this.popList.map(el => {
this.$set(el, 'material_qty', 0)

2
lms/nladmin-ui/src/views/wms/produceScreen/mork.js
View File

@@ -21,7 +21,7 @@ export function getUserOrDevice() {
// 3.登录跳转
export function deviceInLogin() {
const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: 'RGZWDJW01' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1234' }] }
const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: 'RGZWDJW01' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1' }, { name: '叫料', type: '0', device_code: '2' }] }
return new Promise((resolve, reject) => {
resolve(res)
})

7
lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
View File

@@ -92,13 +92,6 @@ export default {
}
crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => {
res.username = this.username
let in_code = ''
res.region_points.map(el => {
if (el.type === '0') {
in_code = el.device_code
}
})
res.in_code = in_code
this.$store.dispatch('addScreenData', JSON.stringify(res))
this.show = false
this.disabled = false