@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

package/src/components/page/inner/taskMove/index/index.vue

@@ -13,7 +13,7 @@
 
       <!-- 看板 -->
       <div>
-        <div style="padding: 10px;border-radius: 10px 10px 0 0;background: #fff">
+        <div class="lw-global-model-top-radius">
           <span class="lw-global-title">
             {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.taskNo','任务号') }}
           </span>
@@ -24,13 +24,13 @@
           <!-- 品种数 -->
           <div>
             <div>{{ taskData.skuCount || 0 }}</div>
-            <div class="lw-data-look-bg-title">{{ $lwLanguage.get('wms_project.pda.inbound.taskMove.skuCount','品种数') }}</div>
+            <div>{{ $lwLanguage.get('wms_project.pda.inbound.taskMove.skuCount','品种数') }}</div>
           </div>
 
           <!-- 计划量 -->
           <div>
             <div>{{ taskData.planQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.planQty','计划量') }}
             </div>
           </div>
@@ -38,7 +38,7 @@
           <!-- 已上架 -->
           <div>
             <div>{{ taskData.putUpQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.putUpQty','已上架') }}
             </div>
           </div>
@@ -46,7 +46,7 @@
           <!-- 待上架 -->
           <div>
             <div>{{ taskData.toPutUpQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.toPutUpQty','待上架') }}
             </div>
           </div>
@@ -54,7 +54,7 @@
           <!-- 异常量 -->
           <div>
             <div>{{ taskData.abnQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.abnQty','异常量') }}
             </div>
           </div>
@@ -72,7 +72,10 @@
         >
 
           <!-- 下架 -->
-          <van-tab name="down" title="下架">
+          <van-tab
+            name="down"
+            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.down','下架')"
+          >
 
             <div
               v-if="taskData.putDownMoveTaskLines.length"
@@ -89,14 +92,14 @@
               </div>
 
               <!-- 内装数 -->
-              <div class="lw-global-row">
-                <span class="lw-global-title">
-                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.innerQty','内装数') }}
-                </span>
-                <span class="lw-global-value-bold">
-                  {{ taskData.putDownMoveTaskLines[downData.index].innerQty }}
-                </span>
-              </div>
+<!--              <div class="lw-global-row">-->
+<!--                <span class="lw-global-title">-->
+<!--                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.innerQty','内装数') }}-->
+<!--                </span>-->
+<!--                <span class="lw-global-value-bold">-->
+<!--                  {{ taskData.putDownMoveTaskLines[downData.index].innerQty }}-->
+<!--                </span>-->
+<!--              </div>-->
 
               <!-- 下架库位 -->
               <div class="lw-global-row">
@@ -117,6 +120,16 @@
                   {{ taskData.putDownMoveTaskLines[downData.index].fromLpn }}
                 </span>
               </div>
+              <!-- 下架箱号 -->
+              <div class="lw-global-row" v-if="hasDownCase()">
+                <span class="lw-global-title">
+                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.downCase','下架箱号') }}
+                </span>
+                <span class="lw-global-value-bold">
+                  {{ taskData.putDownMoveTaskLines[downData.index].fromCase }}
+                </span>
+              </div>
+
 
               <!-- 数据看板 -->
               <div class="lw-global-row lw-global-flex-around">
@@ -171,35 +184,47 @@
                   @confirm="downDataDownLpnConfirm"
               />
 
-              <!-- 商品条码 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
-                v-model="downData.input.sku.value"
-                :get-focus.sync="downData.input.sku.focus"
-                required
-                rule-key="sku"
-                @confirm="downDataSkuCodeConfirm"
-              />
+              <div v-if="taskData.putDownMoveTaskLines[downData.index].needHandleSn">
+
+                <lw-input
+                  :title="$lwLanguage.get('','扫描序列号')"
+                  v-model="downData.input.sn.value"
+                  :get-focus.sync="downData.input.sn.focus"
+                  :create-rule="$lwScanRule.create('标准移动-SN','SN')"
+                  auto-clear-val
+                  rule-key="sn"
+                  required
+                  @confirm="moveDownTaskSnConfirm"
+                />
+                <lw-scan-data-list-module
+                  title="已扫描序列号"
+                  v-model="downData.input.snList"
+                />
+
+              </div>
+              <div v-else>
+                <!-- 商品条码 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
+                  v-model="downData.input.sku.value"
+                  :get-focus.sync="downData.input.sku.focus"
+                  required
+                  rule-key="sku"
+                  @confirm="downDataSkuCodeConfirm"
+                />
+
+                <!-- 数量 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
+                  v-model="downData.input.num.value"
+                  :get-focus.sync="downData.input.num.focus"
+                  type="digit"
+                  required
+                  @confirm="downDataNumConfirm"
+                />
+              </div>
 
-              <!-- 数量 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
-                v-model="downData.input.num.value"
-                :get-focus.sync="downData.input.num.focus"
-                type="digit"
-                required
-                @confirm="downDataNumConfirm"
-              />
 
-              <!-- 托盘号 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.lpn','中转容器号')"
-                v-model="downData.input.lpn.value"
-                :get-focus.sync="downData.input.lpn.focus"
-                required
-                rule-key="container"
-                @confirm="actionDown"
-              />
 
               <!-- 切换按钮 -->
               <lw-cut-card
@@ -223,13 +248,59 @@
 
             </div>
 
+            <div   class="lw-global-model-box"  v-if="taskData.putDownMoveTaskLines.length">
+              <lw-cell
+                :title="$lwLanguage.get('', '快速移动')"
+                :is-link="false"
+              >
+                <template #value>
+                  <van-switch
+                    v-model="fastMove.down"
+                    size="18px"
+                  />
+                </template>
+              </lw-cell>
+              <div v-if="fastMove.down">
+                <!-- 目标库位 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.fastMoveLoc','目标库位')"
+                  v-model="downData.input.fastLoc.value"
+                  :get-focus.sync="downData.input.fastLoc.focus"
+                  required
+                  rule-key="location"
+                  @confirm="fastLocConfirm"
+                />
+                <!-- 目标托盘 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.fastMoveLpn','目标托盘号')"
+                  v-model="downData.input.fastLpn.value"
+                  :get-focus.sync="downData.input.fastLpn.focus"
+                  rule-key="lpn"
+                  @confirm="actionDown"
+                />
+              </div>
+              <div v-else>
+                <!-- 托盘号 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.lpn','中转容器号')"
+                  v-model="downData.input.lpn.value"
+                  :get-focus.sync="downData.input.lpn.focus"
+                  required
+                  rule-key="container"
+                  @confirm="actionDown"
+                />
+              </div>
+            </div>
+
             <lw-not-data v-else/>
 
           </van-tab>
 
 
           <!-- 上架 -->
-          <van-tab name="up" title="上架">
+          <van-tab
+            name="up"
+            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.up','上架')">
 
             <div
               v-if="taskData.putUpMoveTaskLines.length"
@@ -243,21 +314,32 @@
               </div>
 
               <!-- 中转容器号 -->
-              <div class="lw-global-row">
-                <span class="lw-global-title">
-                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.lpn','中转容器号') }}
-                </span>
-                <span class="lw-global-value-bold">{{ taskData.putUpMoveTaskLines[upData.index].curLpn }}</span>
+              <div class="lw-global-row lw-global-flex-between">
+                <div>
+                  <span class="lw-global-title">
+                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.lpn','中转容器号') }}
+                  </span>
+                  <span class="lw-global-value-bold">{{ taskData.putUpMoveTaskLines[upData.index].curLpn }}</span>
+                </div>
+                <lw-button v-if="wholeLpns[taskData.putUpMoveTaskLines[upData.index].curLpn]" mini @click="wholeLpnUp(taskData.putUpMoveTaskLines[upData.index].curLpn)">整容器上架</lw-button>
               </div>
 
-              <!-- 内装数 -->
-              <div class="lw-global-row">
+              <!-- 中转箱号 -->
+              <div class="lw-global-row" v-if="taskData.putUpMoveTaskLines[upData.index].curCase">
                 <span class="lw-global-title">
-                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.innerQty','内装数') }}
+                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.caseNum','中转箱号') }}
                 </span>
-                <span class="lw-global-value-bold">{{ taskData.putUpMoveTaskLines[upData.index].innerQty }}</span>
+                <span class="lw-global-value-bold">{{ taskData.putUpMoveTaskLines[upData.index].curCase }}</span>
               </div>
 
+              <!-- 内装数 -->
+<!--              <div class="lw-global-row">-->
+<!--                <span class="lw-global-title">-->
+<!--                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.innerQty','内装数') }}-->
+<!--                </span>-->
+<!--                <span class="lw-global-value-bold">{{ taskData.putUpMoveTaskLines[upData.index].innerQty }}</span>-->
+<!--              </div>-->
+
               <!-- 上架库位 -->
               <div class="lw-global-row">
                 <span class="lw-global-title">
@@ -295,28 +377,51 @@
                 </div>
               </div>
 
-              <lw-lot-look-module :columns="taskData.putUpMoveTaskLines[upData.index].groupKeyItemList"
-                                  title-key="label" value-key="value"/>
-
-              <!-- 商品条码 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
-                v-model="upData.input.sku.value"
-                :get-focus.sync="upData.input.sku.focus"
-                required
-                rule-key="sku"
-                @confirm="upDataSkuCodeConfirm"
+              <lw-lot-look-module
+                :columns="taskData.putUpMoveTaskLines[upData.index].groupKeyItemList"
+                title-key="label" value-key="value"
               />
 
-              <!-- 数量 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
-                v-model="upData.input.num.value"
-                :get-focus.sync="upData.input.num.focus"
-                type="digit"
-                required
-                @confirm="upDataNumConfirm"
-              />
+              <div v-if="taskData.putUpMoveTaskLines[upData.index].needHandleSn">
+
+                <lw-input
+                  :title="$lwLanguage.get('','扫描序列号')"
+                  v-model="upData.input.sn.value"
+                  :get-focus.sync="upData.input.sn.focus"
+                  :create-rule="$lwScanRule.create('标准移动-SN','SN')"
+                  auto-clear-val
+                  rule-key="sn"
+                  required
+                  @confirm="moveUpTaskSnConfirm"
+                />
+                <lw-scan-data-list-module
+                  title="已扫描序列号"
+                  v-model="upData.input.snList"
+                />
+
+              </div>
+
+              <div v-else>
+                <!-- 商品条码 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
+                  v-model="upData.input.sku.value"
+                  :get-focus.sync="upData.input.sku.focus"
+                  required
+                  rule-key="sku"
+                  @confirm="upDataSkuCodeConfirm"
+                />
+
+                <!-- 数量 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
+                  v-model="upData.input.num.value"
+                  :get-focus.sync="upData.input.num.focus"
+                  type="digit"
+                  required
+                  @confirm="upDataNumConfirm"
+                />
+              </div>
 
               <!-- 接力上架 -->
               <lw-cell
@@ -356,6 +461,16 @@
                   rule-key="upLpn"
                   @confirm="upDataLpnConfirm"
                 />
+
+                <!-- 目标托盘 -->
+                <lw-input
+                  class="lw-global-animation-rotate"
+                  :title="$lwLanguage.get('目标箱号','目标箱号')"
+                  v-model="upData.input.case.value"
+                  :get-focus.sync="upData.input.case.focus"
+                  rule-key="upLpn"
+                  @confirm="upDataCaseConfirm"
+                />
               </div>
 
               <!-- 接力上架 -->
@@ -424,10 +539,15 @@
       >{{ $lwLanguage.get('wms_project.pda.inbound.taskMove.littleDown','缺货下架') }}</lw-button>
 
 
-      <lw-button @click="actionDown">
+      <lw-button @click="actionDown" v-if="fastMove.down">
+        {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.confirmFastMove','确认快速移动') }}
+      </lw-button>
+
+      <lw-button @click="actionDown" v-else>
         {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.confirmDown','确认下架') }}
       </lw-button>
     </lw-bottom-bar>
+
     <!-- 上架状态时底部按钮 -->
     <lw-bottom-bar v-if="tabActive === 'up' && taskData.putUpMoveTaskLines.length">
       <lw-button
@@ -568,6 +688,44 @@
 
     </lw-popup>
 
+    <!-- 整托上架弹框 -->
+    <lw-popup title="整托盘上架" v-if="upLpnData" v-model="upLpnPop.show">
+      <div>
+        <div class="lw-global-row">
+          <lw-title-value-cell title="托盘号" :value="upLpnData.lpn" val-bold :is-row="false" />
+        </div>
+        <div class="lw-global-row lw-global-flex-between">
+          <lw-title-value-cell title="品种数" :value="upLpnData.skuCount" val-bold val-red :is-row="false" />
+          <lw-title-value-cell title="待上架" :value="upLpnData.toUpQty" val-bold val-red :is-row="false" />
+        </div>
+      </div>
+      <div class="box-model">
+        <div class="box-item-sku" v-for="line in upLpnData.lines" :key="line.id">
+          <!-- 任务行信息 -->
+          <div class="lw-global-row">
+            <div class="lw-global-flex-between">
+              <div>
+                <div class="lw-global-value-bold">{{line.skuCode}}</div>
+                <div class="lw-global-title">{{line.skuName}}</div>
+              </div>
+              <div style="text-align: center;">
+                <div class="lw-global-value-bold" style="color: red;">{{line.pickQty}}</div>
+                <div class="lw-global-title">数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="lw-global-row">
+        <lw-input title="确认托盘" v-model="upLpnPop.lpn.value" :get-focus.sync="upLpnPop.lpn.focus" @confirm="checkWholeLpn" />
+        <lw-input title="目标库位" required v-model="upLpnPop.loc.value" :get-focus.sync="upLpnPop.loc.focus" @confirm="doWholeLpnUp"/>
+
+      </div>
+      <template #button>
+        <lw-button @click="doWholeLpnUp">整托盘上架</lw-button>
+      </template>
+    </lw-popup>
+
   </div>
 </template>
 
@@ -577,13 +735,21 @@ import {
   wmsExecMobileMove,
   wmsGetMoveTaskInfo,
   wmsMoveTaskAbnormalSubmit,
-  wmsMoveTaskLessQtyAbnormalSubmit
+  wmsMoveTaskLessQtyAbnormalSubmit,
+  wmsGetWholeContainerMoveTaskInfo,
+  wmsWholeLpnUp,
 } from "../../../../../api/inner/move/taskMove";
+import {innerMoveTaskMoveUpSnCheck,innerMoveTaskMoveDownSnCheck} from "../../../../../api/inner/snCheck/snCheck";
 
 export default {
   name: "lwTaskMovePage",
   data() {
     return {
+      fastMove: {
+        down: false,
+        up: false
+      },
+
       // 任务数据
       taskData:{
         putDownMoveTaskLines:[],
@@ -642,6 +808,11 @@ export default {
             value:'',
             focus: false
           },
+          // sn
+          sn:{
+            value:'',
+            focus: false
+          },
           // 数量
           num:{
             value:'',
@@ -652,6 +823,19 @@ export default {
             value:'',
             focus: false
           },
+          // 目标库位
+          fastLoc: {
+            value: '',
+            focus: false
+          },
+          // 目标托盘
+          fastLpn: {
+            value: '',
+            focus: false
+          },
+
+          // sn扫描列表
+          snList:[]
         }
       },
 
@@ -683,6 +867,19 @@ export default {
             value:'',
             focus: false
           },
+          // 目标箱号
+          case:{
+            value:'',
+            focus: false
+          },
+          // sn
+          sn:{
+            value:'',
+            focus: false
+          },
+          // sn扫描列表
+          snList:[]
+
         }
       },
       // 上架 - 扫描商品定位
@@ -692,31 +889,44 @@ export default {
           value:'',
           focus: false
         }
-      }
+      },
+      wholeLpns: {},
+      // 当前整托上架的托盘数据
+      upLpnData: null,
+      upLpnPop: {
+        show: false,
+        loc: {
+          value: '',
+          focus: false,
+        },
+        lpn: {
+          value: '',
+          focus: false,
+        },
+      },
+      initLpn: undefined,
     }
   },
   mounted() {
     if (this.$route.query.tabActive) {
       this.tabActive = this.$route.query.tabActive
     }
+    this.initLpn = this.$route.query.lpn
 
     this.getData()
   },
   methods: {
     // 获取数据
     getData(){
-      wmsGetMoveTaskInfo({
-        taskId: this.$route.query.lwTaskId
-      }).then(res=>{
-        this.taskData = res
+      const taskId =  this.$route.query.lwTaskId;
 
-        if ((this.downData.index + 1) > this.taskData.putDownMoveTaskLines.length){
-          this.downData.index > 0 ? this.downData.index-- : this.downData.index = 0
-        }
+      wmsGetMoveTaskInfo({ taskId }).then(res=>{
+        this.downData.index = this.$lwUtils.cutCardIndexCount(this.downData.index, res.putDownMoveTaskLines.length)
+        this.upData.index = this.$lwUtils.cutCardIndexCount(this.upData.index, res.putUpMoveTaskLines.length)
 
-        if ((this.upData.index + 1) > this.taskData.putUpMoveTaskLines.length){
-          this.upData.index > 0 ? this.upData.index-- : this.upData.index = 0
-        }
+        this.taskData = res
+
+        this.initWholeUpData(taskId)
 
         // 滚动到页面顶部
         document.querySelector('#lw-task-move-top').scrollIntoView({
@@ -735,6 +945,13 @@ export default {
         if (this.taskData.putDownMoveTaskLines.length) {
           this.tabActive = 'down'
           this.downData.input.local.focus = true
+          if (this.initLpn !== undefined) {
+            const idx = this.taskData.putDownMoveTaskLines.findIndex(i => i.fromLpn === this.initLpn)
+            if (idx > -1) {
+              this.downData.index = idx
+              this.initLpn = undefined
+            }
+          }
           return
         }
 
@@ -742,6 +959,13 @@ export default {
         if (this.taskData.putUpMoveTaskLines.length){
           this.tabActive = 'up'
           this.upData.input.sku.focus = true
+          if (this.initLpn !== undefined) {
+            const idx = this.taskData.putUpMoveTaskLines.findIndex(i => i.fromLpn === this.initLpn)
+            if (idx > -1) {
+              this.upData.index = idx
+              this.initLpn = undefined
+            }
+          }
           return
         }
 
@@ -749,10 +973,18 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.taskOver','当前任务已完成')
         )
-        history.go(-1)
+        history.go(this.$route.query.lwComeFrom === 'whole' ? -2 : -1)
       }).catch(()=>history.go(-1))
     },
 
+    initWholeUpData (taskId) {
+      wmsGetWholeContainerMoveTaskInfo(taskId).then(res => {
+        const lpns = {}
+        res.lpns.filter(i => !!i.lpn && i.whole && i.status === '400').forEach(item => lpns[item.lpn] = item)
+        this.wholeLpns = lpns
+      })
+    },
+
     // tab切换
     tabChange(){
       if(this.tabActive === 'up'){
@@ -897,7 +1129,7 @@ export default {
 
       const item = this.abnormalPopup.item
       wmsMoveTaskAbnormalSubmit({
-        taskId: this.$route.query.taskId,
+        taskId: this.$route.query.lwTaskId,
         taskLineKey: item.lineKey,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
@@ -945,14 +1177,29 @@ export default {
       input.sku.value = ''
       input.num.value = ''
       input.lpn.value = ''
+      input.snList=[]
+      input.sn={
+        value:'',
+        focus: false
+      }
+    },
+
+    needHandleSn(){
+      return this.taskData.putDownMoveTaskLines[this.downData.index].needHandleSn
     },
 
     // 是否有下架托盘
     hasDownLpn(){
       let item = this.taskData.putDownMoveTaskLines[this.downData.index]
-      console.log(item.fromLpn && item.fromLpn !== '')
+
       return item.fromLpn && item.fromLpn !== ''
     },
+    // 是否有下架箱号
+    hasDownCase(){
+      let item = this.taskData.putDownMoveTaskLines[this.downData.index]
+
+      return item.fromCase && item.fromCase !== ''
+    },
 
     // 库位确认
     downDataLocalConfirm(){
@@ -960,7 +1207,12 @@ export default {
         if (this.hasDownLpn()) {
           this.downData.input.downLpn.focus = true
         } else {
-          this.downData.input.sku.focus = true
+          if(this.needHandleSn()){
+            this.downData.input.sn.focus = true
+          }else{
+            this.downData.input.sku.focus = true
+          }
+
         }
       }
     },
@@ -992,7 +1244,11 @@ export default {
     // 下架托盘确认
     downDataDownLpnConfirm() {
       if (this.downDataDownLpnCheck()){
-        this.downData.input.sku.focus = true
+        if(this.needHandleSn()){
+          this.downData.input.sn.focus = true
+        }else{
+          this.downData.input.sku.focus = true
+        }
       }
     },
     // 下架托盘校验
@@ -1028,6 +1284,18 @@ export default {
     },
     // 商品号输入校验
     downDataSkuCodeCheck(){
+
+
+      if(this.taskData.putDownMoveTaskLines[this.downData.index].needHandleSn){
+        if(this.downData.input.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','请扫描SN')
+          )
+          return false
+        }
+        return true
+      }
+
       const sku = this.downData.input.sku
       // 非空校验
       if (!sku.value){
@@ -1052,13 +1320,26 @@ export default {
     },
 
     // 数量确认
-    downDataNumConfirm(){
-      if (this.downDataNumCheck()){
+    downDataNumConfirm() {
+      if (this.fastMove.down && this.downDataNumCheck()) {
+        this.downData.input.fastLoc.focus = true
+      } else {
         this.downData.input.lpn.focus = true
       }
     },
     // 数量校验
     downDataNumCheck(){
+
+      if(this.taskData.putDownMoveTaskLines[this.downData.index].needHandleSn){
+        if(this.downData.input.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','请扫描SN')
+          )
+          return false
+        }
+        return true
+      }
+
       const num = Number(this.downData.input.num.value || 0)
       if (!num){
         this.downData.input.num.focus = true
@@ -1081,6 +1362,15 @@ export default {
       return true
     },
 
+    // 目标库位
+    fastLocConfirm() {
+      if (this.fastMove.down) {
+        this.downData.input.fastLpn.focus = true
+      } else {
+        this.downData.input.lpn.focus = true
+      }
+    },
+
     // 托盘号校验
     downDataLpnConfirm(){
       if(this.downDataLpnCheck()){
@@ -1098,6 +1388,25 @@ export default {
       return false
     },
 
+    fastDownDataLocCheck() {
+      if (this.downData.input.fastLoc.value) return true
+
+      this.downData.input.fastLoc.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('', '快速移动目标库位不能为空')
+      )
+      return false
+    },
+
+    //
+    downDataTargetCheck() {
+      if (this.fastMove.down) {
+        return this.fastDownDataLocCheck();
+      } else {
+        return this.downDataLpnCheck();
+      }
+    },
+
     // 下架异常
     downDataAbnormal(){
       const item = this.taskData.putDownMoveTaskLines[this.downData.index]
@@ -1121,7 +1430,7 @@ export default {
         !(this.downDataLocalCheck() &&
           this.downDataSkuCodeCheck() &&
           this.downDataNumCheck() &&
-          this.downDataLpnCheck())
+          this.downDataTargetCheck())
       ) return
 
       const item = this.taskData.putDownMoveTaskLines[this.downData.index]
@@ -1133,8 +1442,12 @@ export default {
         skuId: item.skuId,
         toLocationCode: this.downData.input.local.value,
         toLpn: this.downData.input.lpn.value,
+        fastMove: this.fastMove.down,
+        fastMoveToLocationCode: this.downData.input.fastLoc.value,
+        fastMoveToLpn: this.downData.input.fastLpn.value,
         moveQty: this.downData.input.num.value,
-        moveMethod: '1' // 1-下架，2-上架
+        moveMethod: '1',  // 1-下架，2-上架
+        snParamList:this.downData.input.snList,
       }, this.downClearInput)
     },
 
@@ -1149,6 +1462,14 @@ export default {
       this.upData.input.wait = false
       this.upData.input.local.value = ''
       this.upData.input.lpn.value = ''
+      this.upData.input.snList=[]
+      this.upData.input.sn={
+        value:'',
+        focus: false
+      }
+      this.upLpnData = null
+      this.upLpnPop.loc.value = ''
+      this.upLpnPop.lpn.value = ''
     },
 
     // 商品号确认
@@ -1159,6 +1480,17 @@ export default {
     },
     // 商品号输入校验
     upDataSkuCodeCheck(){
+
+      if(this.taskData.putUpMoveTaskLines[this.upData.index].needHandleSn){
+        if(this.upData.input.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','请扫描SN')
+          )
+          return false
+        }
+        return true;
+      }
+
       const sku = this.upData.input.sku
       // 非空校验
       if (!sku.value){
@@ -1190,6 +1522,11 @@ export default {
     },
     // 数量校验
     upDataNumCheck(){
+
+      if(this.taskData.putUpMoveTaskLines[this.upData.index].needHandleSn){
+        return true;
+      }
+
       const num = Number(this.upData.input.num.value || 0)
       if (!num){
         this.upData.input.num.focus = true
@@ -1243,7 +1580,7 @@ export default {
     // 托盘号校验
     upDataLpnConfirm(){
       if(this.upDataLpnCheck()){
-        this.actionUp()
+        this.upData.input.case.focus = true
       }
     },
     // 托盘号校验
@@ -1257,6 +1594,11 @@ export default {
       return false
     },
 
+    // 托盘号校验
+    upDataCaseConfirm(){
+      this.actionUp()
+    },
+
     // 确认上架
     actionUp(){
 
@@ -1272,7 +1614,7 @@ export default {
       // 检验库位是否正确
       const upLocal = this.taskData.putUpMoveTaskLines[this.upData.index].toLocationCode
       if(!this.upData.input.wait && upLocal && this.upData.input.local.value !== upLocal) {
-        this.$dialog.confirm({
+        this.$lwDialog.confirm({
           title: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.total', '提示'),
           message: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.toLocalError', '目标库位与上架库位不一致，确认继续？')
         }).then(() => {
@@ -1284,9 +1626,11 @@ export default {
             skuId: item.skuId,
             toLocationCode: this.upData.input.local.value,
             toLpn: this.upData.input.lpn.value,
+            toCase: this.upData.input.case.value,
             moveQty: this.upData.input.num.value,
             relay: this.upData.input.wait,
-            moveMethod: '2' // 1-下架，2-上架
+            moveMethod: '2', // 1-下架，2-上架
+            snParamList:this.upData.input.snList
           }, this.upClearInput)
         }).catch(() => {})
 
@@ -1300,12 +1644,78 @@ export default {
         skuId: item.skuId,
         toLocationCode: this.upData.input.local.value,
         toLpn: this.upData.input.lpn.value,
+        toCase: this.upData.input.case.value,
         moveQty: this.upData.input.num.value,
         relay: this.upData.input.wait,
-        moveMethod: '2' // 1-下架，2-上架
+        moveMethod: '2' ,// 1-下架，2-上架
+        snParamList:this.upData.input.snList
       }, this.upClearInput)
     },
 
+    // 整容器上架
+    wholeLpnUp(lpn){
+      this.upLpnData = this.wholeLpns[lpn]
+      this.upLpnPop.show = true
+
+      this.$nextTick(()=>{
+        this.upLpnPop.lpn.focus = true
+      })
+    },
+
+
+    checkWholeLpn(){
+      const confirmLpn = this.upLpnPop.lpn.value
+      if(!confirmLpn){
+        this.$lwShowErrorMsg('请确认托盘号')
+        this.upLpnPop.lpn.focus = true
+        return false
+      }
+      if(this.upLpnData.lpn !== confirmLpn){
+        this.$lwShowErrorMsg('确认托盘号不一致，请重新扫描')
+        this.upLpnPop.lpn.focus = true
+        return false
+      }
+      this.upLpnPop.loc.focus = true
+      return true
+    },
+
+    // 整容器上架
+    doWholeLpnUp(){
+      if (!this.upLpnData) {
+        return
+      }
+      if(!this.checkWholeLpn()){
+        return
+      }
+      const toLocCode = this.upLpnPop.loc.value
+      if (!toLocCode) {
+        this.upLpnPop.loc.value = ''
+        this.upLpnPop.loc.focus = true
+        return this.$lwShowErrorMsg('目标库位不能为空')
+      }
+      const toLpn = this.upLpnPop.lpn.value
+
+      const method = () => {
+        wmsWholeLpnUp(this.upLpnData.lpn, toLocCode, toLpn).then(() => {
+          this.upLpnPop.show = false
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.success','操作成功')
+          )
+          this.upClearInput()
+          this.getData()
+        })
+      }
+
+      if (this.upLpnData.toLocCode && this.upLpnData.toLocCode !== toLocCode) {
+        this.$dialog.confirm({
+          title: '提示',
+          message: `任务的目标库位是 ${this.upLpnData.toLocCode}，确定要上架的库位 ${toLocCode} 吗？`
+        }).then(method).catch(() => {})
+      } else {
+        method()
+      }
+    },
+
     // 缺货上架
     upLess(){
 
@@ -1359,7 +1769,95 @@ export default {
       )
       this.upSkuSeoPopup.sku.focus = true
       this.upSkuSeoPopup.sku.value = ''
+    },
+    moveDownTaskSnConfirm(value, {data}){
+      let snkey = data.key;
+      let snQty = data.qty;
+
+      this.downData.input.sn.value=''
+
+      let moveDownSnCheck = {sn:snkey,qty:snQty,taskId: this.$route.query.lwTaskId};
+      innerMoveTaskMoveDownSnCheck(moveDownSnCheck).then(res=>{
+
+        if(!this.snScanDownCheck(snkey,res.snInvQty)){
+          return
+        }
+
+        this.downData.input.snList.unshift({
+          sn:snkey,
+          qty: res.snInvQty
+        })
+      })
+
+    },
+    snScanDownCheck(sn, qty){
+      let snCount=0
+      for (let i = 0; i < this.downData.input.snList.length; i++) {
+        let snObj=this.downData.input.snList[i]
+        if(snObj.sn===sn){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','重复扫描的SN:')+sn
+          )
+          return false;
+        }
+        snCount+=snObj.qty
+      }
+      let availInvQty=(this.taskData.toPutUpQty||0)
+      console.log("总扫描数量:",(snCount+qty))
+      console.log("当前待上架:",availInvQty)
+      if((snCount+qty) > availInvQty){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','扫描数量大于待下架数量')
+        )
+        return false;
+      }
+      return true;
+    },
+
+    moveUpTaskSnConfirm(value, {data}){
+      let snkey = data.key;
+      let snQty = data.qty;
+
+
+      innerMoveTaskMoveUpSnCheck({sn:snkey,qty:snQty,taskId: this.$route.query.lwTaskId,}).then(res=>{
+
+        if(!this.snUpScanCheck(snkey,res.snInvQty)){
+          return;
+        }
+
+        this.upData.input.snList.unshift({
+          sn:snkey,
+          qty: res.snInvQty
+        })
+      })
+
+
+    },
+    snUpScanCheck(sn,qty){
+      let snCount=0
+      for (let i = 0; i < this.upData.input.snList.length; i++) {
+        let snObj=this.upData.input.snList[i]
+        if(snObj.sn===sn){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','重复扫描的SN:')+sn
+          )
+          return false;
+        }
+        snCount+=snObj.qty
+      }
+      let availInvQty=this.taskData.putUpMoveTaskLines[this.upData.index].todoQty
+      console.log("总扫描数量:",(snCount+qty))
+      console.log("当前行可用数量:",availInvQty)
+      if((snCount+qty) > availInvQty){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','扫描数量大于待上架数量')
+        )
+        return false;
+      }
+      return true;
     }
+
+
   }
 }
 </script>