From bf493bd65c8d9cbea84c5773294e47dfdfee7802 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 26 Sep 2023 18:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=9C=BA=E5=8F=B0=E8=AE=BE=E7=BD=AErf?=
 =?UTF-8?q?id=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/PalletChange/index.vue | 19 ++++++++++++++++++-
 src/utils/url.ts                     |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/pages/mes/PalletChange/index.vue b/src/pages/mes/PalletChange/index.vue
index 3060f26..2155860 100644
--- a/src/pages/mes/PalletChange/index.vue
+++ b/src/pages/mes/PalletChange/index.vue
@@ -13,6 +13,7 @@
         <view class="single-left">
           <view>rfid:</view>
           <u-search placeholder="请扫描" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
+          <!-- <uni-icons type="scan" size="25" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 10rpx"></uni-icons> -->
         </view>
         <view class="single-right">
           <u-button type="primary" @click="query">查询</u-button>
@@ -127,6 +128,11 @@ export default class PalletChange extends BasePage {
         }
       }
     }
+    stationNos.map((item) => ({
+      label: item.equipmentName,
+      value: item.equipmentCode,
+      ...item,
+    }));
     this.oldstationNos = stationNos;
   }
   generateGUID() {
@@ -164,7 +170,7 @@ export default class PalletChange extends BasePage {
       // productionState: this.productCodeList.value,
     };
     await this.model.palletInforUpdate(params);
-    if (model.SubmitCode == 10) {
+    if (model.SubmitCode == 200) {
       this.uni.showToast({ title: '成功' });
       this.Clear();
     }
@@ -176,6 +182,7 @@ export default class PalletChange extends BasePage {
     this.productCodeList = {};
     this.productCodeTypeList = {};
     this.shouciFocus = false;
+    this.isshow = false;
     this.$nextTick(() => {
       this.shouciFocus = true;
     });
@@ -196,6 +203,16 @@ export default class PalletChange extends BasePage {
     await this.model.getAllEquipmentsle(params);
     this.DictList = model.seleDictList;
   }
+  scanCodeOne() {
+    uni.scanCode({
+      scanType: ['barCode'],
+      success: function (res) {
+        console.log('条码类型：' + res.scanType);
+        console.log('条码内容：' + res.result);
+        this.orderNo = res.result;
+      },
+    });
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 6afeb6b..0618ec2 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
+const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
 export const url = {
   wmspda: {
     system: {
@@ -22,7 +22,7 @@ export const url = {
       sendDestinationStations: '/api/ReceivingAndFeedingMaterials/sendDestinationStations',
       palletInforUpdate: '/api/ReceivingAndFeedingMaterials/palletInforUpdate',
       getDictList: qianzhuione + '/quality/handCheck/getDictList',
-      requestDestinationStation: qianzhuione + '/mes/wcsInterface/requestDestinationStations',
+      requestDestinationStation: qianzhuione + '/mes/wcsInterface/pdaRequestDestinationStations',
       getAllEquipments: qianzhuione + '/mes/pda/getAllEquipments',
       saveRfidWithEquip: qianzhuione + '/mes/pda/saveRfidWithEquip',
     },