@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.2

package/src/views/wms/page/inner/taskMove/index/index.vue

@@ -19,39 +19,13 @@
           </span>
           <span class="lw-global-value-bold">{{ taskData.taskNo }}</span>
         </div>
-        <lw-data-look-bg type="bottom">
-
-          <!-- 品种数 -->
-          <lw-data-look-item
-            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCount', '品种数')"
-            :value="taskData.skuCount || 0"
-          />
-
-          <!-- 计划量 -->
-          <lw-data-look-item
-            :value="taskData.planQty || 0"
-            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.planQty', '计划量')"
-          />
-
-          <!-- 已上架 -->
-          <lw-data-look-item
-            :value="taskData.putUpQty || 0"
-            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.putUpQty', '已上架')"
-          />
-
-          <!-- 待上架 -->
-          <lw-data-look-item
-            :value="taskData.toPutUpQty || 0"
-            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.toPutUpQty', '待上架')"
-          />
-
-          <!-- 异常量 -->
-          <lw-data-look-item
-            :value="taskData.abnQty || 0"
-            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.abnQty', '异常量')"
-          />
-
-        </lw-data-look-bg>
+        <lw-data-look-bg
+          type="bottom"
+          :data="taskData.labeledQtyList"
+          title-key="fieldCode"
+          value-key="qtyLabel"
+          :show-end-line="false"
+        />
       </div>
 
       <!-- tab -->
@@ -105,39 +79,27 @@
 
 
               <!-- 数据看板 -->
-              <div class="lw-global-row lw-global-flex-around">
-                <!-- 待下架 -->
-                <div class="lw-task-move-look-item">
-                  <div class="lw-global-value-bold">{{
-                      nowDownData.todoQty || 0
-                    }}
-                  </div>
-                  <div class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.todoQty', '待下架') }}
-                  </div>
-                </div>
-
-                <!-- 已下架 -->
-                <div class="lw-task-move-look-item">
-                  <div class="lw-global-value-bold">{{
-                      nowDownData.doneQty || 0
-                    }}
-                  </div>
-                  <div class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.doneQty', '已下架') }}
-                  </div>
-                </div>
-
-                <!-- 异常量 -->
-                <div class="lw-task-move-look-item">
-                  <div class="lw-global-value-bold" style="color: #D50000">
-                    {{ nowDownData.abnQty || 0 }}
-                  </div>
-                  <div class="lw-global-title" style="color: #D50000">
-                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.abnQty', '异常量') }}
-                  </div>
-                </div>
-              </div>
+              <lw-data-look-bg
+                class="lw-global-row"
+                style="padding: 0"
+                type="null"
+                :show-end-line="false"
+                need-show
+              >
+                <lw-data-look-item
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.todoQty', '待下架')"
+                  :value="nowDownData.todoQtyLabel"
+                />
+                <lw-data-look-item
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.doneQty', '已下架')"
+                  :value="nowDownData.doneQtyLabel"
+                />
+                <lw-data-look-item
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.abnQty', '异常量')"
+                  :value="nowDownData.abnQtyLabel"
+                  color="#D50000"
+                />
+              </lw-data-look-bg>
 
               <lw-lot-look-module
                 class="lw-global-row"
@@ -149,11 +111,15 @@
 
               <!-- 库位 -->
               <lw-input
+                v-if="downData.input.local.show"
                 :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.downLocal','下架库位')"
                 v-model="downData.input.local.value"
                 :get-focus.sync="downData.input.local.focus"
                 required
                 rule-key="downLocal"
+                :create-rule="$lwScanRule.create('标准移动-下架-下架库位','LOCATION')"
+                :owner-id="nowDownData.ownerId"
+                :rule-serve-query="nowDownData"
                 @confirm="downDataLocalConfirm"
               />
 
@@ -165,46 +131,69 @@
                 :get-focus.sync="downData.input.downLpn.focus"
                 required
                 rule-key="downLpn"
+                :create-rule="$lwScanRule.create('标准移动-下架-下架托盘号','LPN')"
+                :owner-id="nowDownData.ownerId"
+                :rule-serve-query="nowDownData"
                 @confirm="downDataDownLpnConfirm"
               />
 
+              <!-- 序列号 -->
               <div v-if="nowDownData.needHandleSn">
 
                 <lw-input
                   :title="$lwLanguage.get('wms_project.pda.components.page.inner.taskMove.index.index.unmkzzwu','扫描序列号')"
                   v-model="downData.input.sn.value"
                   :get-focus.sync="downData.input.sn.focus"
-                  :create-rule="$lwScanRule.create('标准移动-SN','SN')"
+                  :create-rule="$lwScanRule.create('标准移动-下架-序列号','SN')"
                   auto-clear-val
-                  rule-key="sn"
+                  rule-key="downSn"
                   required
+                  :owner-id="nowDownData.ownerId"
+                  :rule-serve-query="nowDownData"
                   @confirm="moveDownTaskSnConfirm"
                 />
                 <lw-scan-data-list-module
                   :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.jrpylmoq', '已扫描序列号')"
                   v-model="downData.input.snList"
+                  @del="checkDownPrintOldLabelSwitchDisabled"
+                  @confirm="checkDownPrintOldLabelSwitchDisabled"
                 />
 
               </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"
+                  rule-key="downSku"
+                  :create-rule="$lwScanRule.create('标准移动-下架-商品号','SKU')"
+                  :owner-id="nowDownData.ownerId"
+                  :rule-serve-query="nowDownData"
                   @confirm="downDataSkuCodeConfirm"
                 />
 
-                <!-- 数量 -->
-                <lw-input
+                <lw-get-qty-by-type
+                  ref="downQty"
                   :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
+                  :owner-id="nowDownData.ownerId"
+                  :sku-id="nowDownData.skuId"
                   @confirm="downDataNumConfirm"
+                  @input="checkDownPrintOldLabelSwitchDisabled"
+                />
+              </div>
+
+              <!-- 打印原标签开关 -->
+              <div class="lw-global-row lw-global-flex-between">
+                <div class="lw-global-title">
+                  {{ $lwLanguage.get('', '打印原标签') }}
+                </div>
+
+                <van-switch
+                  v-model="downData.input.printOldLabel.open"
+                  :disabled="downData.input.printOldLabel.disabled"
+                  size="18px"
                 />
               </div>
 
@@ -232,47 +221,58 @@
             </div>
 
             <div class="lw-global-model-box" v-if="taskData.putDownMoveTaskLines.length">
-              <lw-cell
-                :title="$lwLanguage.get('wms_project.pda.components.page.inner.taskMove.index.index.ylsnfohq','快速移动')"
-                :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 class="lw-global-row lw-global-flex-between">
+                <div class="lw-global-title">
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.inner.taskMove.index.index.ylsnfohq', '快速移动')
+                  }}
+                </div>
+
+                <van-switch
+                  v-model="fastMove.down"
+                  size="18px"
                 />
               </div>
+              <!-- 目标库位 -->
+              <lw-input
+                v-if="fastMove.down"
+                :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="downLocation"
+                :create-rule="$lwScanRule.create('标准移动-下架-目标库位','LOCATION')"
+                :owner-id="nowDownData.ownerId"
+                :rule-serve-query="nowDownData"
+                @confirm="fastLocConfirm"
+              />
+              <!-- 托盘号 -->
+              <lw-input
+                v-else
+                :title="fastMove.down?
+                  $lwLanguage.get('wms_project.pda.inbound.taskMove.fastMoveLpn','目标托盘号'):
+                  $lwLanguage.get('wms_project.pda.inbound.taskMove.lpn','中转容器号')"
+                v-model="downData.input.lpn.value"
+                :get-focus.sync="downData.input.lpn.focus"
+                required
+                rule-key="downContainer"
+                :create-rule="$lwScanRule.create('标准移动-下架-中转容器号','CONTAINER')"
+                :owner-id="nowDownData.ownerId"
+                :rule-serve-query="nowDownData"
+                @confirm="actionDown"
+              >
+                <template #button>
+
+                  <lw-button
+                    mini
+                    @click="createDownLpn"
+                  >
+                    {{ $lwLanguage.get('', '生成') }}
+                  </lw-button>
+
+                </template>
+              </lw-input>
             </div>
 
             <lw-not-data v-else/>
@@ -333,96 +333,104 @@
               </div>
 
               <!-- 数据看板 -->
-              <div class="lw-global-row lw-global-flex-around">
-                <!-- 待上架 -->
-                <div class="lw-task-move-look-item">
-                  <div class="lw-global-value-bold">{{ nowUpData.todoQty || 0 }}</div>
-                  <div class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.waitUp', '待上架') }}
-                  </div>
-                </div>
-
-                <!-- 已上架 -->
-                <div class="lw-task-move-look-item">
-                  <div class="lw-global-value-bold">{{ nowUpData.doneQty || 0 }}</div>
-                  <div class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.overUp', '已上架') }}
-                  </div>
-                </div>
-
-                <!-- 异常量 -->
-                <div class="lw-task-move-look-item">
-                  <div class="lw-global-value-bold" style="color: #D50000">
-                    {{ nowUpData.abnQty || 0 }}
-                  </div>
-                  <div class="lw-global-title" style="color: #D50000">
-                    {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.abnNum', '异常量') }}
-                  </div>
-                </div>
-              </div>
+              <lw-data-look-bg
+                class="lw-global-row"
+                style="padding: 0"
+                type="null"
+                :show-end-line="false"
+                need-show
+              >
+                <lw-data-look-item
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.waitUp', '待上架')"
+                  :value="nowUpData.todoQtyLabel"
+                />
+                <lw-data-look-item
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.overUp', '已上架')"
+                  :value="nowUpData.doneQtyLabel"
+                />
+                <lw-data-look-item
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.abnNum', '异常量')"
+                  :value="nowUpData.abnQtyLabel"
+                />
+              </lw-data-look-bg>
 
               <lw-lot-look-module
                 :columns="nowUpData.groupKeyItemList"
                 title-key="label" value-key="value"
               />
 
+              <!-- 序列号 -->
               <div v-if="nowUpData.needHandleSn">
 
                 <lw-input
                   :title="$lwLanguage.get('wms_project.pda.components.page.inner.taskMove.index.index.unmkzzwu','扫描序列号')"
                   v-model="upData.input.sn.value"
                   :get-focus.sync="upData.input.sn.focus"
-                  :create-rule="$lwScanRule.create('标准移动-SN','SN')"
+                  :create-rule="$lwScanRule.create('标准移动-上架-序列号','SN')"
                   auto-clear-val
-                  rule-key="sn"
+                  rule-key="upSn"
                   required
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="moveUpTaskSnConfirm"
                 />
                 <lw-scan-data-list-module
                   :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.jrpylmoq', '已扫描序列号')"
                   v-model="upData.input.snList"
+                  @del="checkUpPrintOldLabelSwitchDisabled"
+                  @confirm="checkUpPrintOldLabelSwitchDisabled"
                 />
 
               </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"
+                  rule-key="upSku"
+                  :create-rule="$lwScanRule.create('标准移动-上架-商品条码','SKU')"
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="upDataSkuCodeConfirm"
+                  @input="checkUpPrintOldLabelSwitchDisabled"
                 />
 
-                <!-- 数量 -->
-                <lw-input
+                <lw-get-qty-by-type
+                  ref="upQty"
                   :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
+                  :owner-id="nowUpData.ownerId"
+                  :sku-id="nowUpData.skuId"
                   @confirm="upDataNumConfirm"
                 />
               </div>
 
+              <!-- 打印原标签开关 -->
+              <div class="lw-global-row lw-global-flex-between">
+                <div class="lw-global-title">
+                  {{ $lwLanguage.get('', '打印原标签') }}
+                </div>
+
+                <van-switch
+                  v-model="upData.input.printOldLabel.open"
+                  :disabled="upData.input.printOldLabel.disabled"
+                  size="18px"
+                />
+              </div>
+
               <!-- 接力上架 -->
-              <lw-cell
-                style="padding: 0"
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.relay','接力上架')"
-                :is-link="false"
-                required
-              >
-                <template #value>
-                  <van-switch
-                    v-model="upData.input.wait"
-                    size="22px"
-                    @change="upDataWaitChange"
-                  />
-                </template>
-              </lw-cell>
+              <div class="lw-global-row lw-global-flex-between">
+                <div class="lw-global-title">
+                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.relay', '接力上架') }}
+                </div>
 
+                <van-switch
+                  v-model="upData.input.wait"
+                  size="18px"
+                  @change="upDataWaitChange"
+                />
+              </div>
               <!-- 非接力上架 -->
               <div v-if="!upData.input.wait">
                 <!-- 目标库位 -->
@@ -433,6 +441,9 @@
                   :get-focus.sync="upData.input.local.focus"
                   required
                   rule-key="upLocal"
+                  :create-rule="$lwScanRule.create('标准移动-上架-目标库位','LOCATION')"
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="upDataLocalConfirm"
                 />
 
@@ -443,20 +454,36 @@
                   v-model="upData.input.lpn.value"
                   :get-focus.sync="upData.input.lpn.focus"
                   rule-key="upLpn"
+                  :create-rule="$lwScanRule.create('标准移动-上架-目标托盘','LPN')"
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="upDataLpnConfirm"
-                />
+                >
+                  <template #button>
 
-                <!-- 目标托盘 -->
+                    <lw-button
+                      mini
+                      @click="createUpLpn"
+                    >
+                      {{ $lwLanguage.get('', '生成') }}
+                    </lw-button>
+
+                  </template>
+                </lw-input>
+
+                <!-- 目标箱号 -->
                 <lw-input
                   class="lw-global-animation-rotate"
-                  :title="$lwLanguage.get('目标箱号','目标箱号')"
+                  :title="$lwLanguage.get('wms_project.pda.wms.page.inner.taskMove.index.index.aiangpkg', '目标箱号')"
                   v-model="upData.input.case.value"
                   :get-focus.sync="upData.input.case.focus"
-                  rule-key="upLpn"
+                  rule-key="upCase"
+                  :create-rule="$lwScanRule.create('标准移动-上架-目标箱号','CASE')"
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="upDataCaseConfirm"
                 />
               </div>
-
               <!-- 接力上架 -->
               <div
                 class="lw-global-animation-rotate"
@@ -468,7 +495,10 @@
                   v-model="upData.input.local.value"
                   :get-focus.sync="upData.input.local.focus"
                   required
-                  rule-key="waitLocal"
+                  rule-key="upWaitLocal"
+                  :create-rule="$lwScanRule.create('标准移动-上架-通道库位','LOCATION')"
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="upDataLocalConfirm"
                 />
                 <!-- 暂存容器号 -->
@@ -477,9 +507,23 @@
                   v-model="upData.input.lpn.value"
                   :get-focus.sync="upData.input.lpn.focus"
                   required
-                  rule-key="waitContainer"
+                  rule-key="upWaitContainer"
+                  :create-rule="$lwScanRule.create('标准移动-上架-容器号','CONTAINER')"
+                  :owner-id="nowUpData.ownerId"
+                  :rule-serve-query="nowUpData"
                   @confirm="upDataLpnConfirm"
-                />
+                >
+                  <template #button>
+
+                    <lw-button
+                      mini
+                      @click="createUpLpn"
+                    >
+                      {{ $lwLanguage.get('', '生成') }}
+                    </lw-button>
+
+                  </template>
+                </lw-input>
               </div>
 
               <!-- 切换按钮 -->
@@ -524,12 +568,12 @@
       </lw-button>
 
 
-      <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 @click="actionDown">
+        {{
+          fastMove.down ?
+            $lwLanguage.get('wms_project.pda.inbound.taskMove.confirmFastMove', '确认快速移动') :
+            $lwLanguage.get('wms_project.pda.inbound.taskMove.confirmDown', '确认下架')
+        }}
       </lw-button>
     </lw-bottom-bar>
 
@@ -546,7 +590,8 @@
         type="normal"
         plain
         @click="upSkuSeo"
-      >{{ $lwLanguage.get('wms_project.pda.inbound.taskMove.seoSku', '扫描商品定位') }}
+      >
+        {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.seoSku', '扫描商品定位') }}
       </lw-button>
 
       <lw-button @click="actionUp">
@@ -570,7 +615,8 @@
         v-model="upSkuSeoPopup.sku.value"
         :get-focus.sync="upSkuSeoPopup.sku.focus"
         required
-        rule-key="sku"
+        rule-key="upSkuSearch"
+        :create-rule="$lwScanRule.create('标准移动-上架定位商品弹框-商品条码','SKU')"
         @confirm="upSkuSeoPopupSkuConfirm"
       />
 
@@ -605,7 +651,7 @@
             {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.waitQty', '待处理量') }}
           </span>
           <span class="lw-global-value-bold" style="color:#D50000;">
-            {{ lessPopup.item.todoQty }}
+            {{ lessPopup.item.todoQtyLabel }}
           </span>
         </div>
 
@@ -625,7 +671,10 @@
         v-model="lessPopup.input.sku.value"
         :get-focus.sync="lessPopup.input.sku.focus"
         required
-        rule-key="sku"
+        rule-key="lessPopupSku"
+        :create-rule="$lwScanRule.create('标准移动-缺货弹框-确认商品','SKU')"
+        :owner-id="lessPopup.item.ownerId"
+        :rule-serve-query="lessPopup.item"
         @confirm="lessSkuConfirm"
       />
 
@@ -633,13 +682,16 @@
         :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.littleQty','缺货量')"
         v-model="lessPopup.input.num.value"
         :get-focus.sync="lessPopup.input.num.focus"
-        type="digit"
+        type="number"
         required
         @confirm="lessNumConfirm"
       />
 
       <template #button>
-        <lw-button @click="lessPartConfirm">
+        <lw-button
+          @click="lessPartConfirm"
+          type="last"
+        >
           {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.confirmPartLess', '确认部分缺货') }}
         </lw-button>
         <lw-button @click="lessConfirm">
@@ -676,42 +728,74 @@
     </lw-popup>
 
     <!-- 整托上架弹框 -->
-    <lw-popup :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.krwtnoog', '整托盘上架')" v-if="upLpnData" v-model="upLpnPop.show">
-      <div>
-        <div class="lw-global-row">
-          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.bhwchlfd', '托盘号')" :value="upLpnData.lpn" val-bold :is-row="false"/>
-        </div>
-        <div class="lw-global-row lw-global-flex-between">
-          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.bsnzmabc', '品种数')" :value="upLpnData.skuCount" val-bold val-red :is-row="false"/>
-          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.chehmhzq', '待上架')" :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">{{$lwLanguage.get('wms_project.pda.inner.taskMove.index.rbqdfjoo', '数量')}}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="lw-global-row">
-        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.bzlqcffp', '确认托盘')" v-model="upLpnPop.lpn.value" :get-focus.sync="upLpnPop.lpn.focus"
-                  @confirm="checkWholeLpn"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.mfytcphu', '目标库位')" required v-model="upLpnPop.loc.value" :get-focus.sync="upLpnPop.loc.focus"
-                  @confirm="doWholeLpnUp"/>
+    <lw-popup
+      v-if="upLpnData"
+      :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.krwtnoog', '整托盘上架')"
+      v-model="upLpnPop.show"
+    >
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.wms.page.inner.taskMove.index.index.olnbrsre', '上架库位')"
+        :value="upLpnData.toLocCode"
+        val-bold
+      />
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.bhwchlfd', '托盘号')"
+        :value="upLpnData.lpn"
+        val-bold
+      />
 
+      <div class="lw-global-row lw-global-flex-between">
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.bsnzmabc', '品种数')"
+          :value="upLpnData.skuCount"
+          val-bold
+          val-red
+          :is-row="false"
+        />
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.chehmhzq', '待上架')"
+          :value="upLpnData.toUpQtyLabel"
+          val-bold
+          val-red
+          :is-row="false"
+        />
       </div>
+
+
+      <!-- 任务行信息 -->
+      <lw-sku-info-module
+        v-for="line in upLpnData.lines"
+        :key="line.id"
+        :sku-code="line.skuCode"
+        :sku-name="line.skuName"
+        :qty="line.pickQtyLabel"
+        is-row
+      />
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.bzlqcffp', '确认托盘')"
+        v-model="upLpnPop.lpn.value"
+        :get-focus.sync="upLpnPop.lpn.focus"
+        rule-key="upLpnPopLpn"
+        :create-rule="$lwScanRule.create('标准移动-确认托盘','LPN')"
+        required
+        @confirm="checkWholeLpn"
+      />
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.inner.taskMove.index.mfytcphu', '目标库位')"
+        required
+        v-model="upLpnPop.loc.value"
+        :get-focus.sync="upLpnPop.loc.focus"
+        rule-key="upLpnPopLoc"
+        :create-rule="$lwScanRule.create('标准移动-目标库位','LOCATION')"
+        @confirm="doWholeLpnUp"
+      />
+
       <template #button>
-        <lw-button @click="doWholeLpnUp">{{$lwLanguage.get('整托盘上架', '整托盘上架')}}</lw-button>
+        <lw-button @click="doWholeLpnUp">{{ $lwLanguage.get('整托盘上架', '整托盘上架') }}</lw-button>
       </template>
     </lw-popup>
 
@@ -729,6 +813,7 @@ import {
   wmsWholeLpnUp,
 } from "../../../../api/inner/move/taskMove";
 import {innerMoveTaskMoveUpSnCheck, innerMoveTaskMoveDownSnCheck} from "../../../../api/inner/snCheck/snCheck";
+import {wmsMobileInboundNewReceiveLpn} from "../../../../api/inner/move/quickMove";
 
 export default {
   name: "lwTaskMovePage",
@@ -784,6 +869,7 @@ export default {
         input: {
           // 库位
           local: {
+            show: true,
             value: '',
             focus: false
           },
@@ -802,14 +888,10 @@ export default {
             value: '',
             focus: false
           },
-          // 数量
-          num: {
-            value: '',
-            focus: false
-          },
           // 托盘
           lpn: {
             value: '',
+            create: '',
             focus: false
           },
           // 目标库位
@@ -817,14 +899,15 @@ export default {
             value: '',
             focus: false
           },
-          // 目标托盘
-          fastLpn: {
-            value: '',
-            focus: false
-          },
 
           // sn扫描列表
-          snList: []
+          snList: [],
+
+          // 是否打印原标签开关
+          printOldLabel: {
+            open: false,
+            disabled: false
+          }
         }
       },
 
@@ -839,11 +922,6 @@ export default {
             value: '',
             focus: false
           },
-          // 数量
-          num: {
-            value: '',
-            focus: false
-          },
           // 是否接力上架
           wait: false,
           // 目标库位 / 通道库位
@@ -867,7 +945,13 @@ export default {
             focus: false
           },
           // sn扫描列表
-          snList: []
+          snList: [],
+
+          // 是否打印原标签开关
+          printOldLabel: {
+            open: false,
+            disabled: false
+          }
 
         }
       },
@@ -894,6 +978,9 @@ export default {
         },
       },
       initLpn: undefined,
+
+      // 打印机
+      printLpnData: {},
     }
   },
   computed: {
@@ -923,9 +1010,27 @@ export default {
     }
     this.initLpn = this.$route.query.lpn
 
+    this.downData.input.local.show = this.$lwWarehouseConfig.get('systemConfig.WMS_MOVE_TASK_CLOSE_LOCATION_SCAN') !== 'true'
+
     this.getData()
+    this.checkLpnPrint()
   },
   methods: {
+
+    // 托盘打印机校验
+    checkLpnPrint(needCheck) {
+
+      if (this.printLpnData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test({
+        templateCode: 'PART_RECEIVE_LABEL',
+        msg: this.$lwLanguage.get('', '托盘标签'),
+        msgType: needCheck ? 'HARD' : ''
+      })
+      this.printLpnData = printData
+      return success
+    },
+
     // 获取数据
     getData() {
       const taskId = this.$route.query.lwTaskId;
@@ -964,6 +1069,7 @@ export default {
         // 如果有下架任务就切换到下架tab
         if (this.taskData.putDownMoveTaskLines.length) {
           this.tabActive = 'down'
+          // 检查是否有初始托盘号，有就优先跳转到当前行
           if (this.initLpn !== undefined) {
             const idx = this.taskData.putDownMoveTaskLines.findIndex(i => i.fromLpn === this.initLpn)
             if (idx > -1) {
@@ -971,6 +1077,15 @@ export default {
               this.initLpn = undefined
             }
           }
+          if (this.downData.input.local.show) {
+            this.downData.input.local.focus = true
+          } else if (this.hasDownLpn) {
+            this.downData.input.downLpn.focus = true
+          } else if (this.nowDownData.needHandleSn) {
+            this.downData.input.sn.focus = true
+          } else {
+            this.downData.input.sku.focus = true
+          }
           return
         }
 
@@ -1170,10 +1285,22 @@ export default {
 
     // 确认移动
     moveConfirm(item, callback) {
+      const {printId = '', templateId = ''} = this.printLpnData
       wmsExecMobileMove({
         taskId: this.$route.query.lwTaskId,
-        ...item
-      }).then(() => {
+        ...item,
+        printDeviceId: printId,
+        printTemplate: templateId,
+        needPrintLpnLabel: !!(item.needPrintLpnLabel && printId)
+      }).then(async res => {
+
+        const printList = res.printList
+        // 打印托盘标签
+        if (printList && templateId && Array.isArray(printList) && printList.length) {
+          for (const item of printList) {
+            await this.$lwPrint.bluetoothPrint(item.id)
+          }
+        }
 
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.changSuccess', '操作成功')
@@ -1186,15 +1313,25 @@ export default {
     },
 
 
-    /* ---------- 下架 ----------*/
+    // 下架 - 检查打印原标签是否禁用
+    checkDownPrintOldLabelSwitchDisabled() {
+      const moveNum = this.nowDownData.needHandleSn ?
+        this.downData.input.snList.reduce((t, i) => Number(i.qty || 0) + t, 0) :
+        this.$refs.downQty.getQty()
+
+      this.downData.input.printOldLabel.disabled = moveNum >= this.nowDownData.todoQty
+      if (this.downData.input.printOldLabel.disabled) {
+        this.downData.input.printOldLabel.open = false
+      }
+    },
 
-    // 清空下架输入框
+    // 下架 - 清空下架输入框
     downClearInput(arr = ['local', 'lpn']) {
 
       arr.forEach(item => this.downData.input[item].value = '')
 
       this.downData.input.sku.value = ''
-      this.downData.input.num.value = ''
+
       this.downData.input.lpn.value = ''
       this.downData.input.downLpn.value = ''
       this.downData.input.snList = []
@@ -1213,16 +1350,21 @@ export default {
       } else {
         this.downData.input.sku.focus = true
       }
+
+      this.$nextTick(() => {
+        this.$refs.downQty?.clearInput()
+        this.$refs.downQty?.init()
+      })
     },
 
-    // 是否有下架箱号
+    // 下架 - 是否有下架箱号
     hasDownCase() {
       let item = this.nowDownData
 
       return item.fromCase && item.fromCase !== ''
     },
 
-    // 库位确认
+    // 下架 - 库位确认
     downDataLocalConfirm() {
       if (this.downDataLocalCheck()) {
         if (this.hasDownLpn) {
@@ -1237,8 +1379,11 @@ export default {
         }
       }
     },
-    // 库位校验
+    // 下架 - 库位校验
     downDataLocalCheck() {
+
+      if (!this.downData.input.local.show) return true
+
       const local = this.downData.input.local
       if (!local.value) {
         local.focus = true
@@ -1262,7 +1407,7 @@ export default {
       return true
     },
 
-    // 下架托盘确认
+    // 下架 - 托盘确认
     downDataDownLpnConfirm() {
       if (this.downDataDownLpnCheck()) {
         if (this.nowDownData.needHandleSn) {
@@ -1272,7 +1417,7 @@ export default {
         }
       }
     },
-    // 下架托盘校验
+    // 下架 - 托盘校验
     downDataDownLpnCheck() {
       if (!this.hasDownLpn) return true
 
@@ -1299,13 +1444,13 @@ export default {
       return true
     },
 
-    // 商品号确认
+    // 下架 - 商品号确认
     downDataSkuCodeConfirm() {
       if (this.downDataSkuCodeCheck()) {
-        this.downData.input.num.focus = true
+        this.$refs.downQty?.getFocus()
       }
     },
-    // 商品号输入校验
+    // 下架 - 商品号输入校验
     downDataSkuCodeCheck() {
 
 
@@ -1341,8 +1486,51 @@ export default {
 
       return true
     },
+    // 下架 - sn确认
+    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, skuId: this.nowDownData.skuId};
+      innerMoveTaskMoveDownSnCheck(moveDownSnCheck).then(res => {
+
+        if (!this.snScanDownCheck(snkey, res.snInvQty)) return
+
+        this.downData.input.snList.unshift({
+          sn: snkey,
+          qty: res.snInvQty
+        })
+
+        this.checkDownPrintOldLabelSwitchDisabled()
+      })
+
+    },
+    // 下架 - sn校验
+    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('wms_project.pda.components.page.inner.taskMove.index.index.wzwjfleq', '重复扫描的SN:') + sn
+          )
+          return false;
+        }
+        snCount += snObj.qty
+      }
+      let availInvQty = (this.nowDownData.todoQty || 0)
+      if ((snCount + qty) > availInvQty) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.taskMove.index.index.vwrhqtoi', '扫描数量大于待下架数量')
+        )
+        return false;
+      }
+      return true;
+    },
 
-    // 数量确认
+    // 下架 - 数量确认
     downDataNumConfirm() {
       if (this.fastMove.down && this.downDataNumCheck()) {
         this.downData.input.fastLoc.focus = true
@@ -1350,7 +1538,7 @@ export default {
         this.downData.input.lpn.focus = true
       }
     },
-    // 数量校验
+    // 下架 - 数量校验
     downDataNumCheck() {
 
       if (this.nowDownData.needHandleSn) {
@@ -1363,44 +1551,39 @@ export default {
         return true
       }
 
-      const num = Number(this.downData.input.num.value || 0)
+      const num = this.$refs.downQty?.getQty()
       if (!num) {
-        this.downData.input.num.focus = true
+        this.$refs.downQty?.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.qtyNull', '数量不能为空，且应当是大于0的整数')
         )
-        this.downData.input.num.value = ''
         return false
       }
 
       if (num > this.nowDownData.todoQty) {
-        this.downData.input.num.focus = true
+        this.$refs.downQty?.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.qtyMoer', '数量不能大于待下架量')
         )
-        this.downData.input.num.value = ''
+        this.$refs.downQty?.clearInput()
         return false
       }
 
       return true
     },
 
-    // 目标库位
+    // 下架 - 快速移动目标库位
     fastLocConfirm() {
-      if (this.fastMove.down) {
-        this.downData.input.fastLpn.focus = true
-      } else {
-        this.downData.input.lpn.focus = true
-      }
+      this.downData.input.lpn.focus = true
     },
 
-    // 托盘号校验
+    // 下架 - 托盘号校验
     downDataLpnConfirm() {
       if (this.downDataLpnCheck()) {
         this.actionDown()
       }
     },
-    // 托盘号校验
+    // 下架 - 托盘号校验
     downDataLpnCheck() {
       if (this.downData.input.lpn.value) return true
 
@@ -1411,6 +1594,7 @@ export default {
       return false
     },
 
+    // 下架 - 目标库位校验
     fastDownDataLocCheck() {
       if (this.downData.input.fastLoc.value) return true
 
@@ -1422,6 +1606,7 @@ export default {
     },
 
 
+    // 下架 - 目标库位校验
     downDataTargetCheck() {
       if (this.fastMove.down) {
         return this.fastDownDataLocCheck();
@@ -1430,24 +1615,32 @@ export default {
       }
     },
 
-    // 下架异常
+    // 下架 - 异常
     downDataAbnormal() {
       const item = this.nowDownData
       this.openAbnormal({
         ...item,
         qty: item.todoQty,
+        qtyLabel: item.todoQtyLabel,
         location: item.fromLocationCode,
         type: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.inbound', '在库'),
         abType: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.moveDown', '移动下架')
       }, 'down')
     },
 
-    // 缺货下架
+    // 下架 - 缺货下架
     downLess() {
       this.openLess(this.nowDownData, 'down')
     },
 
-    // 确认下架
+    // 下架 - 生成托盘号
+    async createDownLpn() {
+      const res = await wmsMobileInboundNewReceiveLpn()
+      this.downData.input.lpn.create = res
+      this.downData.input.lpn.value = res
+    },
+
+    // 下架 - 确认下架
     actionDown() {
       if (
         !(this.downDataLocalCheck() &&
@@ -1458,29 +1651,42 @@ export default {
       ) return
 
       const item = this.nowDownData
+      const lpn = this.downData.input.lpn
       this.moveConfirm({
         taskLineKey: item.lineKey,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
         fromCase: item.fromCase,
         skuId: item.skuId,
-        toLocationCode: this.downData.input.local.value,
-        toLpn: this.downData.input.lpn.value,
+        toLocationCode: this.downData.input.local.value || this.nowDownData.fromLocationCode,
+        toLpn: lpn.value,
         fastMove: this.fastMove.down,
         fastMoveToLocationCode: this.downData.input.fastLoc.value,
-        fastMoveToLpn: this.downData.input.fastLpn.value,
-        moveQty: this.downData.input.num.value,
+        fastMoveToLpn: lpn.value,
+        moveQty: this.$refs.downQty?.getQty(),
         moveMethod: '1',  // 1-下架，2-上架
         snParamList: this.downData.input.snList,
+        needPrintLpnLabel: !!(lpn.value && lpn.value === lpn.create),
+        needPrintOldLpnLabel: this.downData.input.printOldLabel.open
       })
     },
 
 
-    /* ---------- 上架 ----------*/
-    // 清空输入框
+    // 上架 - 检查打印原标签是否禁用
+    checkUpPrintOldLabelSwitchDisabled() {
+      const moveNum = this.nowUpData.needHandleSn ?
+        this.upData.input.snList.reduce((t, i) => Number(i.qty || 0) + t, 0) :
+        this.$refs.upQty.getQty()
+
+      this.upData.input.printOldLabel.disabled = moveNum >= this.nowUpData.todoQty
+      if (this.upData.input.printOldLabel.disabled) {
+        this.upData.input.printOldLabel.open = false
+      }
+    },
+
+    // 上架 - 清空输入框
     upClearInput() {
       this.upData.input.sku.value = ''
-      this.upData.input.num.value = ''
       this.upData.input.wait = false
       this.upData.input.local.value = ''
       this.upData.input.lpn.value = ''
@@ -1492,17 +1698,21 @@ export default {
       this.upLpnData = null
       this.upLpnPop.loc.value = ''
       this.upLpnPop.lpn.value = ''
-      this.upData.input.case.value=''
+      this.upData.input.case.value = ''
       this.upData.input.sku.focus = true
+      this.$nextTick(() => {
+        this.$refs.upQty?.clearInput()
+        this.$refs.upQty?.init()
+      })
     },
 
-    // 商品号确认
+    // 上架 - 商品号确认
     upDataSkuCodeConfirm() {
       if (this.upDataSkuCodeCheck()) {
-        this.upData.input.num.focus = true
+        this.$refs.upQty?.getFocus()
       }
     },
-    // 商品号输入校验
+    // 上架 - 商品号输入校验
     upDataSkuCodeCheck() {
 
       if (this.nowUpData.needHandleSn) {
@@ -1538,55 +1748,54 @@ export default {
       return true
     },
 
-    // 数量确认
+    // 上架 - 数量确认
     upDataNumConfirm() {
       if (this.upDataNumCheck()) {
         this.upData.input.local.focus = true
       }
     },
-    // 数量校验
+    // 上架 - 数量校验
     upDataNumCheck() {
 
       if (this.nowUpData.needHandleSn) {
         return true;
       }
 
-      const num = Number(this.upData.input.num.value || 0)
+      const num = this.$refs.upQty?.getQty()
       if (!num) {
-        this.upData.input.num.focus = true
+        this.$refs.upQty?.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.numZero', '数量不能为空，且应当是大于0的整数')
         )
-        this.upData.input.num.value = ''
         return false
       }
 
       if (num > this.nowUpData.todoQty) {
-        this.upData.input.num.focus = true
+        this.$refs.upQty?.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.inbound.taskMove.upNumMoer', '数量不能大于待上架量')
         )
-        this.upData.input.num.value = ''
+        this.$refs.upQty?.clearInput()
         return false
       }
 
       return true
     },
 
-    // 接力上架切换
+    // 上架 - 接力上架切换
     upDataWaitChange() {
       this.upData.input.local.value = ''
       this.upData.input.local.focus = true
       this.upData.input.lpn.value = ''
     },
 
-    // 库位确认
+    // 上架 - 库位确认
     upDataLocalConfirm() {
       if (this.upDataLocalCheck()) {
         this.upData.input.lpn.focus = true
       }
     },
-    // 库位校验
+    // 上架 - 库位校验
     upDataLocalCheck() {
       const local = this.upData.input.local
       if (!local.value) {
@@ -1601,13 +1810,13 @@ export default {
       return true
     },
 
-    // 托盘号校验
+    // 上架 - 托盘号校验
     upDataLpnConfirm() {
       if (this.upDataLpnCheck()) {
         this.upData.input.case.focus = true
       }
     },
-    // 托盘号校验
+    // 上架 - 托盘号校验
     upDataLpnCheck() {
       if (!this.upData.input.wait || this.upData.input.lpn.value) return true
 
@@ -1617,13 +1826,19 @@ export default {
       )
       return false
     },
+    // 上架 - 生成托盘号
+    async createUpLpn() {
+      const res = await wmsMobileInboundNewReceiveLpn()
+      this.upData.input.lpn.create = res
+      this.upData.input.lpn.value = res
+    },
 
-    // 托盘号校验
+    // 上架 - 箱号校验
     upDataCaseConfirm() {
       this.actionUp()
     },
 
-    // 确认上架
+    // 上架 - 确认上架
     actionUp() {
 
       if (
@@ -1651,7 +1866,7 @@ export default {
             toLocationCode: this.upData.input.local.value,
             toLpn: this.upData.input.lpn.value,
             toCase: this.upData.input.case.value,
-            moveQty: this.upData.input.num.value,
+            moveQty: this.$refs.upQty?.getQty(),
             relay: this.upData.input.wait,
             moveMethod: '2', // 1-下架，2-上架
             snParamList: this.upData.input.snList
@@ -1661,6 +1876,7 @@ export default {
 
         return
       }
+      const lpn = this.upData.input.lpn
       this.moveConfirm({
         taskLineKey: item.lineKey,
         fromLocationId: item.fromLocationId,
@@ -1668,16 +1884,18 @@ export default {
         fromCase: item.fromCase,
         skuId: item.skuId,
         toLocationCode: this.upData.input.local.value,
-        toLpn: this.upData.input.lpn.value,
+        toLpn: lpn.value,
         toCase: this.upData.input.case.value,
-        moveQty: this.upData.input.num.value,
+        moveQty: this.$refs.upQty?.getQty(),
         relay: this.upData.input.wait,
         moveMethod: '2',// 1-下架，2-上架
-        snParamList: this.upData.input.snList
+        snParamList: this.upData.input.snList,
+        needPrintLpnLabel: !!(lpn.value && lpn.value === lpn.create),
+        needPrintOldLpnLabel: this.upData.input.printOldLabel.open
       }, this.upClearInput)
     },
 
-    // 整容器上架
+    // 上架 - 整容器上架
     wholeLpnUp(lpn) {
       this.upLpnData = this.wholeLpns[lpn]
       this.upLpnPop.show = true
@@ -1687,7 +1905,7 @@ export default {
       })
     },
 
-
+    // 上架 - 校验上架托盘
     checkWholeLpn() {
       const confirmLpn = this.upLpnPop.lpn.value
       if (!confirmLpn) {
@@ -1704,7 +1922,7 @@ export default {
       return true
     },
 
-    // 整容器上架
+    // 上架 - 整容器上架
     doWholeLpnUp() {
       if (!this.upLpnData) {
         return
@@ -1742,102 +1960,27 @@ export default {
       }
     },
 
-    // 缺货上架
+    // 上架 - 缺货上架
     upLess() {
 
       this.openLess(this.nowUpData, 'up')
 
     },
 
-    // 扫描商品定位
-    upSkuSeo() {
-      this.upSkuSeoPopup.show = true
-      this.upSkuSeoPopup.sku.focus = true
-    },
-
     // 上架异常
     upDataAbnormal() {
       const item = this.nowUpData
       this.openAbnormal({
         ...item,
         qty: item.todoQty,
+        qtyLabel: item.todoQtyLabel,
         location: item.toLocationCode,
         type: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.inbound', '在库'),
         abType: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.moveUp', '移动上架')
       }, 'up')
     },
 
-    // 扫描商品定位
-    upSkuSeoPopupSkuConfirm() {
-      if (!this.upSkuSeoPopup.sku.value) {
-        this.upSkuSeoPopup.sku.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inbound.taskMove.scanSku', '请扫描或输入需要定位的商品号')
-        )
-        return
-      }
-
-      for (let i = 0; i < this.taskData.putUpMoveTaskLines.length; i++) {
-
-        if (this.taskData.putUpMoveTaskLines[i].skuCode === this.upSkuSeoPopup.sku.value) {
-          this.upData.index = i
-          this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.inbound.taskMove.cutCell', '已切换至任务行') + ':' + (i + 1)
-          )
-          this.upSkuSeoPopup.show = false
-          this.upClearInput()
-          return
-        }
-      }
-
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.inbound.taskMove.taskNullSku', '在当前任务中没有查询到商品任务行，请确认商品号是否输入正确')
-      )
-      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, skuId: this.nowDownData.skuId};
-      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('wms_project.pda.components.page.inner.taskMove.index.index.wzwjfleq', '重复扫描的SN:') + sn
-          )
-          return false;
-        }
-        snCount += snObj.qty
-      }
-      let availInvQty = (this.taskData.toPutUpQty || 0)
-      if ((snCount + qty) > availInvQty) {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inner.taskMove.index.index.vwrhqtoi', '扫描数量大于待下架数量')
-        )
-        return false;
-      }
-      return true;
-    },
-
+    // 上架 - sn确认
     moveUpTaskSnConfirm(value, {data}) {
       let snkey = data.key;
       let snQty = data.qty;
@@ -1853,10 +1996,13 @@ export default {
           sn: snkey,
           qty: res.snInvQty
         })
+
+        this.checkUpPrintOldLabelSwitchDisabled()
       })
 
 
     },
+    // 上架 - sn校验
     snUpScanCheck(sn, qty) {
       let snCount = 0
       for (let i = 0; i < this.upData.input.snList.length; i++) {
@@ -1877,9 +2023,45 @@ export default {
         return false;
       }
       return true;
-    }
+    },
 
 
+    //  扫描商品定位
+    upSkuSeo() {
+      this.upSkuSeoPopup.show = true
+      this.upSkuSeoPopup.sku.focus = true
+    },
+
+    // 扫描商品定位
+    upSkuSeoPopupSkuConfirm() {
+      if (!this.upSkuSeoPopup.sku.value) {
+        this.upSkuSeoPopup.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.inbound.taskMove.scanSku', '请扫描或输入需要定位的商品号')
+        )
+        return
+      }
+
+      for (let i = 0; i < this.taskData.putUpMoveTaskLines.length; i++) {
+
+        if (this.taskData.putUpMoveTaskLines[i].skuCode === this.upSkuSeoPopup.sku.value) {
+          this.upData.index = i
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.inbound.taskMove.cutCell', '已切换至任务行') + ':' + (i + 1)
+          )
+          this.upSkuSeoPopup.show = false
+          this.upClearInput()
+          return
+        }
+      }
+
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.inbound.taskMove.taskNullSku', '在当前任务中没有查询到商品任务行，请确认商品号是否输入正确')
+      )
+      this.upSkuSeoPopup.sku.focus = true
+      this.upSkuSeoPopup.sku.value = ''
+    },
+
   }
 }
 </script>