From 22e24049d05e0f2df0559cb6dff374905fa21098 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Tue, 2 Aug 2022 14:42:02 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.ts                           |  4 +-
 .../Semi-finished/Semi-finished-SO/index.vue  | 77 ++++++++++++-------
 .../Semi-finished-offline/index.vue           | 14 ++++
 src/pages/raw/commission/RUS-Out/index.vue    | 10 ++-
 .../raw/commission/RUS-entrant/index.vue      | 10 ++-
 .../raw/handover/RUS-returning/index.vue      |  5 ++
 .../raw/handover/feeding/RUS-Location.vue     |  3 +
 .../raw/ingoods/RUS-dnReceipt/dnReceiving.vue |  4 +
 .../ingoods/RUS-dnReturnGoods/Location.vue    |  4 +
 .../raw/warehouse/RUS-rowCollect/index.vue    |  3 +
 .../raw/warehouse/RUS-rowScrap/index.vue      |  2 +
 .../raw/warehouse/RUS-rowTransfer/index.vue   |  3 +
 12 files changed, 109 insertions(+), 30 deletions(-)

diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index ed3657e..af7b1d4 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -180,8 +180,8 @@ export default {
     Pi_QuantityHandedOver: 'Handedover Qty',
     Pi_distribution: 'Distribution',
     successful: 'Query was successful',
-    ModelCode: 'Model code',
-    ModelName: 'Model name',
+    ModelCode: 'code',
+    ModelName: 'material',
     ModelScanned: 'Model scanned',
     Pi_tip13: 'Please select the material to submit',
     Pi_tip15: 'Please ensure that the handover quantity is equal to the demand quantity',
diff --git a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
index 5d88b48..5b8cb11 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
@@ -43,17 +43,6 @@
           <u-input placeholder=" " v-model="every.outAmount" :type="type" :border="border" class="input" style="padding: '0'" disabled />
         </view>
       </view>
-      <!-- 库位 -->
-      <view class="library">
-        <view class="library-left">
-          <view>{{ $t('message.CommissionedLocation') }}</view>
-          <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Loc" />
-        </view>
-        <view class="library-right">
-          <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :border="border" class="input" />
-        </view>
-      </view>
       <!-- 条码 -->
       <view class="single">
         <view class="single-left">
@@ -64,6 +53,17 @@
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
         </view>
       </view>
+      <!-- 库位 -->
+      <view class="library">
+        <view class="library-left">
+          <view>{{ $t('message.CommissionedLocation') }}</view>
+          <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Loc" />
+        </view>
+        <view class="library-right">
+          <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
+          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :disabled="disabled" :border="border" class="input" />
+        </view>
+      </view>
       <!-- 添加 -->
       <!-- <view class="add">
         <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -102,6 +102,7 @@ import model from './model';
 export default class SemiFinishedSO extends BasePage {
   model = model;
   detailHeader = detailHeader;
+  disabled = false;
   form: any = {
     documentNo: '',
   };
@@ -193,6 +194,10 @@ export default class SemiFinishedSO extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.Loc = [];
+    this.Container = '';
+    this.nowAmount = '';
+    this.disabled = false;
     let params = {
       productCode: this.every.materialCode,
       barcode: this.Barcode,
@@ -204,7 +209,14 @@ export default class SemiFinishedSO extends BasePage {
       label: this.Container.locCode + '(' + this.Container.locCodesendSpot + ')',
     });
     this.wlCode = this.Loc[0];
-    this.nowAmount = 1;
+    // this.nowAmount = 1;
+    if (this.Container.cpRef4 == null) {
+      this.nowAmount = parseFloat(this.Container.qty);
+      this.disabled = true;
+    } else {
+      this.nowAmount = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
+      this.disabled = true;
+    }
   }
   //点击添加
   Add() {
@@ -225,26 +237,38 @@ export default class SemiFinishedSO extends BasePage {
         return;
       }
     }
-    let codenum = 0;
+    // let codenum = 0;
+    // if (this.list.length != 0) {
+    //   this.list.forEach((item: any) => {
+    //     if (item.barCode == this.Container.barcode) {
+    //       num += parseFloat(item.receiptAmount);
+    //     }
+    //   });
+    // }
+    // if (this.Container.cpRef4 == null) {
+    //   if (parseFloat(this.nowAmount) + codenum > this.Container.qty) {
+    //     this.customToast(this.$t('message.AppendMateriel3') as any);
+    //     console.log('3');
+    //     return;
+    //   }
+    // } else {
+    //   if (parseFloat(this.nowAmount) + codenum > this.Container.qty - parseFloat(this.Container.cpRef4)) {
+    //     this.customToast(this.$t('message.AppendMateriel3') as any);
+    //     console.log('4');
+    //     return;
+    //   }
+    // }
+    let isTrue = true;
     if (this.list.length != 0) {
       this.list.forEach((item: any) => {
         if (item.barCode == this.Container.barcode) {
-          num += item.receiptAmount;
+          return (isTrue = false);
         }
       });
     }
-    if (this.Container.cpRef4 == null) {
-      if (parseFloat(this.nowAmount) + codenum > this.Container.qty) {
-        this.customToast(this.$t('message.AppendMateriel3') as any);
-        console.log('3');
-        return;
-      }
-    } else {
-      if (parseFloat(this.nowAmount) + codenum > this.Container.qty - parseFloat(this.Container.cpRef4)) {
-        this.customToast(this.$t('message.AppendMateriel3') as any);
-        console.log('4');
-        return;
-      }
+    if (isTrue != true) {
+      this.customToast(this.$t('message.repeatedly') as any);
+      return;
     }
     if (!this.every) {
       this.customToast(this.$t('message.Commission_tips6') as any);
@@ -305,6 +329,7 @@ export default class SemiFinishedSO extends BasePage {
       this.nowAmount = '';
       this.Barcode = '';
       this.Container = '';
+      this.disabled = false;
     }
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
index b4a073f..e00b906 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
@@ -129,6 +129,8 @@ export default class finishProductOfflineDom extends BasePage {
     }
     this.every = this.model.materielList[this.model.materielList.length - 1];
     console.log(this.form.aimWl);
+    await this.model.queryReturningTypeList();
+    this.wlcodeList = this.model.returningTypeList;
     let list: any = [];
     this.wlcodeList.forEach((item: any) => {
       if (item.sendSpot == this.every.sendSpot) {
@@ -157,6 +159,18 @@ export default class finishProductOfflineDom extends BasePage {
       this.customToast(this.$t('message.product_Tip3') as string);
       return;
     }
+    let isTrue = true;
+    if (this.materielList.length != 0) {
+      this.materielList.forEach((item: any) => {
+        if (item.barcode == this.form.barCode) {
+          return (isTrue = false);
+        }
+      });
+    }
+    if (isTrue != true) {
+      this.customToast(this.$t('message.repeatedly') as string);
+      return;
+    }
     this.materielList.push(this.every);
     this.materielList[this.materielList.length - 1].locCode = this.form.aimWl.label;
   }
diff --git a/src/pages/raw/commission/RUS-Out/index.vue b/src/pages/raw/commission/RUS-Out/index.vue
index 5b3d238..ea52060 100644
--- a/src/pages/raw/commission/RUS-Out/index.vue
+++ b/src/pages/raw/commission/RUS-Out/index.vue
@@ -221,6 +221,8 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.Container = '';
+    this.nowAmount = '';
     let params = {
       productCode: this.every.materialCode,
       barcode: this.Barcode,
@@ -262,7 +264,7 @@ export default class dnReceiptDom extends BasePage {
     if (this.list.length != 0) {
       this.list.forEach((item: any) => {
         if (item.barCode == this.Container.barcode) {
-          num += parseFloat(item.nowAmount);
+          codenum += parseFloat(item.nowAmount);
         }
       });
     }
@@ -310,6 +312,9 @@ export default class dnReceiptDom extends BasePage {
             this.list.push(arr);
             this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].nowAmount);
             this.nowAmount = '';
+            this.Container = '';
+            this.Loc = [];
+            this.Barcode = '';
           } else if (res.cancel) {
             return;
           }
@@ -329,6 +334,9 @@ export default class dnReceiptDom extends BasePage {
       this.list.push(arr);
       this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].nowAmount);
       this.nowAmount = '';
+      this.Container = '';
+      this.Loc = [];
+      this.Barcode = '';
     }
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/commission/RUS-entrant/index.vue b/src/pages/raw/commission/RUS-entrant/index.vue
index d294111..fc40d81 100644
--- a/src/pages/raw/commission/RUS-entrant/index.vue
+++ b/src/pages/raw/commission/RUS-entrant/index.vue
@@ -69,7 +69,7 @@
         </view>
         <view class="library-right">
           <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
+          <u-input v-model="receiptAmount" :disabled="disabled" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
         </view>
       </view>
       <!-- 添加 -->
@@ -110,6 +110,7 @@ import { url } from '@/utils/url';
 })
 export default class dnReceiptDom extends BasePage {
   model = model;
+  disabled = false;
   form: any = {
     documentNo: '',
   };
@@ -314,6 +315,8 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.Container = '';
+    this.receiptAmount = '';
     let params = {
       dnNo: this.form.documentNo,
       poNo: this.poNo,
@@ -324,6 +327,7 @@ export default class dnReceiptDom extends BasePage {
     await this.model.searchBarcode(params);
     this.Container = this.model.ContainerCode;
     this.receiptAmount = parseFloat(this.Container.requestAmount);
+    this.disabled = true;
   }
   //点击添加
   Add() {
@@ -380,7 +384,10 @@ export default class dnReceiptDom extends BasePage {
       });
       this.DNReceivingList[this.everyIndex].receiptAmount = num;
       this.receiptAmount = '';
+      this.Container = '';
+      this.Barcode = '';
       this.every = this.DNReceivingList[this.everyIndex];
+      this.disabled = false;
     }
   }
   deleteItem(e: any) {
@@ -442,6 +449,7 @@ export default class dnReceiptDom extends BasePage {
     await this.query();
   }
   empty() {
+    this.disabled = false;
     this.LocationList = [];
     this.Location = [];
     this.poNo = '';
diff --git a/src/pages/raw/handover/RUS-returning/index.vue b/src/pages/raw/handover/RUS-returning/index.vue
index c7ac860..6ba735e 100644
--- a/src/pages/raw/handover/RUS-returning/index.vue
+++ b/src/pages/raw/handover/RUS-returning/index.vue
@@ -150,12 +150,14 @@ export default class returningDom extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.Container = '';
     let params = {
       productCode: this.materieCode.value,
       barcode: this.Barcode,
     };
     await this.model.searchBarcode(params);
     this.Container = this.model.ContainerCode;
+    this.Location = [];
     let arr = {
       label: this.Container.locCode,
       value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
@@ -223,6 +225,9 @@ export default class returningDom extends BasePage {
     this.LocationList[this.LocationList.length - 1].operatorPass = this.operator;
     this.LocationList[this.LocationList.length - 1].wkposCode = this.wlCode.label;
     this.model.materielList[this.checkindex].totalAmount = this.accSubtract(this.LocationList[this.LocationList.length - 1].totalAmount, this.qty);
+    this.Container = '';
+    this.Barcode = '';
+    this.qty = '';
   }
   deleteItem(e: any) {
     uni.showModal({
diff --git a/src/pages/raw/handover/feeding/RUS-Location.vue b/src/pages/raw/handover/feeding/RUS-Location.vue
index 291513c..8cde0c8 100644
--- a/src/pages/raw/handover/feeding/RUS-Location.vue
+++ b/src/pages/raw/handover/feeding/RUS-Location.vue
@@ -304,6 +304,8 @@ export default class RawReceiptDetail extends BasePage {
       this.customToast(this.$t('message.AppendMateriel5') as string);
       return;
     }
+    this.Container = '';
+    this.qty = '';
     let params = {
       productCode: this.some.materialCode,
       barcode: this.Barcode,
@@ -402,6 +404,7 @@ export default class RawReceiptDetail extends BasePage {
       console.log(' this.model.blDetailList', this.model.blDetailList);
       this.business();
       this.qty = '';
+      this.Container = '';
     }
   }
   deleteItem(e: any): void {
diff --git a/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue
index 00a1cb0..fb8cb6f 100644
--- a/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue
@@ -319,6 +319,8 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message.AppendMateriel5') as string);
       return;
     }
+    this.Container = '';
+    this.receiptAmount = '';
     let params = {
       dnNo: this.form.documentNo,
       poNo: this.poNo,
@@ -381,6 +383,8 @@ export default class dnReceiptDom extends BasePage {
       this.DNReceivingList[this.everyIndex].receiptAmount = num;
       this.receiptAmount = '';
       this.every = this.DNReceivingList[this.everyIndex];
+      this.Container = '';
+      this.Barcode = '';
     }
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue b/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
index 1a3ef72..7425957 100644
--- a/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
@@ -184,6 +184,8 @@ export default class RawReceiptDetail extends BasePage {
       this.customToast(this.$t('message.AppendMateriel5') as string);
       return;
     }
+    this.Container = '';
+    this.qty = '';
     let params = {
       productCode: this.some.materialCode,
       barcode: this.Barcode,
@@ -306,6 +308,8 @@ export default class RawReceiptDetail extends BasePage {
     this.model.dnReturnList[this.someIndex].receiptAmount += parseFloat(this.qty);
     this.LocationList.push(arr);
     this.qty = '';
+    this.Container = '';
+    this.Barcode = '';
   }
   //删除某一项 触发事件
   deleteItem(e: any) {
diff --git a/src/pages/raw/warehouse/RUS-rowCollect/index.vue b/src/pages/raw/warehouse/RUS-rowCollect/index.vue
index 4ec163f..3dd0a56 100644
--- a/src/pages/raw/warehouse/RUS-rowCollect/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowCollect/index.vue
@@ -142,6 +142,8 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.Container = '';
+    this.qty = 0;
     let params = {
       productCode: this.Some.productCode,
       barcode: this.Barcode,
@@ -210,6 +212,7 @@ export default class KanDanHandOver extends BasePage {
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode;
     this.qty = 0;
     this.Container = '';
+    this.Barcode = '';
     this.model.orderInInfoList[this.SomeIndex].totalqty += this.qty;
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue
index 8729e1a..9f03743 100644
--- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue
@@ -154,6 +154,8 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.AppendMateriel5') as string);
       return;
     }
+    this.Container = '';
+    this.qty = '';
     let params = {
       productCode: this.Some.productCode,
       barcode: this.Barcode,
diff --git a/src/pages/raw/warehouse/RUS-rowTransfer/index.vue b/src/pages/raw/warehouse/RUS-rowTransfer/index.vue
index 13c90c3..b109ee4 100644
--- a/src/pages/raw/warehouse/RUS-rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowTransfer/index.vue
@@ -132,6 +132,8 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.Container = '';
+    this.total = 0;
     let params = {
       productCode: this.orderlist.productCode,
       barcode: this.Barcode,
@@ -172,6 +174,7 @@ export default class KanDanHandOver extends BasePage {
     this.model.materielList[this.orderlistIndex].actualQty += parseFloat(this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty);
     this.Barcode = '';
     this.Container = '';
+    this.total = 0;
   }
   deleteItem(e: any) {
     uni.showModal({