diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index b6815af7..5ac5748e 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -639,14 +639,14 @@ export default {
       codeArray: [],
       curQueueName: "",
       scanReCount: 0,
-      curQueue: null,
+      curQueue: {},
       redMesg: false,
       redMesgOld: false,
       productName: null,
       orderStatus: false,//是否调用子组件
       workPlaceQueueCode:"",
       collectSet: {},
-      sharedData: ''
+      sharedData: '',
     }
   },
   components: {
@@ -1196,6 +1196,14 @@ export default {
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
           this.orderFormData.relId = null
+          if (response.data.queueCode != null){
+            //虚拟槽位上货
+            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 +1349,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){
@@ -1810,19 +1820,21 @@ 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;
           }
@@ -2471,33 +2483,41 @@ export default {
         code : data,
         workPlaceIdFk : this.workplaceId
       }
-      getByCode(query).then((response) => {
-        this.loading = false;
-        if (response.code == 20000) {
-          this.curQueue = response.data;
-          this.productName = this.curQueue.cpmctymc
-          if (isBlank(this.productName)) {
-            this.curQueueName = "当前取货槽:" + this.curQueue.code
+      if (this.queueStatus == 0){
+        this.sharedData = this.curQueue.code
+        EventBus.$emit('update-data', { message: this.sharedData });
+        // //查找当前用户工位是否有正在处理的单据
+        this.getOrder()
+      }else {
+        getByCode(query).then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.curQueue = response.data;
+            this.productName = this.curQueue.cpmctymc
+            if (isBlank(this.productName)) {
+              this.curQueueName = "当前取货槽:" + this.curQueue.code
+            } else {
+              this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
+            }
+            this.orderFormData.workPlaceQueueCode = this.curQueue.code
+            this.scanCode = '';
+            this.redMesg = false
+            //发送信息
+            // 发送事件并传递数据
+            this.sharedData = this.curQueue.code
+            EventBus.$emit('update-data', { message: this.sharedData });
+            // //查找当前用户工位是否有正在处理的单据
+            this.getOrder()
           } else {
-            this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
+            this.scanCode = ''
+            this.$message.error(response.message)
           }
-          this.orderFormData.workPlaceQueueCode = this.curQueue.code
-          this.scanCode = '';
-          this.redMesg = false
-          //发送信息
-          // 发送事件并传递数据
-          this.sharedData = this.curQueue.code
-          EventBus.$emit('update-data', { message: this.sharedData });
-          // //查找当前用户工位是否有正在处理的单据
-          this.getOrder()
-        } else {
-          this.scanCode = ''
-          this.$message.error(response.message)
-        }
-      }).catch(() => {
+        }).catch(() => {
+
+        })
+        return true
+      }
 
-      })
-      return true
     }
   },
   filters: {},
diff --git a/src/views/collect/IoSplitFifoRemove.vue b/src/views/collect/IoSplitFifoRemove.vue
index 4021a0c5..dd7221d0 100644
--- a/src/views/collect/IoSplitFifoRemove.vue
+++ b/src/views/collect/IoSplitFifoRemove.vue
@@ -296,6 +296,7 @@ import {batchAddCode, batchVailCode, enterCodeWeb} from '@/api/inout/order'
 import {getSet} from '@/api/collect/collectSet'
 import A from '@/plugins/KeyScaner'
 import { EventBus } from '@/eventBus'; // 引入事件总线
+import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
 
 const SLOT_CODE_PREFIX = 'DMQ'
 
@@ -373,7 +374,10 @@ export default {
       valiCodes: [],
       //weksolket
       sitcomScan: false,
-      sictomText: ''
+      sictomText: '',
+      allWorkPlaces:[],
+      //是否开启按照槽位上货
+      queueStatus: null,
     }
   },
   methods: {
@@ -493,8 +497,8 @@ export default {
           this.getSplitCodes()
           this.init()
           //扫码结果
-          console.log("shanchu wan ma",this.message)
-          if (!isBlank(this.message)){
+          // console.log("shanchu wan ma",this.message)
+          if (!isBlank(this.message) && this.message.includes("DMQ")){
             EventBus.$emit('sendCreateData', { message: this.message });
           }
         } else {
@@ -535,7 +539,7 @@ export default {
                 this.getCodes()
                 this.getSplitCodes()
                 this.printMutiCodeResult(res.data.vailCodeResultResponses)
-                if (!isBlank(this.message)){
+                if (!isBlank(this.message) && this.message.includes("DMQ")){
                   EventBus.$emit('sendCreateData', { message: this.message });
                 }
               } else {
@@ -631,8 +635,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()
@@ -713,7 +719,7 @@ export default {
             this.getSplitCodes()
             this.init()
             this.alertInit()
-            if (!isBlank(this.message)){
+            if (!isBlank(this.message) && this.message.includes("DMQ")){
               EventBus.$emit('sendCreateData', { message: this.message });
             }
             return this.$message.success('回退成功')
@@ -729,9 +735,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 = []
@@ -754,6 +760,7 @@ export default {
       if (!isBlank(this.message) && this.message.includes("DMQ")){
         EventBus.$emit('sendCreateData', { message: this.message });
       }
+      this.findAllWorkPlaces()
     },
     paizhao() {
       if (this.ws && this.ws.readyState === WebSocket.OPEN) {
@@ -919,7 +926,31 @@ export default {
           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: {
     // 计算每个分组的合并信息
@@ -993,7 +1024,8 @@ export default {
   },
   created() {
     this.workplaceId = this.$route.query.workplaceId
-    // this.selectSysParam()
+    this.findAllWorkPlaces()
+    this.selectSysParam()
     if (!isBlank(this.message) && this.message.includes("DMQ")){
       this.scanCode = this.message
       this.handleSlotCodeScan()
diff --git a/src/views/collect/device/DevicesIoCreateOrder.vue b/src/views/collect/device/DevicesIoCreateOrder.vue
index adcdb255..3e5e8dc7 100644
--- a/src/views/collect/device/DevicesIoCreateOrder.vue
+++ b/src/views/collect/device/DevicesIoCreateOrder.vue
@@ -1197,9 +1197,8 @@ export default {
           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.curQueue.code = response.data.queueCode
             this.sharedData = response.data.queueCode
             EventBus.$emit('update-data', { message: this.sharedData });
             // //查找当前用户工位是否有正在处理的单据
@@ -2484,34 +2483,35 @@ export default {
         EventBus.$emit('update-data', { message: this.sharedData });
         // //查找当前用户工位是否有正在处理的单据
         this.getOrder()
-      }
-      getByCode(query).then((response) => {
-        this.loading = false;
-        if (response.code == 20000) {
-          this.curQueue = response.data;
-          this.productName = this.curQueue.cpmctymc
-          if (isBlank(this.productName)) {
-            this.curQueueName = "当前取货槽:" + this.curQueue.code
+      }else {
+        getByCode(query).then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.curQueue = response.data;
+            this.productName = this.curQueue.cpmctymc
+            if (isBlank(this.productName)) {
+              this.curQueueName = "当前取货槽:" + this.curQueue.code
+            } else {
+              this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
+            }
+            this.orderFormData.workPlaceQueueCode = this.curQueue.code
+            this.scanCode = '';
+            this.redMesg = false
+            //发送信息
+            // 发送事件并传递数据
+            this.sharedData = this.curQueue.code
+            EventBus.$emit('update-data', { message: this.sharedData });
+            // //查找当前用户工位是否有正在处理的单据
+            this.getOrder()
           } else {
-            this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
+            this.scanCode = ''
+            this.$message.error(response.message)
           }
-          this.orderFormData.workPlaceQueueCode = this.curQueue.code
-          this.scanCode = '';
-          this.redMesg = false
-          //发送信息
-          // 发送事件并传递数据
-          this.sharedData = this.curQueue.code
-          EventBus.$emit('update-data', { message: this.sharedData });
-          // //查找当前用户工位是否有正在处理的单据
-          this.getOrder()
-        } else {
-          this.scanCode = ''
-          this.$message.error(response.message)
-        }
-      }).catch(() => {
+        }).catch(() => {
 
-      })
-      return true
+        })
+        return true
+      }
     }
   },
   filters: {},
diff --git a/src/views/collect/device/DevicesIoSplitFifoRemove.vue b/src/views/collect/device/DevicesIoSplitFifoRemove.vue
index 44411e90..63ba6c14 100644
--- a/src/views/collect/device/DevicesIoSplitFifoRemove.vue
+++ b/src/views/collect/device/DevicesIoSplitFifoRemove.vue
@@ -499,7 +499,7 @@ export default {
           this.init()
           //扫码结果
           console.log("shanchu wan ma",this.message)
-          if (!isBlank(this.message)){
+          if (!isBlank(this.message) && this.message.includes("DMQ")){
             EventBus.$emit('sendCreateData', { message: this.message });
           }
         } else {
@@ -540,6 +540,9 @@ export default {
                 this.getCodes()
                 this.getSplitCodes()
                 this.printMutiCodeResult(res.data.vailCodeResultResponses)
+                if (!isBlank(this.message) && this.message.includes("DMQ")){
+                  EventBus.$emit('sendCreateData', { message: this.message });
+                }
               } else {
                 return this.$message.error('删除错误')
               }
@@ -717,6 +720,9 @@ export default {
             this.getSplitCodes()
             this.init()
             this.alertInit()
+            if (!isBlank(this.message) && this.message.includes("DMQ")){
+              EventBus.$emit('sendCreateData', { message: this.message });
+            }
             return this.$message.success('回退成功')
           } else {
             this.getCodes()
@@ -752,6 +758,9 @@ export default {
       this.queueCodeTotal = 0
       this.collectSet = null
       this.alertInit()
+      if (!isBlank(this.message) && this.message.includes("DMQ")){
+        EventBus.$emit('sendCreateData', { message: this.message });
+      }
       this.findAllWorkPlaces()
     },
     paizhao() {