From 835b057dbc00926be32bbbe9745db579861e7ebc Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Tue, 31 Oct 2023 16:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Upkeep/index.vue      | 23 ++++++++++++++++++++---
 src/pages/mes/ChangePalletNew/index.vue   | 22 ++++++++++++++++++----
 src/pages/mes/PalletChange/index.vue      |  6 +++++-
 src/pages/mes/Pallethandling/index.vue    | 10 +++++-----
 src/pages/mes/ProductionQtyInsp/index.vue | 20 +++++++++++++++++---
 src/pages/shouye/me.vue                   |  2 +-
 6 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index cb41751..3c3e3f0 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -59,6 +59,7 @@
         </u-col>
       </u-row>
     </view>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -107,15 +108,28 @@ export default class ChangePalletNew extends BasePage {
   locationStatus: any = 1;
   async query() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
+        title: '请输入RFID',
+        type: 'default',
+      });
       return;
     }
     await this.model.queryOrderNo(this.orderNo);
     //console.log('???',model.orderNoItemList)
     if (model.orderNoItemList == undefined) {
-      this.customToast('该rfid未查到数据，请使用正确的rfid！');
+      (this.$refs.uToast as any).show({
+        title: '该rfid未查到数据，请使用正确的rfid！',
+        type: 'default',
+      });
     } else {
       this.orderNoItemList = model.orderNoItemList;
+      if (this.orderNoItemList.productCode == 'EmptyPallet') {
+        (this.$refs.uToast as any).show({
+          title: '该rfid未查到数据，请使用正确的rfid',
+          type: 'default',
+        });
+        return;
+      }
     }
     //console.log('this.orderNoItemList', this.orderNoItemList);
   }
@@ -128,7 +142,10 @@ export default class ChangePalletNew extends BasePage {
   }
   async onsubmit() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
+        title: '请输入RFID',
+        type: 'default',
+      });
       return;
     }
     var currentDate = new Date();
diff --git a/src/pages/mes/ChangePalletNew/index.vue b/src/pages/mes/ChangePalletNew/index.vue
index 4a6902c..71d5953 100644
--- a/src/pages/mes/ChangePalletNew/index.vue
+++ b/src/pages/mes/ChangePalletNew/index.vue
@@ -59,6 +59,7 @@
         </u-col>
       </u-row>
     </view>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -107,15 +108,28 @@ export default class ChangePalletNew extends BasePage {
   locationStatus: any = 1;
   async query() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
+        title: '请输入RFID',
+        type: 'default',
+      });
       return;
     }
     await this.model.queryOrderNo(this.orderNo);
     //console.log('???',model.orderNoItemList)
     if (model.orderNoItemList == undefined) {
-      this.customToast('该rfid未查到数据，请使用正确的rfid！');
+      (this.$refs.uToast as any).show({
+        title: '该rfid未查到数据，请使用正确的rfid',
+        type: 'default',
+      });
     } else {
       this.orderNoItemList = model.orderNoItemList;
+      if (this.orderNoItemList.productCode == 'EmptyPallet') {
+        (this.$refs.uToast as any).show({
+          title: '该rfid未查到数据，请使用正确的rfid',
+          type: 'default',
+        });
+        return;
+      }
     }
     //console.log('this.orderNoItemList', this.orderNoItemList);
   }
@@ -128,11 +142,11 @@ export default class ChangePalletNew extends BasePage {
   }
   async onsubmit() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      this.customToast('请输入RFID');
       return;
     }
     if (Object.keys(this.orderNoItemList).length === 0) {
-      this.customToast('请先查询出nficl数据');
+      this.customToast('请先查询出RFID数据');
       return;
     }
     if (this.productCodelocList.value == '' || this.productCodelocList.value == undefined) {
diff --git a/src/pages/mes/PalletChange/index.vue b/src/pages/mes/PalletChange/index.vue
index 54fc0d6..9cf7d44 100644
--- a/src/pages/mes/PalletChange/index.vue
+++ b/src/pages/mes/PalletChange/index.vue
@@ -57,6 +57,7 @@
         </u-col>
       </u-row>
     </view>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -111,7 +112,10 @@ export default class PalletChange extends BasePage {
   locationStatus: any = -1;
   async query() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
+        title: '请输入RFID',
+        type: 'default',
+      });
       return;
     }
     this.isshow = false;
diff --git a/src/pages/mes/Pallethandling/index.vue b/src/pages/mes/Pallethandling/index.vue
index d79d1e4..eae7662 100644
--- a/src/pages/mes/Pallethandling/index.vue
+++ b/src/pages/mes/Pallethandling/index.vue
@@ -123,7 +123,7 @@ export default class ChangePalletNew extends BasePage {
   async query() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
       (this.$refs.uToast as any).show({
-        title: '请输入nficl',
+        title: '请输入RFID',
         type: 'default',
       });
       return;
@@ -158,14 +158,14 @@ export default class ChangePalletNew extends BasePage {
     console.log(this.productCodeList.value == '' || this.productCodeList.value == undefined, this.productCodeList.value);
     if (this.orderNo == '' || this.orderNo.length == 0) {
       (this.$refs.uToast as any).show({
-        title: '请输入nficl',
+        title: '请输入RFID',
         type: 'default',
       });
       return;
     }
     if (Object.keys(this.orderNoItemList).length === 0) {
       (this.$refs.uToast as any).show({
-        title: '请先查询出nficl数据',
+        title: '请先查询出RFID数据',
         type: 'default',
       });
       return;
@@ -215,7 +215,7 @@ export default class ChangePalletNew extends BasePage {
       reqTime: formattedDate,
       sku: this.orderNoItemList.productCode,
       spec: this.orderNoItemList.productSpc,
-      productionState: this.productCodelocList.value, //缓存区：2或者3，成品2，烘房3
+      productionState: this.productCodelocList.value.toString(), //缓存区：2或者3，成品2，烘房3
       //location: this.location,
       destinationAddress: this.DestinationList.value, //库位，其中 库位是根据选择的缓存区来查询的
       sourceAddress: this.productCodeList.value,
@@ -288,7 +288,7 @@ export default class ChangePalletNew extends BasePage {
   onbind() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
       (this.$refs.uToast as any).show({
-        title: '请输入nficl',
+        title: '请输入RFID',
         type: 'default',
       });
       return;
diff --git a/src/pages/mes/ProductionQtyInsp/index.vue b/src/pages/mes/ProductionQtyInsp/index.vue
index c785428..7ca1616 100644
--- a/src/pages/mes/ProductionQtyInsp/index.vue
+++ b/src/pages/mes/ProductionQtyInsp/index.vue
@@ -92,6 +92,7 @@
         </u-col>
       </u-row>
     </view>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -227,15 +228,28 @@ export default class productCheckReceipt extends BasePage {
   }
   async query() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
+        title: '请输入RFID',
+        type: 'default',
+      });
       return;
     }
     await this.model.queryOrderNo(this.orderNo);
     //console.log('???',model.orderNoItemList)
     if (model.orderNoItemList == undefined) {
-      this.customToast('该rfid未查到数据，请使用正确的rfid！');
+      (this.$refs.uToast as any).show({
+        title: '该rfid未查到数据，请使用正确的rfid',
+        type: 'default',
+      });
     } else {
       this.orderNoItemList = model.orderNoItemList;
+      if (this.orderNoItemList.productCode == 'EmptyPallet') {
+        (this.$refs.uToast as any).show({
+          title: '该rfid未查到数据，请使用正确的rfid',
+          type: 'default',
+        });
+        return;
+      }
     }
     //console.log('this.orderNoItemList', this.orderNoItemList);
   }
@@ -255,7 +269,7 @@ export default class productCheckReceipt extends BasePage {
   barcode: any = '';
   async onSubmit() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      this.customToast('请输入RFID');
       return;
     }
     if (Object.keys(this.orderNoItemList).length === 0) {
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 2101343..59957c2 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.4';
+  version = '0.0.6';
   checkversion: any = {};
   onLoad() {
     // this.model.getMenuList();