From 99862eb3740facb36766c2e2b3a8d1f9616d2761 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 27 Feb 2025 16:09:05 +0800 Subject: [PATCH] =?UTF-8?q?2/26=20=E8=99=9A=E6=8B=9F=E6=A7=BD=E4=BD=8D?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E8=B4=A7=20=E6=89=AB=E7=A0=81=E5=89=94?= =?UTF-8?q?=E9=99=A4=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/device/DevicesIoCreateOrder.vue | 41 ++++++++++---- .../device/DevicesIoSplitFifoRemove.vue | 53 +++++++++++++++---- 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/views/collect/device/DevicesIoCreateOrder.vue b/src/views/collect/device/DevicesIoCreateOrder.vue index bf38e57f..adcdb255 100644 --- a/src/views/collect/device/DevicesIoCreateOrder.vue +++ b/src/views/collect/device/DevicesIoCreateOrder.vue @@ -639,7 +639,7 @@ export default { codeArray: [], curQueueName: "", scanReCount: 0, - curQueue: null, + curQueue: {}, redMesg: false, redMesgOld: false, productName: null, @@ -1196,6 +1196,15 @@ export default { this.$refs.inputRef.focus() this.$refs.inputRef.select() this.orderFormData.relId = null + if (response.data.queueCode != null){ + console.log("zhzhzhzhzhzh",response.data.queueCode) + //虚拟槽位上货 + // this.curQueue.code = response.data.queueCode + this.sharedData = response.data.queueCode + EventBus.$emit('update-data', { message: this.sharedData }); + // //查找当前用户工位是否有正在处理的单据 + this.getOrder() + } } else { if (response.code == 502) { //该产品绑定多个产品ID处理 @@ -1341,7 +1350,9 @@ export default { }, getOrderData(orderDetail) { this.productName = orderDetail.coName - this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")" + if (this.queueStatus == 1){ + this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")" + } this.orderStatus = true }, getCount(count){ @@ -1808,19 +1819,23 @@ export default { if (this.splitType == 'out') { if (!this.scanCode.includes("DMQ")) { - if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) { - this.$message.warning('当前工位无需按取货槽上架') - return; - } else if (this.queueStatus == "1" && isBlank(this.orderFormData.workPlaceQueueCode)) { + // if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) { + // this.$message.warning('当前工位无需按取货槽上架') + // return; + // } else + if (this.queueStatus == "1" && isBlank(this.orderFormData.workPlaceQueueCode)) { this.scanCode = '' this.$message.warning('当前工位需按取货槽上架') return; } } else { - if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) { - this.$message.warning('当前工位无需按取货槽上架') - return; - } else if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) { + // 需要把虚拟槽位 加入 订单 擦可以进行 码删剔除 + // if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) { + // this.$message.warning('当前工位无需按取货槽上架') + // return; + // } + // else + if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) { this.$message.warning('当前工位需按取货槽上架') return; } @@ -2464,6 +2479,12 @@ export default { code : data, workPlaceIdFk : this.workplaceId } + if (this.queueStatus == 0){ + this.sharedData = this.curQueue.code + EventBus.$emit('update-data', { message: this.sharedData }); + // //查找当前用户工位是否有正在处理的单据 + this.getOrder() + } getByCode(query).then((response) => { this.loading = false; if (response.code == 20000) { diff --git a/src/views/collect/device/DevicesIoSplitFifoRemove.vue b/src/views/collect/device/DevicesIoSplitFifoRemove.vue index 40125eb5..44411e90 100644 --- a/src/views/collect/device/DevicesIoSplitFifoRemove.vue +++ b/src/views/collect/device/DevicesIoSplitFifoRemove.vue @@ -25,14 +25,15 @@ > 拍照解码 - 回退 - 放弃 @@ -295,7 +296,8 @@ import {splitFifoDetail} from '@/api/inout/splitCode' import {batchAddCode, batchVailCode, enterCodeWeb} from '@/api/inout/order' import {getSet} from '@/api/collect/collectSet' import A from '@/plugins/KeyScaner' -import { EventBus } from '@/eventBus'; // 引入事件总线 +import { EventBus } from '@/eventBus'; +import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace' // 引入事件总线 const SLOT_CODE_PREFIX = 'DMQ' @@ -373,7 +375,10 @@ export default { valiCodes: [], //weksolket sitcomScan: false, - sictomText: '' + sictomText: '', + allWorkPlaces:[], + //是否开启按照槽位上货 + queueStatus: null, } }, methods: { @@ -628,8 +633,10 @@ export default { if (response.code == 20000) { this.curQueue = response.data this.productName = this.curQueue.cpmctymc - this.curQueueName = this.getQueueName() - this.curProductData = this.getCurProduct() + if (this.queueStatus == 1){ + this.curQueueName = this.getQueueName() + this.curProductData = this.getCurProduct() + } this.redMeg = false this.isCheckQueue = true this.init() @@ -723,9 +730,9 @@ export default { }) }, dropCode() { - this.redMeg = true + // this.redMeg = true this.curQueueName = '' - this.isCheckQueue = false + // this.isCheckQueue = false this.curProductData = '' this.curQueue = null this.queueCodes = [] @@ -745,6 +752,7 @@ export default { this.queueCodeTotal = 0 this.collectSet = null this.alertInit() + this.findAllWorkPlaces() }, paizhao() { if (this.ws && this.ws.readyState === WebSocket.OPEN) { @@ -909,7 +917,31 @@ export default { this.workplaceId = this.$route.query.workplaceId this.handleSlotCodeScan() } - } + }, + findAllWorkPlaces() { + let query = { + page: 1, + limit: 100, + } + getUserBindWork(query).then((res) => { + this.allWorkPlaces = res.data.list || []; + { + let item = this.allWorkPlaces.find(item => item.workplaceId == this.workplaceId ) + this.queueStatus = item.queueStatus + if (this.curQueue == null){ + if (this.queueStatus == 0) { + this.redMeg = false + this.isCheckQueue = true + }else { + this.redMeg = true + this.isCheckQueue = false + } + } + } + + }) + + }, }, computed: { // 计算每个分组的合并信息 @@ -983,7 +1015,8 @@ export default { }, created() { this.workplaceId = this.$route.query.workplaceId - // this.selectSysParam() + this.findAllWorkPlaces() + this.selectSysParam() if (!isBlank(this.message)){ this.scanCode = this.message this.handleSlotCodeScan()