From 4cc3f3284c6d6f9463effee9bb45e7b27d2559e1 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 31 Oct 2024 17:55:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=B8=9A=E5=8A=A1=E6=8C=89?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=B8=8A=E6=9E=B6=E7=BB=93=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue | 45 +++++++++++++++++++----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index fe96abc9..565cdaaa 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -438,6 +438,7 @@ export default {
   },
   data() {
     return {
+      queueStatus:null,
       busTypeList: [],
       busQuery: {
         busKey: '',
@@ -507,6 +508,7 @@ export default {
       curSpaceOptions: [], //当前货位
 
       curWorkPlaces: [],
+      allWorkPlaces: [],
 
       curAction: {
         corpType: 0,
@@ -1066,20 +1068,22 @@ export default {
     },
 
     //获取当前工位
-    // findCurWorkPlaces(val) {
-    //   let query = {
-    //     userId: this.userInfo.userId,
-    //     page: 1,
-    //     limit: 100,
-    //   }
-    //   getUserBindWork(query).then((res) => {
-    //     this.curWorkPlaces = res.data.list || [];
-    //     if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
-    //       this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
-    //       this.defaultSplitType()
-    //     }
-    //   })
-    // },
+    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.orderFormData.workPlaceCode)
+          this.queueStatus = item.queueStatus
+        }
+
+      })
+
+    },
     findCurWorkPlaces(val) {
       let query = {
         // chargeUser: _this.$store.getters.userId,
@@ -1751,6 +1755,17 @@ export default {
       if (this.getDMHotskeyValue(this.scanCode)) {
         return
       }
+
+      if (!this.scanCode.includes("DMQ")){
+        if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode){
+          this.$message.warning('当前工位无需按货位上架')
+          return;
+        }else  if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode){
+          this.$message.warning('当前工位需按货位上架')
+          return;
+        }
+      }
+
       this.codeFormData.code = this.scanCode.trim()
 
       if (this.codeFormData.code.includes(';')) {
@@ -2018,7 +2033,7 @@ export default {
 
     init() {
       //页面初始化
-
+      this.findAllWorkPlaces()
       this.codeFormData.code = ''
       if (this.splitType == 'search') {
       } else if (this.splitType == 'out') {