diff --git a/src/api/Inventory/OutPartSelect.js b/src/api/Inventory/OutPartSelect.js
new file mode 100644
index 00000000..9c927b49
--- /dev/null
+++ b/src/api/Inventory/OutPartSelect.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+// 机床查询
+export function getMachines(check, num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_机床名称_查询数据',
+ param: '项目流水号_check=' + check + '=int&项目流水号=' + num
+ }
+ })
+}
+// 分组查询
+export function getGroups(machineNumber) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_组件名称_查询数据',
+ param: '机床流水号=' + machineNumber
+ }
+ })
+}
+// 主表查询
+export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_库存管理_基本件出库记录查询',
+ param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index 661a87d9..32b298c2 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -81,7 +81,7 @@ export function BasicPart(listNumber, data1, data2, data3, data4, data5) {
data: {
type: '2',
name: 'MES_机加工MES_库存管理_出库模块_出库零件信息_零件出库',
- param: '领料单明细流水号=' + listNumber + '工艺计划流水号=' + data1 + '&本次出库数量=' + data2 + '&收件信息ID=' + data3 + '&领用人编号=' + data4 + '&出库备注=' + data5
+ param: '领料单明细流水号=' + listNumber + '&工艺计划流水号=' + data1 + '&本次出库数量=' + data2 + '&收件信息ID=' + data3 + '&领用人编号=' + data4 + '&出库备注=' + data5
}
})
}
diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js
index 1f4971cc..30f32faa 100644
--- a/src/api/Inventory/PickingList.js
+++ b/src/api/Inventory/PickingList.js
@@ -136,6 +136,18 @@ export function dropListDetail(DetailNumberx, isBacklog) {
}
})
}
+// 删除领料单明细/基本件
+export function dropListDetailBasic(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间装配管理_领料单_领料单明细删除_基本件',
+ param: `领料单明细流水号=${params[0]}&收件信息ID=${params[1]}&返还数量=${params[2]}`
+ }
+ })
+}
// 增加领料单明细
export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) {
return request({
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index 5c603b88..b7bb4a4f 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -74,3 +74,15 @@ export function change2(Number, code, num) {
}
})
}
+export function handlechange2(Number, code) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间生产管理工艺_零件工序_修改数据_修改实际完成时间',
+ param: '工序流水号=' + Number + '&实际完成时间=' + code
+ }
+ })
+}
+
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index ae7686dd..f4c43c7b 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,75 +116,67 @@ export default {
this.Getinvent()
},
methods: {
+ // 移除
handleDelete(index, row) {
- this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- this.tableData.splice(index, 1)
- this.$message({
- message: '已被成功移除',
- type: 'success'
- })
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '已取消删除'
- })
- })
+ this.tableData.splice(index, 1)
},
// 获取人员编号
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 +224,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: '零件入库失败!'
+ })
+ }
})
}
}
@@ -267,7 +263,7 @@ export default {
Getinvent() {
this.getSelect(getinventory, ['仓库名称', '仓库流水号'], 'inventoryName')
},
- // 根据项目获取机床
+ // 根据仓库获取货位
Getlocate() {
this.locateName = []
this.locateNumber = ''
diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue
new file mode 100644
index 00000000..fe742779
--- /dev/null
+++ b/src/views/Inventory/OutPartSelect/index.vue
@@ -0,0 +1,186 @@
+
+
+
+ 机床号:
+
+
+ {{ item.label }}
+ {{ item.value2 }}
+
+
+ 组号:
+
+
+
+ 零件图号:
+
+ 查询
+
+
+
+
+
+
+
+ {{ scope.row.零件名称 }}
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.入库数量 }}
+
+
+
+
+ {{ scope.row.机床图号 }}
+
+
+
+
+ {{ scope.row.组号 }}
+
+
+
+
+ {{ scope.row.仓库名称 }}
+
+
+
+
+ {{ scope.row.货位名称 }}
+
+
+
+
+ {{ scope.row.入库时间 }}
+
+
+
+
+
+
+
+
+