From 3dbd103bff31c15eb2c6d6ca56461bc8766816ff Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Wed, 10 Aug 2022 16:02:57 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E5=A4=87=E4=BB=B6=E4=B8=8B=E6=9E=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
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                           |  3 ++-
 src/i18n/lang/ru.ts                           |  1 +
 .../SpareInbound/sparePartsShelves/index.vue  | 26 +++++++++----------
 .../SpareInbound/sparePartsShelves/model.ts   |  4 +--
 src/utils/url.ts                              |  2 ++
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 93d2651..a237345 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -478,5 +478,6 @@ export default {
     shelvesCode: '上架单号',
     plan: '计划数量',
     QuantityShelves: '已上架数量',
+    TheShelves: '已下架数量',
   },
 };
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index ffe726a..8120fd1 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -477,6 +477,7 @@ export default {
     SparePartsOutbound: 'outbound',
     shelvesCode: 'Code',
     plan: 'Plan QTY',
-    QuantityShelves: 'Shelves QTY',
+    QuantityShelves: 'Putaway QTY',
+    TheShelves: 'Shelves QTY',
   },
 };
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index bf473b2..4003cde 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -478,5 +478,6 @@ export default {
     shelvesCode: 'номер',
     plan: 'план',
     QuantityShelves: 'На крыше',
+    TheShelves: 'С полок',
   },
 };
diff --git a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue
index f24afed..f271970 100644
--- a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue
+++ b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue
@@ -38,14 +38,14 @@
       <u-form-item :label="$t('message.plan')">
         <u-input :disabled="true" v-model="histroyItem.qty" placeholder="" />
       </u-form-item>
-      <!-- 已上架数量 -->
-      <u-form-item :label="$t('message.QuantityShelves')">
+      <!-- 已下架数量 -->
+      <u-form-item :label="$t('message.TheShelves')">
         <u-input :disabled="true" v-model="histroyItem.actualQty" placeholder="" />
       </u-form-item>
       <!-- 库位 -->
-      <u-form-item :label="$t('message.CommissionedLocation')">
+      <!-- <u-form-item :label="$t('message.CommissionedLocation')">
         <jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.WlList" />
-      </u-form-item>
+      </u-form-item> -->
       <!-- 条码 -->
       <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
         <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="barcode" @search="onSubmit" :show-action="false"></u-search>
@@ -78,14 +78,14 @@ import { session } from '@/store/modules/session';
 })
 export default class productCheckReceipt extends BasePage {
   model = model;
-  remove: any = {};
-  async onReady() {
-    await this.model.queryLocation();
-    this.remove = this.model.WlList[0];
-  }
-  selectItem(e: any) {
-    this.remove = e.pickerName;
-  }
+  // remove: any = {};
+  // async onReady() {
+  //   await this.model.queryLocation();
+  //   this.remove = this.model.WlList[0];
+  // }
+  // selectItem(e: any) {
+  //   this.remove = e.pickerName;
+  // }
   orderNo: any = '';
   productCodeList: any = {};
   async query() {
@@ -128,7 +128,7 @@ export default class productCheckReceipt extends BasePage {
       productDescZh: this.histroyItem.productDescZh,
       orderType: this.histroyItem.orderType,
       barcode: this.barcode,
-      locCode: this.remove.value,
+      // locCode: this.remove.value,
     };
     await this.model.OnSubmit(params);
     if (this.model.SubmitCode == '1') {
diff --git a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts
index 0964187..30755e6 100644
--- a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts
+++ b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts
@@ -27,7 +27,7 @@ export class wholeTransfer extends VuexModule {
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryOnshelfOrder, {
+    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
       factoryCode: session.factoryCode,
       loginName: session.loginName,
       orderNo,
@@ -42,7 +42,7 @@ export class wholeTransfer extends VuexModule {
   SubmitCode: any = '';
   @MutationAction
   async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.upshelf, params);
+    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }
diff --git a/src/utils/url.ts b/src/utils/url.ts
index b9cd044..8199617 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -267,7 +267,9 @@ export const url = {
       getMdLocationSfgLine: '/wmspda/fg/getMdLocationSfgLine',
       getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation',
       queryOnshelfOrder: '/wmspda/sparePart/queryOnshelfOrder',
+      queryDownshelfOrder: '/wmspda/sparePart/queryDownshelfOrder',
       upshelf: '/wmspda/sparePart/upshelf-scan',
+      offshelf: '/wmspda/sparePart/offshelf-scan',
     },
     wholeLnventory: {
       content: '/wmspda/fg/findMaterialByPddNo',