|
|
|
@ -1671,10 +1671,10 @@ export default {
|
|
|
|
|
)
|
|
|
|
|
tQuery.billNo = this.orderFormData.billNo
|
|
|
|
|
tQuery.orderType = 2
|
|
|
|
|
// if (this.orderFormData.billNo == null) {
|
|
|
|
|
// this.$message.error('请先录入单据信息!')
|
|
|
|
|
// return
|
|
|
|
|
// }
|
|
|
|
|
if (this.orderFormData.billNo == null) {
|
|
|
|
|
this.$message.error('请先录入单据信息!')
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
this.saveLoading = true
|
|
|
|
|
if (this.orderFormData.billNo != null) {
|
|
|
|
|
deleteByOrderId(tQuery).then((response) => {
|
|
|
|
@ -1716,6 +1716,21 @@ export default {
|
|
|
|
|
this.checkSuccess = true
|
|
|
|
|
// this.workPlaceQueueCode = this.scanCode
|
|
|
|
|
if (this.getDMHotskeyValue(this.scanCode)) {
|
|
|
|
|
|
|
|
|
|
if (this.scanCode.includes("DMOENTER")) {
|
|
|
|
|
this.submit()
|
|
|
|
|
this.scanCode = ''
|
|
|
|
|
return
|
|
|
|
|
}else if (this.scanCode.includes("DMOCANCEL")) {
|
|
|
|
|
this.delOrder()
|
|
|
|
|
this.scanCode = ''
|
|
|
|
|
return
|
|
|
|
|
}else if (this.scanCode.includes("DMODEL")) {
|
|
|
|
|
this.deleteCode()
|
|
|
|
|
this.scanCode = ''
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//获取当前工位的所有码 然后批量扫入
|
|
|
|
|
if (this.splitType == 'return') {
|
|
|
|
|
getCodeList({workPlaceQueueCode:this.scanCode}).then((response) => {
|
|
|
|
@ -1964,6 +1979,12 @@ export default {
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
})
|
|
|
|
|
return true
|
|
|
|
|
}else if (str.includes("DMOENTER")) {
|
|
|
|
|
return true
|
|
|
|
|
}else if (str.includes("DMOCANCEL")) {
|
|
|
|
|
return true
|
|
|
|
|
}else if (str.includes("DMODEL")) {
|
|
|
|
|
return true
|
|
|
|
|
}
|
|
|
|
|
return false
|
|
|
|
|
},
|
|
|
|
|