上货

src/views/collect/IoCreateOrder.vue

@@ -438,7 +438,7 @@ export default {
   },
   data() {
     return {
-      queueStatus:null,
+      queueStatus: null,
       busTypeList: [],
       busQuery: {
         busKey: '',
@@ -1075,7 +1075,6 @@ export default {
       }
       getUserBindWork(query).then((res) => {
         this.allWorkPlaces = res.data.list || [];
-
         {
           let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
           this.queueStatus = item.queueStatus
@@ -1755,19 +1754,16 @@ export default {
       if (this.getDMHotskeyValue(this.scanCode)) {
         return
       }
-
+      if (!this.scanCode.includes("DMQ")) {
-      if (!this.scanCode.includes("DMQ")){
+        if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) {
-        if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode){
           this.$message.warning('当前工位无需按货位上架')
           return;
-        }else  if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode){
+        } else if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) {
           this.$message.warning('当前工位需按货位上架')
           return;
         }
       }
-
       this.codeFormData.code = this.scanCode.trim()
-
       if (this.codeFormData.code.includes(';')) {
         const codeArray = this.codeFormData.code.split(';')
         let params = {
@@ -1788,7 +1784,6 @@ export default {
           codeList: codeArray
         }
         //剔除码
-
         this.removeCodesTemp(query)
       } else {
         enterCodeWeb(tQuery).then((response) => {
@@ -1939,9 +1934,13 @@ export default {
           console.log('字符串不是有效的 JSON 格式')
         }
       } else if (str.includes("DMQ")) {
+
         let query = {
           code: this.scanCode
         }
+        if (str != null) {
+          query.code = str
+        }
         getByCode(query).then((response) => {
           this.loading = false;
           if (response.code == 20000) {
@@ -1954,7 +1953,6 @@ export default {
         })
         return true
       }
-
       return false
     },
     printCodeResult(data, isSuccess) {
@@ -2202,6 +2200,29 @@ export default {
     },
     handleScanComplete(fullScanData) {
       console.log('接收 recCodes event:', fullScanData.join(';'))
+      if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) {
+        if (fullScanData != null && fullScanData[0].includes("DMQ")) {
+          this.getDMHotskeyValue(fullScanData[0])
+          return;
+        }
+      } else if (this.queueStatus == "1" && this.orderFormData.workPlaceQueueCode != null) {
+        if (fullScanData != null && fullScanData[0].includes("DMQ")) {
+          this.$message.warning('当前上货已绑定货位，请勿重复绑定！');
+          return;
+        }
+      }
+      // if (!fullScanData.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;
+      //   }
+      // } else if (this.queueStatus == "1") {
+      //   this.getDMHotskeyValue(fullScanData[0]);
+      // }
+
       if (this.scanStatus == 1) {
         let query = {
           orderId: this.orderFormData.billNo,