扫码优化

src/pages/proj/Check.vue

@@ -81,7 +81,9 @@ export default {
       try {
         let res = await RFReadTrayStateInventory(val)
         if (res.ErrNO === '1') {
-          this.$refs.myInput2.handleScan()
+          if (this.val2 === '') {
+            this.$refs.myInput2.handleScan()
+          }
           this._RFReadTrayStorageInventory()
         } else {
           this.toast(res.ErrMsg)
@@ -90,6 +92,7 @@ export default {
         }
       } catch (e) {
         this.val1 = ''
+        this.$refs.myInput1.handleScan()
       }
     },
     /** 托盘待盘点信息 */
@@ -107,6 +110,9 @@ export default {
         let res = await RFReadMatBarCodeStateInventory(this.val1, val)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          if (this.val1 === '') {
+            this.$refs.myInput1.handleScan()
+          }
         } else {
           this.toast(res.ErrMsg)
           this.val2 = ''
@@ -114,14 +120,27 @@ export default {
         }
       } catch (e) {
         this.val2 = ''
+        this.$refs.myInput2.handleScan()
       }
     },
     handleChange1 (e, type) {
+      if (type && e.substring(0, 2) !== 'ZD') {
+        this.val1 = ''
+        this.val2 = e
+        this._RFReadMatBarCodeStateInventory(this.val2)
+        return
+      }
       if (type) {
         this._RFReadTrayStateInventory(e)
       }
     },
     handleChange2 (e, type) {
+      if (type && e.substring(0, 2) === 'ZD') {
+        this.val1 = e
+        this.val2 = ''
+        this._RFReadTrayStateInventory(this.val1)
+        return
+      }
       if (type) {
         this._RFReadMatBarCodeStateInventory(e)
       }
@@ -138,10 +157,11 @@ export default {
         let res = await RFStorageInventory(this.val1, this.val2, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          this._RFReadTrayStorageInventory()
         } else {
           this.Dialog(res.ErrMsg)
         }
-        this.toCancle()
+        this.disabled = false
       } catch (e) {
         this.disabled = false
       }

src/pages/proj/GroupDisk.vue

@@ -98,7 +98,9 @@ export default {
         let res = await rfReadTrayStatePackage(val)
         if (res.ErrNO === '1') {
           // this.toast(res.ErrMsg)
-          this.$refs.myInput2.handleScan()
+          if (this.val2 === '') {
+            this.$refs.myInput2.handleScan()
+          }
           this._rfReadTrayStoragePackage()
         } else {
           this.toast(res.ErrMsg)
@@ -107,6 +109,7 @@ export default {
         }
       } catch (e) {
         this.val1 = ''
+        this.$refs.myInput1.handleScan()
       }
     },
     /** 托盘库存信息 */
@@ -124,6 +127,9 @@ export default {
         let res = await rfReadMatBarCodeStatePackage(this.val1, val)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          if (this.val1 === '') {
+            this.$refs.myInput1.handleScan()
+          }
         } else {
           this.toast(res.ErrMsg)
           this.val2 = ''
@@ -131,14 +137,27 @@ export default {
         }
       } catch (e) {
         this.val2 = ''
+        this.$refs.myInput2.handleScan()
       }
     },
     handleChange1 (e, type) {
+      if (type && e.substring(0, 2) !== 'ZD') {
+        this.val1 = ''
+        this.val2 = e
+        this._rfReadMatBarCodeStatePackage(this.val2)
+        return
+      }
       if (type) {
         this._rfReadTrayStatePackage(e)
       }
     },
     handleChange2 (e, type) {
+      if (type && e.substring(0, 2) === 'ZD') {
+        this.val1 = e
+        this.val2 = ''
+        this._rfReadTrayStatePackage(this.val1)
+        return
+      }
       if (type) {
         this._rfReadMatBarCodeStatePackage(e)
       }
@@ -155,10 +174,11 @@ export default {
         let res = await rfTrayPackage(this.val1, this.val2, this.option[this.active].value, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          this._rfReadTrayStoragePackage()
         } else {
           this.Dialog(res.ErrMsg)
         }
-        this.toCancle()
+        this.disabled = false
       } catch (e) {
         this.disabled = false
       }

src/pages/proj/OpenDisk.vue

@@ -80,6 +80,7 @@ export default {
         }
       } catch (e) {
         this.val1 = ''
+        this.$refs.myInput1.handleScan()
       }
     },
     /** 托盘库存信息 */
@@ -92,6 +93,11 @@ export default {
       }
     },
     handleChange1 (e, type) {
+      if (type && e.substring(0, 2) !== 'ZD') {
+        this.val1 = ''
+        this.$refs.myInput1.handleScan()
+        return
+      }
       if (type) {
         this._rfReadTrayStateUnPackage(e)
       }
@@ -108,10 +114,11 @@ export default {
         let res = await rfTrayUnPackage(this.val1, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          this._rfReadTrayStorageUnPackage()
         } else {
           this.Dialog(res.ErrMsg)
         }
-        this.toCancle()
+        this.disabled = false
       } catch (e) {
         this.disabled = false
       }

src/pages/proj/PickGoods.vue

@@ -81,7 +81,9 @@ export default {
       try {
         let res = await RFReadTrayStatePick(val)
         if (res.ErrNO === '1') {
-          this.$refs.myInput2.handleScan()
+          if (this.val2 === '') {
+            this.$refs.myInput2.handleScan()
+          }
           this._RFReadTrayStoragePick()
         } else {
           this.toast(res.ErrMsg)
@@ -90,6 +92,7 @@ export default {
         }
       } catch (e) {
         this.val1 = ''
+        this.$refs.myInput1.handleScan()
       }
     },
     /** 托盘库存信息 */
@@ -107,6 +110,9 @@ export default {
         let res = await RFReadMatBarCodeStatePick(this.val1, val)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          if (this.val1 === '') {
+            this.$refs.myInput1.handleScan()
+          }
         } else {
           this.toast(res.ErrMsg)
           this.val2 = ''
@@ -114,14 +120,27 @@ export default {
         }
       } catch (e) {
         this.val2 = ''
+        this.$refs.myInput2.handleScan()
       }
     },
     handleChange1 (e, type) {
+      if (type && e.substring(0, 2) !== 'ZD') {
+        this.val1 = ''
+        this.val2 = e
+        this._RFReadMatBarCodeStatePick(this.val2)
+        return
+      }
       if (type) {
         this._RFReadTrayStatePick(e)
       }
     },
     handleChange2 (e, type) {
+      if (type && e.substring(0, 2) === 'ZD') {
+        this.val1 = e
+        this.val2 = ''
+        this._RFReadTrayStatePick(this.val1)
+        return
+      }
       if (type) {
         this._RFReadMatBarCodeStatePick(e)
       }
@@ -138,10 +157,11 @@ export default {
         let res = await RFStoragePick(this.val1, this.val2, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
+          this._RFReadTrayStoragePick()
         } else {
           this.Dialog(res.ErrMsg)
         }
-        this.toCancle()
+        this.disabled = false
       } catch (e) {
         this.disabled = false
       }