diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index ae7686dd..77f8beb8 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -32,17 +32,17 @@
-
+ {{ tableData[scope.$index].plannumber }}
-
+
-
+
-
+
-
+
@@ -79,7 +79,6 @@
-
@@ -87,7 +86,6 @@
import { searchTable, insertOne, getinventory, getlocate, searchPartNumber, CraftNumber } from '@/api/Inventory/Inboundscanning'
import { mapGetters } from 'vuex'
import { wsuri, name } from '@/utils/request'
-import print from '@/vendor/print'
export default {
data() {
return {
@@ -118,6 +116,7 @@ export default {
this.Getinvent()
},
methods: {
+ // 移除
handleDelete(index, row) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
confirmButtonText: '确定',
@@ -139,54 +138,60 @@ export default {
// 获取人员编号
getpeopleid() {
this.PeopleNumber = this.id
- const a = this.token
- console.log(a, 1111)
},
- aaa() {
- print('#print')
- },
- initWebpack() { // 初始化websocket
+ // 初始化websocket
+ initWebpack() {
this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
this.websock.onopen = this.websocketopen
this.websock.onmessage = this.websocketonmessage
this.websock.onclose = this.websocketclose
this.websock.onerror = this.websocketerror
},
- websocketopen() { // 打开
+ // 打开
+ websocketopen() {
console.log('WebSocket连接成功')
this.websock.send('{<' + name + '>}')
},
- websocketonmessage(msg) { // 数据接收
+ // 数据接收
+ websocketonmessage(msg) {
this.partNumber = msg.data.split('|')[3]
this.partNumber = this.partNumber.slice(1)
this.getPaint(this.partNumber)
},
- websocketclose() { // 关闭
+ // 关闭
+ websocketclose() {
console.log('WebSocket关闭')
},
- websocketerror() { // 失败
+ // 失败
+ websocketerror() {
console.log('WebSocket连接失败')
},
+ // 根据图号查流水号并查表1
getCraftNumber() {
+ this.partNumber = ''
CraftNumber(this.Partpaint).then(response => {
- this.partNumber = response.data[0].工艺计划流水号
+ if (response.data.length > 0 && response.data[0].工艺计划流水号) {
+ this.partNumber = response.data[0].工艺计划流水号
+ }
}).then(() => {
this.getscantable()
})
},
+ // 扫描并获取图号并查表1
getPaint() {
searchPartNumber(this.partNumber).then(response => {
this.Partpaint = response.data[0].零件图号
})
this.getscantable()
},
- // 扫描查询
+ // 根据流水号查询
getscantable() {
if (this.partNumber === '' || this.partNumber === null) {
- this.$message.error('请输入零件号')
+ this.$message.error('请输入正确零件号')
} else {
this.listLoading = true
searchTable(this.partNumber).then(response => {
+ console.log(response.data)
if (response.data.length === 0) {
this.listLoading = false
this.$message.warning('该零件未加工完成')
@@ -234,19 +239,25 @@ export default {
this.$message.error('请选择货位')
} else {
for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].innumber === '0') {
+ if (Number(this.tableData[i].innumber) === 0) {
this.$message.error('请输入正确数量')
} else {
if (this.tableData[i].innumber > this.tableData[i].plannumber) {
this.tableData[i].innumber = this.tableData[i].plannumber
}
insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
- this.$message({
- type: 'success',
- message: '零件入库成功!'
- })
- }).then(() => {
- this.Empty()
+ if (response.data[0].result === '1') {
+ this.$message({
+ type: 'success',
+ message: '零件入库成功!'
+ })
+ this.Empty()
+ } else {
+ this.$message({
+ type: 'error',
+ message: '零件入库失败!'
+ })
+ }
})
}
}