From e5d7f6b1910f2b12f410c4848f7837eee0cc4c8b Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 20 Jun 2022 14:39:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=84=E7=BD=97=E6=96=AF=E6=8B=A3=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                           |   2 +
 src/i18n/lang/en.ts                           |   2 +
 .../raw/handover/RUS-picking/ByOrder.vue      | 211 ++++++++++++------
 .../raw/handover/RUS-picking/BySummary.vue    |  51 ++++-
 src/pages/raw/handover/RUS-picking/model.ts   |  16 +-
 src/utils/url.ts                              |   2 +
 6 files changed, 190 insertions(+), 94 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 65f802f..34379ff 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -202,6 +202,7 @@ export default {
     Pi_tip17: '请选择一条DN单',
     Pi_tip18: '请选中要移库的数据',
     Pi_tip19: '只能选择一条修改数量',
+    Pi_tip20: '本次添加数量超过最大可添加数量',
     //汇总交接
     Summary_Query: '汇总查询',
     Summary_Contain: '包含',
@@ -473,6 +474,7 @@ export default {
     AppendMateriel3: '不能大于需求数量，请重新输入',
     AppendMateriel4: '请选择正确的库位',
     AppendMateriel5: '请先选择一个物料',
+    AppendMateriel6: '请先选择一条数据',
     demandQuantity: '总数量大于需求数量',
     //俄罗斯海外PO
     ImportPO: 'PO海外收货',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index b33a8a1..f93d73a 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -42,6 +42,7 @@ export default {
     Pi_tip17: 'Please select a dn list',
     Pi_tip18: 'Please select the data to be moved',
     Pi_tip19: 'Only one item can be selected to modify the quantity',
+    Pi_tip20: 'The number of additions this time exceeds the maximum number of additions.',
     //版本更新
     updatePrompt: 'Update tips',
     Tip1: 'please update!',
@@ -478,6 +479,7 @@ export default {
     AppendMateriel3: 'Cannot be greater than the required quantity, please re-enter',
     AppendMateriel4: 'Please select the correct location',
     AppendMateriel5: 'Please select a material first',
+    AppendMateriel6: 'Please select a piece of data first',
     demandQuantity: 'The total quantity is greater than the demand quantity',
     //俄罗斯海外PO
     ImportPO: 'Import PO Receive',
diff --git a/src/pages/raw/handover/RUS-picking/ByOrder.vue b/src/pages/raw/handover/RUS-picking/ByOrder.vue
index c8bef9b..fe3c447 100644
--- a/src/pages/raw/handover/RUS-picking/ByOrder.vue
+++ b/src/pages/raw/handover/RUS-picking/ByOrder.vue
@@ -2,7 +2,7 @@
   <view class="page-picking-order">
     <view class="header">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
       <view class="title">{{ $t('message.Pi_ByOrderPicking') }}</view>
       <view class="right"> </view>
@@ -29,7 +29,7 @@
       </view>
       <view class="single-left">
         <view>{{ $t('message.Container') }}</view>
-        <u-search :placeholder="$t('message.PleaseScan')" v-model="form.XXXXX" :show-action="false"></u-search>
+        <u-search :placeholder="$t('message.PleaseScan')" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
       </view>
       <view class="library-right">
         <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
@@ -54,7 +54,7 @@
       <u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
         <u-td class="u-td">{{ item.wlCode }}</u-td>
         <u-td class="u-td">{{ item.qty }}</u-td>
-        <u-td class="u-td">{{ item.xxxx }}</u-td>
+        <u-td class="u-td">{{ item.barcode }}</u-td>
         <u-td class="u-td">
           <!-- <div class="u-td" @click="deleteItem(index)">
             {{ $t('message.product_Delete') }}
@@ -127,6 +127,8 @@ export default class RawReceiptDetail extends BasePage {
   Location: any = [];
   someIndex = 0;
   some: any = {};
+  Container: any = {};
+  Barcode: any = '';
   qty: any = '';
   /**
    * 表单数据
@@ -178,27 +180,60 @@ export default class RawReceiptDetail extends BasePage {
     this.model.proOrderResultList[this.someIndex].currentAmount = 0;
     this.LocationList = [];
     this.qty = '';
-    this.form.xxxx = '';
+    this.Barcode = '';
     //根据选择一行数据查询库位
-    await this.model.queryItemLoc({
-      workArea: session.workareaCode,
-      loginName: session.loginName,
-      sendSpot: null,
-      materialCode: this.some.materialCode,
-      factoryCode: session.factoryCode,
-    });
-    this.Location = [];
-    if (this.model.LocList.length == 0) {
-      uni.showModal({
-        content: this.$t('message.selected') as any,
-        showCancel: false,
-        confirmText: this.$t('message.workArea_Confirm') as any,
-      });
-    } else {
-      this.Location = this.model.LocList;
-      console.log('this.Location', this.Location);
-      this.wlCode = this.Location[0];
+    // await this.model.queryItemLoc({
+    //   workArea: session.workareaCode,
+    //   loginName: session.loginName,
+    //   sendSpot: null,
+    //   materialCode: this.some.materialCode,
+    //   factoryCode: session.factoryCode,
+    // });
+    // this.Location = [];
+    // if (this.model.LocList.length == 0) {
+    //   uni.showModal({
+    //     content: this.$t('message.selected') as any,
+    //     showCancel: false,
+    //     confirmText: this.$t('message.workArea_Confirm') as any,
+    //   });
+    // } else {
+    //   this.Location = this.model.LocList;
+    //   console.log('this.Location', this.Location);
+    //   this.wlCode = this.Location[0];
+    // }
+  }
+  async searchBarcode() {
+    if (this.Barcode == '') {
+      this.customToast(this.$t('message.barcode') as string);
+      return;
     }
+    if (!this.some) {
+      this.customToast(this.$t('message.AppendMateriel6') as string);
+      return;
+    }
+
+    await this.model.searchBarcode({ factoryCode: session.factoryCode, loginName: session.loginName, barcode: this.Barcode, productCode: this.some.materialCode });
+    this.Container = this.model.ContainerCode;
+    let arr = {
+      label: this.Container.locCode,
+      value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
+      sendSpot: this.Container.sendSpot,
+    };
+    this.Location.push(arr);
+    this.wlCode = this.Location[0];
+    //let num = 0;
+    // if (this.LocationList.length != 0) {
+    //   this.LocationList.forEach((item: any) => {
+    //     if (item.barcode == this.Container.barcode) {
+    //       num += parseFloat(item.qty);
+    //     }
+    //   });
+    // }
+    // if (this.Container.cpRef4 == null) {
+    //   this.qty = parseFloat(this.Container.qty) - num;
+    // } else {
+    //   this.qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4) - num;
+    // }
   }
   Add() {
     if (this.qty == '' || this.wlCode == '') {
@@ -214,64 +249,91 @@ export default class RawReceiptDetail extends BasePage {
       return;
     }
     let isTrue = true;
+    let allqty = 0;
     if (this.LocationList.length != 0) {
       this.LocationList.forEach((item: any) => {
         if (this.wlCode.sendSpot != item.Code || this.wlCode.label === item.wlCode) {
           this.customToast(this.$t('message.Commission_tips7') as any);
           return (isTrue = false);
         }
+        allqty += parseFloat(item.qty);
       });
+      if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
+        this.customToast(this.$t('message.Pi_tip20') as any);
+        return (isTrue = false);
+      }
+    } else {
+      if (parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
+        this.customToast(this.$t('message.Pi_tip20') as any);
+        return (isTrue = false);
+      }
     }
     if (isTrue == true) {
-      if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
-        uni.showModal({
-          title: 'Tip',
-          content: this.$t('message.Pi_tip11') as string,
-          confirmText: this.$t('message.workArea_Confirm') as string,
-          cancelText: this.$t('message.Cancel') as string,
-          showCancel: true,
-          success: (res) => {
-            if (res.confirm) {
-              let arr = {
-                wlCode: this.wlCode.label,
-                qty: this.qty,
-                Code: this.wlCode.sendSpot,
-                xxxx: this.form.xxxx,
-              };
-              this.LocationList.push(arr);
-              let objString = JSON.stringify(this.some);
-              let TEM = JSON.parse(objString);
-              TEM.wlList = null;
-              TEM.wlCode = this.wlCode.label;
-              TEM.qty = this.qty;
-              TEM.xxxx = this.form.xxxx;
-              //add之后有什么操作
-              this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
-              this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
-              this.qty = '';
-              this.form.xxxx = '';
-            }
-          },
-        });
-      } else {
-        let arr = {
-          wlCode: this.wlCode.label,
-          qty: this.qty,
-          Code: this.wlCode.sendSpot,
-          xxxx: this.form.xxxx,
-        };
-        this.LocationList.push(arr);
-        let objString = JSON.stringify(this.some);
-        let TEM = JSON.parse(objString);
-        TEM.wlList = null;
-        TEM.wlCode = this.wlCode.label;
-        TEM.qty = this.qty;
-        TEM.xxxx = this.form.xxxx;
-        this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
-        this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
-        this.qty = '';
-        this.form.xxxx = '';
-      }
+      let arr = {
+        wlCode: this.wlCode.label,
+        qty: this.qty,
+        Code: this.wlCode.sendSpot,
+        barcode: this.Barcode,
+      };
+      this.LocationList.push(arr);
+      let objString = JSON.stringify(this.some);
+      let TEM = JSON.parse(objString);
+      TEM.wlList = null;
+      TEM.wlCode = this.wlCode.label;
+      TEM.qty = this.qty;
+      TEM.barcode = this.Barcode;
+      this.model.aggregateList[this.someIndex].wlList.push(TEM);
+      this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
+      this.qty = '';
+      // if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
+      //   uni.showModal({
+      //     title: 'Tip',
+      //     content: this.$t('message.Pi_tip11') as string,
+      //     confirmText: this.$t('message.workArea_Confirm') as string,
+      //     cancelText: this.$t('message.Cancel') as string,
+      //     showCancel: true,
+      //     success: (res) => {
+      //       if (res.confirm) {
+      //         let arr = {
+      //           wlCode: this.wlCode.label,
+      //           qty: this.qty,
+      //           Code: this.wlCode.sendSpot,
+      //           xxxx: this.form.xxxx,
+      //         };
+      //         this.LocationList.push(arr);
+      //         let objString = JSON.stringify(this.some);
+      //         let TEM = JSON.parse(objString);
+      //         TEM.wlList = null;
+      //         TEM.wlCode = this.wlCode.label;
+      //         TEM.qty = this.qty;
+      //         TEM.xxxx = this.form.xxxx;
+      //         //add之后有什么操作
+      //         this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
+      //         this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
+      //         this.qty = '';
+      //         this.form.xxxx = '';
+      //       }
+      //     },
+      //   });
+      // } else {
+      //   let arr = {
+      //     wlCode: this.wlCode.label,
+      //     qty: this.qty,
+      //     Code: this.wlCode.sendSpot,
+      //     xxxx: this.form.xxxx,
+      //   };
+      //   this.LocationList.push(arr);
+      //   let objString = JSON.stringify(this.some);
+      //   let TEM = JSON.parse(objString);
+      //   TEM.wlList = null;
+      //   TEM.wlCode = this.wlCode.label;
+      //   TEM.qty = this.qty;
+      //   TEM.xxxx = this.form.xxxx;
+      //   this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
+      //   this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
+      //   this.qty = '';
+      //   this.form.xxxx = '';
+      // }
     }
   }
   deleteItem(index: any) {
@@ -317,7 +379,7 @@ export default class RawReceiptDetail extends BasePage {
       this.customToast(this.$t('message.Warehouse_Tip6') as any);
       return;
     }
-    await this.model.saveProOrderResultUpload(dataList);
+    await this.model.saveProOrderResultUploadRussia(dataList);
     if (this.model.code == '1') {
       uni.showToast({
         //icon: 'success',
@@ -477,7 +539,7 @@ export default class RawReceiptDetail extends BasePage {
 
   .library {
     width: 100%;
-    height: 200rpx;
+    height: 300rpx;
     // display: flex;
     display: block;
 
@@ -496,9 +558,10 @@ export default class RawReceiptDetail extends BasePage {
       width: 100%;
       height: 100rpx;
       display: flex;
+      padding-left: 18px;
 
       view {
-        width: 110rpx;
+        width: 210rpx;
         height: 100rpx;
         line-height: 100rpx;
       }
diff --git a/src/pages/raw/handover/RUS-picking/BySummary.vue b/src/pages/raw/handover/RUS-picking/BySummary.vue
index bed2fe5..8b8bdfc 100644
--- a/src/pages/raw/handover/RUS-picking/BySummary.vue
+++ b/src/pages/raw/handover/RUS-picking/BySummary.vue
@@ -56,7 +56,7 @@
       <u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
         <u-td class="u-td">{{ item.wlCode }}</u-td>
         <u-td class="u-td">{{ item.qty }}</u-td>
-        <u-td class="u-td">{{ item.xxxx }}</u-td>
+        <u-td class="u-td">{{ item.barcode }}</u-td>
         <u-td class="u-td">
           <u-button type="error" size="small" style="font-size: 20px" @click="deleteItem(index)">{{ $t('message.product_Delete') }}</u-button>
         </u-td>
@@ -169,7 +169,7 @@ export default class RawReceiptDetail extends BasePage {
     this.some = data[0].lineData;
     this.model.aggregateList[this.someIndex].wlList = [];
     this.model.aggregateList[this.someIndex].currentAmount = 0;
-    //先将add表格清空，为什么要将下面的表格清空？？？？？
+    //先将add表格清空，一条一条提交
     this.LocationList = [];
     this.qty = '';
     this.Barcode = '';
@@ -199,11 +199,12 @@ export default class RawReceiptDetail extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
-    // if (this.materialList.length == 0) {
-    //   this.customToast(this.$t('message.AppendMateriel5') as string);
-    //   return;
-    // }
-    await this.model.searchBarcode(this.Barcode);
+    if (!this.some) {
+      this.customToast(this.$t('message.AppendMateriel6') as string);
+      return;
+    }
+    //确定物料编码是哪个字段
+    await this.model.searchBarcode({ factoryCode: session.factoryCode, loginName: session.loginName, barcode: this.Barcode, productCode: this.some.materialCode });
     this.Container = this.model.ContainerCode;
     let arr = {
       label: this.Container.locCode,
@@ -240,15 +241,44 @@ export default class RawReceiptDetail extends BasePage {
       return;
     }
     let isTrue = true;
+    let allqty = 0;
+    //当下面有数据时，1要判断添加的库位是否相同，2考虑再次添加数量校验，扫同一容器吗
     if (this.LocationList.length != 0) {
       this.LocationList.forEach((item: any) => {
         if (this.wlCode.sendSpot != item.Code) {
           this.customToast(this.$t('message.Commission_tips7') as any);
           return (isTrue = false);
         }
+        allqty += parseFloat(item.qty);
       });
+      if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
+        this.customToast(this.$t('message.Pi_tip20') as any);
+        return (isTrue = false);
+      }
+    } else {
+      if (parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
+        this.customToast(this.$t('message.Pi_tip20') as any);
+        return (isTrue = false);
+      }
     }
     if (isTrue == true) {
+      // let arr = {
+      //   wlCode: this.wlCode.label,
+      //   qty: this.qty,
+      //   Code: this.wlCode.sendSpot,
+      //   barcode: this.Barcode,
+      // };
+      // this.LocationList.push(arr);
+      // let objString = JSON.stringify(this.some);
+      // let TEM = JSON.parse(objString);
+      // TEM.wlList = null;
+      // TEM.wlCode = this.wlCode.label;
+      // TEM.qty = this.qty;
+      // TEM.barcode = this.Barcode;
+      // this.model.aggregateList[this.someIndex].wlList.push(TEM);
+      // this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
+      // this.qty = '';
+      // this.Barcode = '';
       if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
         uni.showModal({
           title: 'Tip',
@@ -341,7 +371,7 @@ export default class RawReceiptDetail extends BasePage {
       dataList,
       includeOrderOutIdList,
     };
-    await this.model.saveAggregateUpload(params);
+    await this.model.saveAggregateUploadRussia(params);
     if (this.model.code == '1') {
       uni.showToast({
         duration: 2000,
@@ -500,7 +530,7 @@ export default class RawReceiptDetail extends BasePage {
 
   .library {
     width: 100%;
-    height: 200rpx;
+    height: 300rpx;
     // display: flex;
     display: block;
 
@@ -519,9 +549,10 @@ export default class RawReceiptDetail extends BasePage {
       width: 100%;
       height: 100rpx;
       display: flex;
+      padding-left: 18px;
 
       view {
-        width: 110rpx;
+        width: 210rpx;
         height: 100rpx;
         line-height: 100rpx;
       }
diff --git a/src/pages/raw/handover/RUS-picking/model.ts b/src/pages/raw/handover/RUS-picking/model.ts
index 4eae109..799abec 100644
--- a/src/pages/raw/handover/RUS-picking/model.ts
+++ b/src/pages/raw/handover/RUS-picking/model.ts
@@ -327,12 +327,8 @@ export class PickingModule extends VuexModule {
   }
   //俄罗斯汇总拣配扫描容器码
   @MutationAction
-  async searchBarcode(barcode: any) {
-    const res: any = await http.post(url.auth.query.barcode, {
-      factoryCode: session.factoryCode,
-      loginName: session.loginName,
-      barcode,
-    });
+  async searchBarcode(params: any) {
+    const res: any = await http.post(url.auth.query.barcode, params);
     const ContainerCode = res.data;
     return { ContainerCode };
   }
@@ -341,8 +337,8 @@ export class PickingModule extends VuexModule {
    */
   // @Action({ commit: 'clearState' })
   @MutationAction
-  async saveAggregateUpload(params: any) {
-    const res: any = await http.post(url.sortscan.save.aggregate, params);
+  async saveAggregateUploadRussia(params: any) {
+    const res: any = await http.post(url.sortscan.save.aggregateRussia, params);
     console.log('res', res);
     const code = res.code;
     return { code };
@@ -353,8 +349,8 @@ export class PickingModule extends VuexModule {
    */
   // @Action({ commit: 'clearState' })
   @MutationAction
-  async saveProOrderResultUpload(dataList: any[]) {
-    const res: any = await http.post(url.sortscan.save.order, dataList);
+  async saveProOrderResultUploadRussia(dataList: any[]) {
+    const res: any = await http.post(url.sortscan.save.orderRussia, dataList);
     const code = res.code;
     console.log('code', code);
     return { code };
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 5b7c4ad..6924402 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -177,8 +177,10 @@ export const url = {
       aggregateList: '/wmspda/sortscan/query/aggregate/list',
     },
     save: {
+      aggregateRussia: 'wmspda/sortscan/save/aggregate/russia',
       aggregate: '/wmspda/sortscan/save/aggregate',
       order: '/wmspda/sortscan/save/order',
+      orderRussia: 'wmspda/sortscan/save/order/russia',
       queryWlByMat: '/wmspda/sortscan/queryWlByMat',
       queryWlByMatBL: '/wmspda/sortscan/queryWlByMatBL',
     },

From af89e8740ca25b8ee79e4c07b3c4ff8ebc9bb32b Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 21 Jun 2022 11:32:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97?=
 =?UTF-8?q?=E6=96=AF=E6=8B=A3=E9=85=8D=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../raw/handover/RUS-picking/ByOrder.vue      |  144 ++-
 .../raw/handover/RUS-picking/BySummary.vue    | 1140 ++++++++---------
 2 files changed, 644 insertions(+), 640 deletions(-)

diff --git a/src/pages/raw/handover/RUS-picking/ByOrder.vue b/src/pages/raw/handover/RUS-picking/ByOrder.vue
index fe3c447..a1ab357 100644
--- a/src/pages/raw/handover/RUS-picking/ByOrder.vue
+++ b/src/pages/raw/handover/RUS-picking/ByOrder.vue
@@ -181,6 +181,7 @@ export default class RawReceiptDetail extends BasePage {
     this.LocationList = [];
     this.qty = '';
     this.Barcode = '';
+    //不在推荐库位，所以注掉
     //根据选择一行数据查询库位
     // await this.model.queryItemLoc({
     //   workArea: session.workareaCode,
@@ -207,10 +208,10 @@ export default class RawReceiptDetail extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
-    if (!this.some) {
-      this.customToast(this.$t('message.AppendMateriel6') as string);
-      return;
-    }
+     if (JSON.stringify(this.some) == '{}') {
+   this.customToast(this.$t('message.Commission_tips6') as any);
+   return;
+  }
 
     await this.model.searchBarcode({ factoryCode: session.factoryCode, loginName: session.loginName, barcode: this.Barcode, productCode: this.some.materialCode });
     this.Container = this.model.ContainerCode;
@@ -256,84 +257,87 @@ export default class RawReceiptDetail extends BasePage {
           this.customToast(this.$t('message.Commission_tips7') as any);
           return (isTrue = false);
         }
-        allqty += parseFloat(item.qty);
+        //本次输入容器码与下面容器码相同的所有qty的和，用于最大可添加数量校验
+       if (this.Barcode == item.barcode) {
+     allqty += parseFloat(item.qty);
+    }
       });
+      //下面表格有数据情况下，添加一个时，最大可添加数量校验
       if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
         this.customToast(this.$t('message.Pi_tip20') as any);
         return (isTrue = false);
       }
     } else {
+      //下面表格没数据时，添加一个时，最大可添加数量校验
       if (parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
         this.customToast(this.$t('message.Pi_tip20') as any);
         return (isTrue = false);
       }
     }
     if (isTrue == true) {
-      let arr = {
-        wlCode: this.wlCode.label,
-        qty: this.qty,
-        Code: this.wlCode.sendSpot,
-        barcode: this.Barcode,
-      };
-      this.LocationList.push(arr);
-      let objString = JSON.stringify(this.some);
-      let TEM = JSON.parse(objString);
-      TEM.wlList = null;
-      TEM.wlCode = this.wlCode.label;
-      TEM.qty = this.qty;
-      TEM.barcode = this.Barcode;
-      this.model.aggregateList[this.someIndex].wlList.push(TEM);
-      this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
-      this.qty = '';
-      // if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
-      //   uni.showModal({
-      //     title: 'Tip',
-      //     content: this.$t('message.Pi_tip11') as string,
-      //     confirmText: this.$t('message.workArea_Confirm') as string,
-      //     cancelText: this.$t('message.Cancel') as string,
-      //     showCancel: true,
-      //     success: (res) => {
-      //       if (res.confirm) {
-      //         let arr = {
-      //           wlCode: this.wlCode.label,
-      //           qty: this.qty,
-      //           Code: this.wlCode.sendSpot,
-      //           xxxx: this.form.xxxx,
-      //         };
-      //         this.LocationList.push(arr);
-      //         let objString = JSON.stringify(this.some);
-      //         let TEM = JSON.parse(objString);
-      //         TEM.wlList = null;
-      //         TEM.wlCode = this.wlCode.label;
-      //         TEM.qty = this.qty;
-      //         TEM.xxxx = this.form.xxxx;
-      //         //add之后有什么操作
-      //         this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
-      //         this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
-      //         this.qty = '';
-      //         this.form.xxxx = '';
-      //       }
-      //     },
-      //   });
-      // } else {
-      //   let arr = {
-      //     wlCode: this.wlCode.label,
-      //     qty: this.qty,
-      //     Code: this.wlCode.sendSpot,
-      //     xxxx: this.form.xxxx,
-      //   };
-      //   this.LocationList.push(arr);
-      //   let objString = JSON.stringify(this.some);
-      //   let TEM = JSON.parse(objString);
-      //   TEM.wlList = null;
-      //   TEM.wlCode = this.wlCode.label;
-      //   TEM.qty = this.qty;
-      //   TEM.xxxx = this.form.xxxx;
-      //   this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
-      //   this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
-      //   this.qty = '';
-      //   this.form.xxxx = '';
-      // }
+      // let arr = {
+      //   wlCode: this.wlCode.label,
+      //   qty: this.qty,
+      //   Code: this.wlCode.sendSpot,
+      //   barcode: this.Barcode,
+      // };
+      // this.LocationList.push(arr);
+      // let objString = JSON.stringify(this.some);
+      // let TEM = JSON.parse(objString);
+      // TEM.wlList = null;
+      // TEM.wlCode = this.wlCode.label;
+      // TEM.qty = this.qty;
+      // TEM.barcode = this.Barcode;
+      // this.model.aggregateList[this.someIndex].wlList.push(TEM);
+      // this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
+      // this.qty = '';
+      if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
+        uni.showModal({
+          title: 'Tip',
+          content: this.$t('message.Pi_tip11') as string,
+          confirmText: this.$t('message.workArea_Confirm') as string,
+          cancelText: this.$t('message.Cancel') as string,
+          showCancel: true,
+          success: (res) => {
+            if (res.confirm) {
+              let arr = {
+                wlCode: this.wlCode.label,
+                qty: this.qty,
+                Code: this.wlCode.sendSpot,
+                barcode: this.Barcode,
+              };
+              this.LocationList.push(arr);
+              let objString = JSON.stringify(this.some);
+              let TEM = JSON.parse(objString);
+              TEM.wlList = null;
+              TEM.wlCode = this.wlCode.label;
+              TEM.qty = this.qty;
+              TEM.barcode = this.Barcode;
+              //add之后有什么操作
+              this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
+              this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
+              this.qty = '';
+            }
+          },
+        });
+      } else {
+        let arr = {
+          wlCode: this.wlCode.label,
+          qty: this.qty,
+          Code: this.wlCode.sendSpot,
+          barcode: this.Barcode,
+        };
+        this.LocationList.push(arr);
+        let objString = JSON.stringify(this.some);
+        let TEM = JSON.parse(objString);
+        TEM.wlList = null;
+        TEM.wlCode = this.wlCode.label;
+        TEM.qty = this.qty;
+        TEM.barcode = this.Barcode;
+        this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
+        this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
+        this.qty = '';
+      }
     }
   }
   deleteItem(index: any) {
diff --git a/src/pages/raw/handover/RUS-picking/BySummary.vue b/src/pages/raw/handover/RUS-picking/BySummary.vue
index 8b8bdfc..79b73a7 100644
--- a/src/pages/raw/handover/RUS-picking/BySummary.vue
+++ b/src/pages/raw/handover/RUS-picking/BySummary.vue
@@ -1,92 +1,92 @@
 <template>
-  <view class="page-picking-order">
-    <view class="header">
-      <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
-      </view>
-      <view class="title">{{ $t('message.Pi_SummaryPicking') }}</view>
-      <view class="right"></view>
+ <view class="page-picking-order">
+  <view class="header">
+   <view class="left">
+    <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+   </view>
+   <view class="title">{{ $t('message.Pi_SummaryPicking') }}</view>
+   <view class="right"></view>
+  </view>
+  <!-- 列表展示数据 -->
+  <view class="table-wrapper">
+   <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.aggregateList" :show-vert-border="false" @onCheck="handleRow"></wyb-table>
+  </view>
+  <!-- 展示详细信息 -->
+  <view class="Exhibition">
+   <view class="Exhibition-left">
+    <view class="Exhibition-left-title">{{ $t('message.Pi_Station') }}:</view>
+    <view class="Exhibition-left-data">{{ some.sendSpot }}</view>
+   </view>
+   <view class="Exhibition-right">
+    <view class="Exhibition-right-title">{{ $t('message.Pi_PickedQuantity') }}:</view>
+    <view class="Exhibition-right-data">{{ some.totalMoAmount }}</view>
+   </view>
+  </view>
+  <!-- 添加库位 -->
+  <view class="library">
+   <view class="library-left">
+    <view>{{ $t('message.CommissionedLocation') }}:</view>
+    <jPicker sureColor="#ff0000" style="width: 400rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
+   </view>
+   <!-- 容器编码 -->
+   <view class="single-left">
+    <view>{{ $t('message.Container') }}</view>
+    <u-search :placeholder="$t('message.PleaseScan')" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+   </view>
+   <view class="library-right">
+    <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
+    <u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
+    <view class="add">
+     <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
     </view>
-    <!-- 列表展示数据 -->
-    <view class="table-wrapper">
-      <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.aggregateList" :show-vert-border="false" @onCheck="handleRow"></wyb-table>
-    </view>
-    <!-- 展示详细信息 -->
-    <view class="Exhibition">
-      <view class="Exhibition-left">
-        <view class="Exhibition-left-title">{{ $t('message.Pi_Station') }}:</view>
-        <view class="Exhibition-left-data">{{ some.sendSpot }}</view>
-      </view>
-      <view class="Exhibition-right">
-        <view class="Exhibition-right-title">{{ $t('message.Pi_PickedQuantity') }}:</view>
-        <view class="Exhibition-right-data">{{ some.totalMoAmount }}</view>
-      </view>
-    </view>
-    <!-- 添加库位 -->
-    <view class="library">
-      <view class="library-left">
-        <view>{{ $t('message.CommissionedLocation') }}:</view>
-        <jPicker sureColor="#ff0000" style="width: 400rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
-      </view>
-      <!-- 容器编码 -->
-      <view class="single-left">
-        <view>{{ $t('message.Container') }}</view>
-        <u-search :placeholder="$t('message.PleaseScan')" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
-      </view>
-      <view class="library-right">
-        <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
-        <u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
-        <view class="add">
-          <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
-        </view>
-      </view>
-    </view>
-    <!-- 添加 -->
-    <!-- <view class="add">
+   </view>
+  </view>
+  <!-- 添加 -->
+  <!-- <view class="add">
       <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
     </view> -->
-    <!-- 表格 -->
-    <u-table class="library-table">
-      <u-tr class="u-tr">
-        <u-th class="u-th">{{ $t('message.product_Location') }}</u-th>
-        <u-th class="u-th">{{ $t('message.product_Number') }}</u-th>
-        <u-th class="u-th">{{ $t('message.Container') }}</u-th>
-        <u-th class="u-th">{{ $t('message.operation') }}</u-th>
-      </u-tr>
-      <u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
-        <u-td class="u-td">{{ item.wlCode }}</u-td>
-        <u-td class="u-td">{{ item.qty }}</u-td>
-        <u-td class="u-td">{{ item.barcode }}</u-td>
-        <u-td class="u-td">
-          <u-button type="error" size="small" style="font-size: 20px" @click="deleteItem(index)">{{ $t('message.product_Delete') }}</u-button>
-        </u-td>
-      </u-tr>
-    </u-table>
-    <view class="bottom-bar">
-      <div class="extra">
-        <u-form ref="form" :model="form" :error-type="['toast']">
-          <u-row class="bottom-info"> </u-row>
-        </u-form>
-      </div>
-      <div class="container">
-        <u-row>
-          <u-col :span="4">
-            <u-button type="primary" class="appoint" @click="bill">{{ $t('message.detailed') }}</u-button>
-          </u-col>
-          <u-col :span="4">
-            <u-button type="success" @click="onSubmit">
-              {{ $t('message.po_Submit') }}
-            </u-button>
-          </u-col>
-          <u-col :span="4">
-            <u-button type="error" @click="uni.navigateBack({})">
-              {{ $t('message.po_Return') }}
-            </u-button>
-          </u-col>
-        </u-row>
-      </div>
-    </view>
+  <!-- 表格 -->
+  <u-table class="library-table">
+   <u-tr class="u-tr">
+    <u-th class="u-th">{{ $t('message.product_Location') }}</u-th>
+    <u-th class="u-th">{{ $t('message.product_Number') }}</u-th>
+    <u-th class="u-th">{{ $t('message.Container') }}</u-th>
+    <u-th class="u-th">{{ $t('message.operation') }}</u-th>
+   </u-tr>
+   <u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
+    <u-td class="u-td">{{ item.wlCode }}</u-td>
+    <u-td class="u-td">{{ item.qty }}</u-td>
+    <u-td class="u-td">{{ item.barcode }}</u-td>
+    <u-td class="u-td">
+     <u-button type="error" size="small" style="font-size: 20px" @click="deleteItem(index)">{{ $t('message.product_Delete') }}</u-button>
+    </u-td>
+   </u-tr>
+  </u-table>
+  <view class="bottom-bar">
+   <div class="extra">
+    <u-form ref="form" :model="form" :error-type="['toast']">
+     <u-row class="bottom-info"> </u-row>
+    </u-form>
+   </div>
+   <div class="container">
+    <u-row>
+     <u-col :span="4">
+      <u-button type="primary" class="appoint" @click="bill">{{ $t('message.detailed') }}</u-button>
+     </u-col>
+     <u-col :span="4">
+      <u-button type="success" @click="onSubmit">
+       {{ $t('message.po_Submit') }}
+      </u-button>
+     </u-col>
+     <u-col :span="4">
+      <u-button type="error" @click="uni.navigateBack({})">
+       {{ $t('message.po_Return') }}
+      </u-button>
+     </u-col>
+    </u-row>
+   </div>
   </view>
+ </view>
 </template>
 <script lang="ts">
 import { Component, Ref } from 'vue-property-decorator';
@@ -97,525 +97,525 @@ import { session } from '@/store/modules/session';
 import { VForm, VFormRules } from 'vue/types/form';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 @Component({
-  components: {
-    jPicker,
-  },
+ components: {
+  jPicker,
+ },
 })
 export default class RawReceiptDetail extends BasePage {
-  @Ref('form') readonly $form!: VForm;
-  @Ref('submitForm') readonly $submitForm!: VForm;
-  submitForm = {
-    receiver: '',
-    receiverName: '',
-    password: '',
-  };
-  model = model;
-  type = 'text';
-  wlCode: any = '';
-  border = true;
-  //添加库位和数量的列表
-  LocationList: any = [];
-  //库位
-  Location: any = [];
-  unLockParams: any = '';
-  someIndex = 0;
-  some: any = {};
-  Container: any = {};
-  Barcode: any = '';
-  qty: any = '';
-  //表单数据
-  form: any = {
-    // locationCode: null,
-    amount: null,
-  };
-  /**
-   * 表单校验
-   */
-  rules: VFormRules<any> = {
-    // locationCode: [{ required: true, message: '请选择库存地点！' }],
-    amount: [
-      { required: true, message: this.$t('message.Pi_tip1') as string },
-      // { type: 'integer', min: 1, transform: Number, message: this.$t('message.Pi_tip2') as string },
-    ],
-  };
+ @Ref('form') readonly $form!: VForm;
+ @Ref('submitForm') readonly $submitForm!: VForm;
+ submitForm = {
+  receiver: '',
+  receiverName: '',
+  password: '',
+ };
+ model = model;
+ type = 'text';
+ wlCode: any = '';
+ border = true;
+ //添加库位和数量的列表
+ LocationList: any = [];
+ //库位
+ Location: any = [];
+ unLockParams: any = '';
+ someIndex = 0;
+ some: any = {};
+ Container: any = {};
+ Barcode: any = '';
+ qty: any = '';
+ //表单数据
+ form: any = {
+  // locationCode: null,
+  amount: null,
+ };
+ /**
+  * 表单校验
+  */
+ rules: VFormRules<any> = {
+  // locationCode: [{ required: true, message: '请选择库存地点！' }],
+  amount: [
+   { required: true, message: this.$t('message.Pi_tip1') as string },
+   // { type: 'integer', min: 1, transform: Number, message: this.$t('message.Pi_tip2') as string },
+  ],
+ };
 
-  /**
-   * 库存地点选择
-   */
-  locationCodeSelect = false;
-  //表头
-  headers = summaryHeaders;
-  //选择库位
-  LocationChoice(e: any) {
-    console.log('e>>>>>>>>>>>>>>>>>>>>>>>>', e);
-    this.wlCode = e.pickerName;
+ /**
+  * 库存地点选择
+  */
+ locationCodeSelect = false;
+ //表头
+ headers = summaryHeaders;
+ //选择库位
+ LocationChoice(e: any) {
+  console.log('e>>>>>>>>>>>>>>>>>>>>>>>>', e);
+  this.wlCode = e.pickerName;
+ }
+ //选取某一条需要分配库位的物料数据
+ async handleRow({ data }: any) {
+  if (!this.model.aggregateList[data[0].index].sendSpot) {
+   uni.showModal({
+    content: this.$t('message.SAPLocation') as any,
+    confirmText: this.$t('message.workArea_Confirm') as string,
+    cancelText: this.$t('message.Cancel') as string,
+    success: (res) => {
+     if (res.confirm) {
+      this.model.aggregateList[data[0].index].checked = false;
+     }
+    },
+   });
+   return;
   }
-  //选取某一条需要分配库位的物料数据
-  async handleRow({ data }: any) {
-    if (!this.model.aggregateList[data[0].index].sendSpot) {
-      uni.showModal({
-        content: this.$t('message.SAPLocation') as any,
-        confirmText: this.$t('message.workArea_Confirm') as string,
-        cancelText: this.$t('message.Cancel') as string,
-        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 = [];
-    this.model.aggregateList[this.someIndex].currentAmount = 0;
-    //先将add表格清空，一条一条提交
-    this.LocationList = [];
-    this.qty = '';
-    this.Barcode = '';
-    //根据选择行查询库位 不在掉推荐库位
-    // await this.model.queryItemLoc({
-    //   workArea: session.workareaCode,
-    //   loginName: session.loginName,
-    //   sendSpot: null,
-    //   materialCode: this.some.materialCode,
-    //   factoryCode: session.factoryCode,
-    // });
-    // this.Location = [];
-    // if (this.model.LocList.length == 0) {
-    //   uni.showModal({
-    //     content: this.$t('message.selected') as any,
-    //     showCancel: false,
-    //     confirmText: this.$t('message.workArea_Confirm') as any,
-    //   });
-    // } else {
-    //   this.Location = this.model.LocList;
-    //   console.log('this.Location', this.Location);
-    //   this.wlCode = this.Location[0];
-    // }
+  this.someIndex = data[0].index;
+  this.some = data[0].lineData;
+  this.model.aggregateList[this.someIndex].wlList = [];
+  this.model.aggregateList[this.someIndex].currentAmount = 0;
+  //先将add表格清空，一条一条提交
+  this.LocationList = [];
+  this.qty = '';
+  this.Barcode = '';
+  //根据选择行查询库位 不在掉推荐库位
+  // await this.model.queryItemLoc({
+  //   workArea: session.workareaCode,
+  //   loginName: session.loginName,
+  //   sendSpot: null,
+  //   materialCode: this.some.materialCode,
+  //   factoryCode: session.factoryCode,
+  // });
+  // this.Location = [];
+  // if (this.model.LocList.length == 0) {
+  //   uni.showModal({
+  //     content: this.$t('message.selected') as any,
+  //     showCancel: false,
+  //     confirmText: this.$t('message.workArea_Confirm') as any,
+  //   });
+  // } else {
+  //   this.Location = this.model.LocList;
+  //   console.log('this.Location', this.Location);
+  //   this.wlCode = this.Location[0];
+  // }
+ }
+ async searchBarcode() {
+  if (this.Barcode == '') {
+   this.customToast(this.$t('message.barcode') as string);
+   return;
   }
-  async searchBarcode() {
-    if (this.Barcode == '') {
-      this.customToast(this.$t('message.barcode') as string);
-      return;
+   if (JSON.stringify(this.some) == '{}') {
+   this.customToast(this.$t('message.Commission_tips6') as any);
+   return;
+  }
+  //确定物料编码是哪个字段
+  await this.model.searchBarcode({ factoryCode: session.factoryCode, loginName: session.loginName, barcode: this.Barcode, productCode: this.some.materialCode });
+  this.Container = this.model.ContainerCode;
+  let arr = {
+   label: this.Container.locCode,
+   value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
+   sendSpot: this.Container.sendSpot,
+  };
+  this.Location.push(arr);
+  this.wlCode = this.Location[0];
+  //let num = 0;
+  // if (this.LocationList.length != 0) {
+  //   this.LocationList.forEach((item: any) => {
+  //     if (item.barcode == this.Container.barcode) {
+  //       num += parseFloat(item.qty);
+  //     }
+  //   });
+  // }
+  // if (this.Container.cpRef4 == null) {
+  //   this.qty = parseFloat(this.Container.qty) - num;
+  // } else {
+  //   this.qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4) - num;
+  // }
+ }
+ Add() {
+  if (this.qty == '' || this.wlCode == '') {
+   this.customToast(this.$t('message.Commission_tips2') as any);
+   return;
+  }
+  if (parseFloat(this.qty) <= 0) {
+   this.customToast(this.$t('message.Commission_tips3') as any);
+   return;
+  }
+  if (JSON.stringify(this.some) == '{}') {
+   this.customToast(this.$t('message.Commission_tips6') as any);
+   return;
+  }
+  let isTrue = true;
+  let allqty = 0;
+  //当下面有数据时，1要判断添加的库位是否相同，2考虑再次添加数量校验，扫同一容器吗
+  if (this.LocationList.length != 0) {
+   this.LocationList.forEach((item: any) => {
+    if (this.wlCode.sendSpot != item.Code) {
+     this.customToast(this.$t('message.Commission_tips7') as any);
+     return (isTrue = false);
     }
-    if (!this.some) {
-      this.customToast(this.$t('message.AppendMateriel6') as string);
-      return;
+    if (this.Barcode == item.barcode) {
+     allqty += parseFloat(item.qty);
     }
-    //确定物料编码是哪个字段
-    await this.model.searchBarcode({ factoryCode: session.factoryCode, loginName: session.loginName, barcode: this.Barcode, productCode: this.some.materialCode });
-    this.Container = this.model.ContainerCode;
+   });
+   if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
+    this.customToast(this.$t('message.Pi_tip20') as any);
+    return (isTrue = false);
+   }
+  } else {
+   if (parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
+    this.customToast(this.$t('message.Pi_tip20') as any);
+    return (isTrue = false);
+   }
+  }
+  if (isTrue == true) {
+   // let arr = {
+   //   wlCode: this.wlCode.label,
+   //   qty: this.qty,
+   //   Code: this.wlCode.sendSpot,
+   //   barcode: this.Barcode,
+   // };
+   // this.LocationList.push(arr);
+   // let objString = JSON.stringify(this.some);
+   // let TEM = JSON.parse(objString);
+   // TEM.wlList = null;
+   // TEM.wlCode = this.wlCode.label;
+   // TEM.qty = this.qty;
+   // TEM.barcode = this.Barcode;
+   // this.model.aggregateList[this.someIndex].wlList.push(TEM);
+   // this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
+   // this.qty = '';
+   // this.Barcode = '';
+   if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
+    uni.showModal({
+     title: 'Tip',
+     content: this.$t('message.Pi_tip11') as string,
+     confirmText: this.$t('message.workArea_Confirm') as string,
+     cancelText: this.$t('message.Cancel') as string,
+     showCancel: true,
+     success: (res) => {
+      if (res.confirm) {
+       let arr = {
+        wlCode: this.wlCode.label,
+        qty: this.qty,
+        Code: this.wlCode.sendSpot,
+        barcode: this.Container.barcode,
+       };
+       this.LocationList.push(arr);
+       let objString = JSON.stringify(this.some);
+       let TEM = JSON.parse(objString);
+       TEM.wlList = null;
+       TEM.wlCode = this.wlCode.label;
+       TEM.qty = this.qty;
+       //
+       TEM.barcode = this.Barcode;
+       this.model.aggregateList[this.someIndex].wlList.push(TEM);
+       this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
+       this.qty = '';
+      }
+     },
+    });
+   } else {
     let arr = {
-      label: this.Container.locCode,
-      value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
-      sendSpot: this.Container.sendSpot,
+     wlCode: this.wlCode.label,
+     qty: this.qty,
+     Code: this.wlCode.sendSpot,
+     barcode: this.Container.barcode,
     };
-    this.Location.push(arr);
-    this.wlCode = this.Location[0];
-    //let num = 0;
-    // if (this.LocationList.length != 0) {
-    //   this.LocationList.forEach((item: any) => {
-    //     if (item.barcode == this.Container.barcode) {
-    //       num += parseFloat(item.qty);
-    //     }
-    //   });
-    // }
-    // if (this.Container.cpRef4 == null) {
-    //   this.qty = parseFloat(this.Container.qty) - num;
-    // } else {
-    //   this.qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4) - num;
-    // }
+    this.LocationList.push(arr);
+    let objString = JSON.stringify(this.some);
+    let TEM = JSON.parse(objString);
+    TEM.wlList = null;
+    TEM.wlCode = this.wlCode.label;
+    TEM.qty = this.qty;
+    ///
+    TEM.barcode = this.Barcode;
+    this.model.aggregateList[this.someIndex].wlList.push(TEM);
+    this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
+    this.qty = '';
+   }
   }
-  Add() {
-    if (this.qty == '' || this.wlCode == '') {
-      this.customToast(this.$t('message.Commission_tips2') as any);
-      return;
-    }
-    if (parseFloat(this.qty) <= 0) {
-      this.customToast(this.$t('message.Commission_tips3') as any);
-      return;
-    }
-    if (JSON.stringify(this.some) == '{}') {
-      this.customToast(this.$t('message.Commission_tips6') as any);
-      return;
-    }
-    let isTrue = true;
-    let allqty = 0;
-    //当下面有数据时，1要判断添加的库位是否相同，2考虑再次添加数量校验，扫同一容器吗
-    if (this.LocationList.length != 0) {
-      this.LocationList.forEach((item: any) => {
-        if (this.wlCode.sendSpot != item.Code) {
-          this.customToast(this.$t('message.Commission_tips7') as any);
-          return (isTrue = false);
-        }
-        allqty += parseFloat(item.qty);
-      });
-      if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
-        this.customToast(this.$t('message.Pi_tip20') as any);
-        return (isTrue = false);
-      }
-    } else {
-      if (parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
-        this.customToast(this.$t('message.Pi_tip20') as any);
-        return (isTrue = false);
-      }
-    }
-    if (isTrue == true) {
-      // let arr = {
-      //   wlCode: this.wlCode.label,
-      //   qty: this.qty,
-      //   Code: this.wlCode.sendSpot,
-      //   barcode: this.Barcode,
-      // };
-      // this.LocationList.push(arr);
-      // let objString = JSON.stringify(this.some);
-      // let TEM = JSON.parse(objString);
-      // TEM.wlList = null;
-      // TEM.wlCode = this.wlCode.label;
-      // TEM.qty = this.qty;
-      // TEM.barcode = this.Barcode;
-      // this.model.aggregateList[this.someIndex].wlList.push(TEM);
-      // this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
-      // this.qty = '';
-      // this.Barcode = '';
-      if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
-        uni.showModal({
-          title: 'Tip',
-          content: this.$t('message.Pi_tip11') as string,
-          confirmText: this.$t('message.workArea_Confirm') as string,
-          cancelText: this.$t('message.Cancel') as string,
-          showCancel: true,
-          success: (res) => {
-            if (res.confirm) {
-              let arr = {
-                wlCode: this.wlCode.label,
-                qty: this.qty,
-                Code: this.wlCode.sendSpot,
-                barcode: this.Container.barcode,
-              };
-              this.LocationList.push(arr);
-              let objString = JSON.stringify(this.some);
-              let TEM = JSON.parse(objString);
-              TEM.wlList = null;
-              TEM.wlCode = this.wlCode.label;
-              TEM.qty = this.qty;
-              //
-              TEM.xxxx = this.form.xxxx;
-              this.model.aggregateList[this.someIndex].wlList.push(TEM);
-              this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
-              this.qty = '';
-              this.form.xxxx = '';
-            }
-          },
-        });
-      } else {
-        let arr = {
-          wlCode: this.wlCode.label,
-          qty: this.qty,
-          Code: this.wlCode.sendSpot,
-          barcode: this.Container.barcode,
-        };
-        this.LocationList.push(arr);
-        let objString = JSON.stringify(this.some);
-        let TEM = JSON.parse(objString);
-        TEM.wlList = null;
-        TEM.wlCode = this.wlCode.label;
-        TEM.qty = this.qty;
-        ///
-        TEM.xxxx = this.form.xxxx;
-        this.model.aggregateList[this.someIndex].wlList.push(TEM);
-        this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
-        this.qty = '';
-        this.form.xxxx = '';
-      }
-    }
+ }
+ //表格执行删除操作
+ deleteItem(index: any) {
+  this.LocationList.splice(index, 1);
+  this.model.aggregateList[this.someIndex].wlList.splice(index, 1);
+  this.business();
+ }
+ //确保每次表格执行删除操作  单条数据汇总总数实时改变
+ business() {
+  let num = 0;
+  this.LocationList.forEach((item: any) => {
+   num += parseFloat(item.qty);
+  });
+  this.model.aggregateList[this.someIndex].currentAmount = num;
+ }
+ async onReady() {
+  await this.onAggregate();
+  // await this.GetLocation();
+ }
+ async bill() {
+  this.redirectTo(this.page.raw.handover.RUSpicking.SummaryLocal);
+ }
+ //点击提交 上传数据
+ async onSubmit() {
+  const includeOrderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
+  const dataList: any = [];
+  this.model.aggregateList.forEach((item: any) => {
+   if (item.checked == true) {
+    dataList.push(item);
+   }
+  });
+  if (dataList.length == 0) {
+   this.customToast(this.$t('message.Warehouse_Tip6') as any);
+   return;
   }
-  //表格执行删除操作
-  deleteItem(index: any) {
-    this.LocationList.splice(index, 1);
-    this.model.aggregateList[this.someIndex].wlList.splice(index, 1);
-    this.business();
-  }
-  //确保每次表格执行删除操作  单条数据汇总总数实时改变
-  business() {
-    let num = 0;
-    this.LocationList.forEach((item: any) => {
-      num += parseFloat(item.qty);
-    });
-    this.model.aggregateList[this.someIndex].currentAmount = num;
-  }
-  async onReady() {
-    await this.onAggregate();
-    // await this.GetLocation();
-  }
-  async bill() {
-    this.redirectTo(this.page.raw.handover.RUSpicking.SummaryLocal);
-  }
-  //点击提交 上传数据
-  async onSubmit() {
-    const includeOrderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
-    const dataList: any = [];
-    this.model.aggregateList.forEach((item: any) => {
-      if (item.checked == true) {
-        dataList.push(item);
-      }
-    });
-    if (dataList.length == 0) {
-      this.customToast(this.$t('message.Warehouse_Tip6') as any);
-      return;
-    }
-    const params = {
-      factoryCode: session.factoryCode,
-      loginName: session.loginName,
-      dataList,
-      includeOrderOutIdList,
-    };
-    await this.model.saveAggregateUploadRussia(params);
-    if (this.model.code == '1') {
-      uni.showToast({
-        duration: 2000,
-        title: this.$t('message.Warehouse_Tip9') as string,
-        image: '/static/icons/icon-51.png',
-      });
-      setTimeout(() => {
-        this.onAggregate();
-      }, 2000);
-    }
-  }
-  async onAggregate() {
-    await this.model.queryProOrder(this.model.formParams);
-    await this.model.queryProOrderResult(this.model.NEWparams);
-    const orderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
-    const params = {
-      factoryCode: session.factoryCode,
-      loginName: session.loginName,
-      orderOutIdList,
-    };
-    this.unLockParams = params;
-    await this.model.queryAggregateList(params);
-    this.some = {};
-    this.LocationList = [];
-    this.wlCode = '';
-    this.form.xxxx = '';
-  }
-  async GetLocation() {
-    this.Location = [];
-    let means: any = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any);
-    let content = {
-      loginName: means.session.user.loginName,
-      sendSpot: null,
-      factoryCode: means.session.user.factoryCode,
-      workArea: session.workareaCode,
-    };
-    let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
-    res.forEach((item: any) => {
-      let pickerName: any = {};
-      pickerName.label = item.locationCode;
-      pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
-      pickerName.sendSpot = item.sendSpot;
-      this.Location.push(pickerName);
-    });
-  }
-  beforeDestroy() {
-    this.unlock();
-  }
-  onHide() {
-    this.unlock();
-  }
-  async unlock() {
-    await this.model.unlockAggregateResult(this.unLockParams);
+  const params = {
+   factoryCode: session.factoryCode,
+   loginName: session.loginName,
+   dataList,
+   includeOrderOutIdList,
+  };
+  await this.model.saveAggregateUploadRussia(params);
+  if (this.model.code == '1') {
+   uni.showToast({
+    duration: 2000,
+    title: this.$t('message.Warehouse_Tip9') as string,
+    image: '/static/icons/icon-51.png',
+   });
+   setTimeout(() => {
+    this.onAggregate();
+   }, 2000);
   }
+ }
+ async onAggregate() {
+  await this.model.queryProOrder(this.model.formParams);
+  await this.model.queryProOrderResult(this.model.NEWparams);
+  const orderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
+  const params = {
+   factoryCode: session.factoryCode,
+   loginName: session.loginName,
+   orderOutIdList,
+  };
+  this.unLockParams = params;
+  await this.model.queryAggregateList(params);
+  this.some = {};
+  this.LocationList = [];
+  this.wlCode = '';
+  this.form.xxxx = '';
+ }
+ async GetLocation() {
+  this.Location = [];
+  let means: any = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any);
+  let content = {
+   loginName: means.session.user.loginName,
+   sendSpot: null,
+   factoryCode: means.session.user.factoryCode,
+   workArea: session.workareaCode,
+  };
+  let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
+  res.forEach((item: any) => {
+   let pickerName: any = {};
+   pickerName.label = item.locationCode;
+   pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
+   pickerName.sendSpot = item.sendSpot;
+   this.Location.push(pickerName);
+  });
+ }
+ beforeDestroy() {
+  this.unlock();
+ }
+ onHide() {
+  this.unlock();
+ }
+ async unlock() {
+  await this.model.unlockAggregateResult(this.unLockParams);
+ }
 }
 </script>
 
 <style lang="scss" scoped>
 .page-picking-order {
-  background: #f2f2f2 linear-gradient(0deg, #eee7e7 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
-  background-size: 100% 600rpx;
-  padding: 30rpx;
-  min-height: 100%;
-  padding-top: 118rpx;
-  padding-bottom: 222rpx;
+ background: #f2f2f2 linear-gradient(0deg, #eee7e7 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+ background-size: 100% 600rpx;
+ padding: 30rpx;
+ min-height: 100%;
+ padding-top: 118rpx;
+ padding-bottom: 222rpx;
 
-  .header {
-    position: fixed;
-    top: 36rpx;
-    left: 0;
-    right: 0;
-    display: flex;
-    height: 88rpx;
-    line-height: 88rpx;
-    color: #fff;
-    font-size: 34rpx;
-    font-weight: 500;
+ .header {
+  position: fixed;
+  top: 36rpx;
+  left: 0;
+  right: 0;
+  display: flex;
+  height: 88rpx;
+  line-height: 88rpx;
+  color: #fff;
+  font-size: 34rpx;
+  font-weight: 500;
+  text-align: center;
+
+  .title {
+   flex: 3;
+  }
+
+  .left,
+  .right {
+   flex: 1;
+  }
+
+  .icon {
+   display: flex;
+   justify-content: center;
+   align-items: center;
+   width: 88rpx;
+   height: 88rpx;
+  }
+ }
+
+ .table-wrapper {
+  background-color: #fff;
+  height: 500rpx;
+  overflow-x: auto;
+ }
+
+ .form {
+  background-color: #fff;
+  padding: 40rpx;
+  border-radius: 10rpx;
+ }
+
+ .Exhibition {
+  width: 100%;
+  height: 100rpx;
+  margin-top: 20rpx;
+  display: flex;
+
+  .Exhibition-left {
+   width: 50%;
+   height: 100%;
+   display: flex;
+
+   .Exhibition-left-title {
+    width: 50%;
+    height: 100%;
     text-align: center;
+    line-height: 100rpx;
+   }
 
-    .title {
-      flex: 3;
-    }
-
-    .left,
-    .right {
-      flex: 1;
-    }
-
-    .icon {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      width: 88rpx;
-      height: 88rpx;
-    }
+   .Exhibition-left-data {
+    width: 50%;
+    height: 100%;
+    text-align: center;
+    line-height: 100rpx;
+   }
   }
 
-  .table-wrapper {
-    background-color: #fff;
-    height: 500rpx;
-    overflow-x: auto;
-  }
+  .Exhibition-right {
+   width: 50%;
+   height: 100%;
+   display: flex;
 
-  .form {
-    background-color: #fff;
-    padding: 40rpx;
-    border-radius: 10rpx;
-  }
+   .Exhibition-right-title {
+    width: 50%;
+    height: 100%;
+    text-align: left;
+    line-height: 100rpx;
+   }
 
-  .Exhibition {
-    width: 100%;
+   .Exhibition-right-data {
+    width: 50%;
+    height: 100%;
+    text-align: center;
+    line-height: 100rpx;
+   }
+  }
+ }
+
+ .library {
+  width: 100%;
+  height: 300rpx;
+  // display: flex;
+  display: block;
+
+  .library-left {
+   width: 100%;
+   height: 100rpx;
+   padding-left: 36rpx;
+   // display: flex;
+   // view {
+   //   width: 230rpx;
+   //   line-height: 100rpx;
+   //   text-align: center;
+   // }
+  }
+  .single-left {
+   width: 100%;
+   height: 100rpx;
+   display: flex;
+   padding-left: 18px;
+
+   view {
+    width: 210rpx;
     height: 100rpx;
-    margin-top: 20rpx;
-    display: flex;
-
-    .Exhibition-left {
-      width: 50%;
-      height: 100%;
-      display: flex;
-
-      .Exhibition-left-title {
-        width: 50%;
-        height: 100%;
-        text-align: center;
-        line-height: 100rpx;
-      }
-
-      .Exhibition-left-data {
-        width: 50%;
-        height: 100%;
-        text-align: center;
-        line-height: 100rpx;
-      }
-    }
-
-    .Exhibition-right {
-      width: 50%;
-      height: 100%;
-      display: flex;
-
-      .Exhibition-right-title {
-        width: 50%;
-        height: 100%;
-        text-align: left;
-        line-height: 100rpx;
-      }
-
-      .Exhibition-right-data {
-        width: 50%;
-        height: 100%;
-        text-align: center;
-        line-height: 100rpx;
-      }
-    }
+    line-height: 100rpx;
+   }
   }
 
-  .library {
-    width: 100%;
-    height: 300rpx;
-    // display: flex;
-    display: block;
+  .library-right {
+   width: 100%;
+   height: 100rpx;
+   padding-left: 36rpx;
+   display: flex;
 
-    .library-left {
-      width: 100%;
-      height: 100rpx;
-      padding-left: 36rpx;
-      // display: flex;
-      // view {
-      //   width: 230rpx;
-      //   line-height: 100rpx;
-      //   text-align: center;
-      // }
+   .library-right-title {
+    width: 120rpx;
+    height: 100%;
+    line-height: 100rpx;
+   }
+
+   .input {
+    width: 200rpx;
+    height: 70rpx;
+    margin-top: 15rpx;
+    margin-left: 4rpx;
+   }
+
+   .add {
+    width: 200rpx;
+    height: 100rpx;
+    position: relative;
+
+    button {
+     position: absolute;
+     top: 10rpx;
+     right: 20rpx;
     }
-    .single-left {
-      width: 100%;
-      height: 100rpx;
-      display: flex;
-      padding-left: 18px;
+   }
+  }
+ }
 
-      view {
-        width: 210rpx;
-        height: 100rpx;
-        line-height: 100rpx;
-      }
-    }
+ .bottom-bar {
+  z-index: 21;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
 
-    .library-right {
-      width: 100%;
-      height: 100rpx;
-      padding-left: 36rpx;
-      display: flex;
-
-      .library-right-title {
-        width: 120rpx;
-        height: 100%;
-        line-height: 100rpx;
-      }
-
-      .input {
-        width: 200rpx;
-        height: 70rpx;
-        margin-top: 15rpx;
-        margin-left: 4rpx;
-      }
-
-      .add {
-        width: 200rpx;
-        height: 100rpx;
-        position: relative;
-
-        button {
-          position: absolute;
-          top: 10rpx;
-          right: 20rpx;
-        }
-      }
-    }
+  .container {
+   background: #ffffff;
+   box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
+   padding: 20rpx;
   }
 
-  .bottom-bar {
-    z-index: 21;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-
-    .container {
-      background: #ffffff;
-      box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
-      padding: 20rpx;
-    }
-
-    .extra {
-      background-color: #fff;
-      margin: 5px;
-      border-radius: 5px;
-      padding: 0 10px;
-    }
-
-    .bottom-info {
-      .u-form-item {
-        padding: 0;
-      }
-    }
+  .extra {
+   background-color: #fff;
+   margin: 5px;
+   border-radius: 5px;
+   padding: 0 10px;
   }
+
+  .bottom-info {
+   .u-form-item {
+    padding: 0;
+   }
+  }
+ }
 }
 </style>