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] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E=E4=BF=84?=
 =?UTF-8?q?=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',
     },