From aa8c01c51b4ea6c6e135506b520122027cb41ff2 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Mon, 17 Jan 2022 18:01:17 +0800
Subject: [PATCH] =?UTF-8?q?SAP=E5=BA=93=E4=BD=8D=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                          |  1 +
 src/i18n/lang/en.ts                          |  1 +
 src/pages/raw/handover/picking/ByOrder.vue   | 12 ++++++++++++
 src/pages/raw/handover/picking/BySummary.vue | 11 +++++++++++
 src/pages/raw/handover/picking/config.ts     |  6 ++++--
 src/pages/raw/handover/returning/index.vue   |  3 ---
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 9830668..ba00d73 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -63,6 +63,7 @@ export default {
     po_Supplier: '供应商',
     po_OrderType: '订单类型',
     po_Location: '库存地点',
+    SAPLocation:'所选物料没有SAP库位，请重新选择',
     po_PleaseScan: '请扫描PO单号',
     po_PleaseScanMATcode: '请扫描物料条码',
     PleaseScan: '请扫描',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index f84290d..05d1e1d 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -186,6 +186,7 @@ export default {
     return_OperatorName: 'Return by',
     return_Type: 'Return type',
     return_Tip1: 'Return by cannot be empty',
+    SAPLocation: 'There is no SAP location for the selected material, please select again',
     return_Tip2: 'Factory code cannot be empty',
     return_Tip3: 'Qty cannot be empty',
     return_Tip4: 'Return Qty cannot be greater than total Qty',
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index 6eaccf3..4ea5057 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -152,6 +152,18 @@ export default class RawReceiptDetail extends BasePage {
     this.wlCode = e.pickerName;
   }
   handleRow({ data }: any) {
+    console.log('data[0]', data[0]);
+    if (!this.model.proOrderResultList[data[0].index].sendSpot) {
+      uni.showModal({
+        content: this.$t('message.SAPLocation') as any,
+        success: (res) => {
+          if (res.confirm) {
+            this.model.proOrderResultList[data[0].index].checked = false;
+          }
+        },
+      });
+      return;
+    }
     this.someIndex = data[0].index;
     this.some = data[0].lineData;
     this.model.proOrderResultList[this.someIndex].wlList = [];
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index 3ae69e6..ae3413b 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -140,6 +140,17 @@ export default class RawReceiptDetail extends BasePage {
   }
   //选取某一条需要分配库位的物料数据
   handleRow({ data }: any) {
+    if (!this.model.aggregateList[data[0].index].sendSpot) {
+      uni.showModal({
+        content: this.$t('message.SAPLocation') as any,
+        success: (res) => {
+          if (res.confirm) {
+            this.model.aggregateList[data[0].index].checked = false;
+          }
+        },
+      });
+      return;
+    }
     this.someIndex = data[0].index;
     this.some = data[0].lineData;
     this.model.aggregateList[this.someIndex].wlList = [];
diff --git a/src/pages/raw/handover/picking/config.ts b/src/pages/raw/handover/picking/config.ts
index 481b56c..0b192f6 100644
--- a/src/pages/raw/handover/picking/config.ts
+++ b/src/pages/raw/handover/picking/config.ts
@@ -167,7 +167,8 @@ export const orderHeaders = [
   {
     label: vm.$t('message.po_Location'),
     // key: 'currentWkposCode',
-    key: 'wkposCode',
+    //key: 'wkposCode',
+    key: 'sendSpot',
   },
   {
     label: vm.$t('message.po_MaterielDes'),
@@ -189,7 +190,8 @@ export const orderHeaders = [
   },
   {
     label: vm.$t('message.Pi_Station'),
-    key: 'sendSpot',
+    //key: 'sendSpot',
+    key: 'wkposCode',
   },
   {
     label: vm.$t('message.Pi_OrderNo'),
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index a2ef133..7b737ef 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -322,8 +322,5 @@ export default class returningDom extends BasePage {
     box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
     padding: 20rpx;
   }
-
-  .button-bar {
-  }
 }
 </style>