Merge branch 'master' of https://git.haier.net/Overseas_WMS/hgwms-factory-app

src/i18n/lang/cn.ts

@@ -163,6 +163,7 @@ export default {
     Pi_tip: '提示',
     Pi_tip5: '上传成功',
     Pi_tip6: '本次拣配数量+拣配数量不允许大于需求数量',
+    Pi_tip20: '已添加数量+本次添加数量不可大于可用数量',
     Pi_tip14: '本次交接数量+累计拣配数量不能大于需求数量',
     Pi_tip8: '本次交接数量+交接数量不允许大于拣配数量',
     Pi_tip9: '本次补料数量+已补数量不允许大于需求数量',

src/i18n/lang/en.ts

@@ -162,6 +162,7 @@ export default {
     Pi_tip4: 'No data available to upload',
     Pi_tip: 'Tip',
     Pi_tip5: 'Success',
+    Pi_tip20: 'Added quantity + current quantity cannot exceed available quantity',
     Pi_tip6: 'The pick up Qty plus pick Qty cannot be greater than the Request Qty',
     Pi_tip14: 'The current handover quantity + cumulative picking quantity cannot be greater than the required quantity',
     Pi_tip8: 'This handover Qty plus handover Qty cannot be greater than the pick up Qty',

src/i18n/lang/ru.ts

@@ -159,6 +159,7 @@ export default {
     Pi_tip2: 'Пикап Кол-во больше 0',
     Pi_tip3: 'Пожалуйста, обновите количество для получения перед загрузкой',
     Pi_tip10: 'Пожалуйста, обновите добавленное количество перед загрузкой',
+    Pi_tip20: 'добавлено количество + это количество не может превышать допустимое количество ',
     Pi_tip4: 'Нет данных для загрузки',
     Pi_tip: 'Наконечник',
     Pi_tip5: 'Успех',

src/pages/raw/handover/RUS-picking/ByOrder.vue

@@ -23,14 +23,14 @@
     </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-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="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" />
@@ -220,6 +220,7 @@ export default class RawReceiptDetail extends BasePage {
       value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
       sendSpot: this.Container.sendSpot,
     };
+    this.Location = [];
     this.Location.push(arr);
     this.wlCode = this.Location[0];
     this.qty = this.Container.qty - parseFloat(this.Container.cpRef4);

src/pages/raw/handover/RUS-picking/BySummary.vue

@@ -24,15 +24,15 @@
     </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-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="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" />
@@ -211,6 +211,7 @@ export default class RawReceiptDetail extends BasePage {
       value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
       sendSpot: this.Container.sendSpot,
     };
+    this.Location = [];
     this.Location.push(arr);
     this.wlCode = this.Location[0];
     this.qty = this.Container.qty - parseFloat(this.Container.cpRef4);