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

package/src/views/wms/page/receive/putaway/skuAction/index.vue

@@ -8,7 +8,7 @@
     <!-- 定位点 -->
     <div id="lw-putaway-sku-top"></div>
 
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.receive.skuAction.title','入库上架 - 商品')"/>
+    <lw-nav-bar :title="$lwLanguage.get('','入库上架 - 商品')"/>
 
     <div class="lw-global-page-box">
 
@@ -23,114 +23,72 @@
           <!-- 当前商品 -->
           <van-tab
             name="now"
-            :title="$lwLanguage.get('wms_project.pda.receive.skuAction.sku','当前商品')"
+            :title="$lwLanguage.get('','当前商品')"
           >
 
             <template v-if="skuListData.length">
 
               <!-- 头部信息 -->
-              <div class="lw-global-model-box">
+              <div class="lw-global-model-box" style="padding-bottom: 3px">
 
-                <!-- 托盘号 -->
-                <div class="lw-global-row-start">
-                  <span class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.receive.skuAction.lpn','托盘号') }}
-                  </span>
-                  <span class="lw-global-value-bold">
-                    {{ skuListData[skuIndex].task.lpn || '-' }}
-                  </span>
-                </div>
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('','托盘号')"
+                  :value="nowSkuInfo.task.lpn || '-'"
+                  val-bold
+                  is-row-start
+                />
 
                 <!-- 原库位、目标库区 -->
                 <div class="lw-global-flex-between lw-global-row">
-                  <div>
-                    <span class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.oldLocal','原库位') }}
-                    </span>
-                    <span class="lw-global-value-bold">
-                      {{ skuListData[skuIndex].task.fromLocationCode || '-' }}
-                    </span>
-                  </div>
-                  <div>
-                    <span class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.newLocal','目标库区') }}
-                    </span>
-                    <span class="lw-global-value-bold">
-                      {{ skuListData[skuIndex].task.toZoneCode || '-' }}
-                    </span>
-                  </div>
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('','原库位')"
+                    :value="nowSkuInfo.task.fromLocationCode || '-'"
+                    val-bold
+                    :is-row="false"
+                  />
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('','目标库区')"
+                    :value="nowSkuInfo.task.toZoneCode || '-'"
+                    val-bold
+                    :is-row="false"
+                  />
                 </div>
 
                 <!-- 看板 -->
-                <div
-                  style="text-align: center;margin-top: 10px"
-                  class="lw-global-flex-between"
+                <lw-data-look-bg
+                  type="null"
+                  :show-end-line="false"
                 >
 
-                  <!-- 品种数 -->
-                  <div>
-                    <div class="lw-global-value-bold" style="font-size: 16px">
-                      {{ skuListData[skuIndex].task.skuCount || 0 }}
-                    </div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.skuCount','品种数') }}
-                    </div>
-                  </div>
-
-                  <!-- 计划量 -->
-                  <div>
-                    <div class="lw-global-value-bold" style="font-size: 16px">
-                      {{ skuListData[skuIndex].task.qty || 0 }}
-                    </div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.planQty','计划量') }}
-                    </div>
-                  </div>
-
-                  <!-- 已上架 -->
-                  <div>
-                    <div class="lw-global-value-bold" style="font-size: 16px">
-                      {{ skuListData[skuIndex].task.paQty || 0 }}
-                    </div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.up','已上架') }}
-                    </div>
-                  </div>
-
-                  <!-- 待上架 -->
-                  <div>
-                    <div class="lw-global-value-bold" style="font-size: 16px">
-                      {{ skuListData[skuIndex].task.canPaQty || 0 }}
-                    </div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.wait','待上架') }}
-                    </div>
-                  </div>
-
-                  <!-- 异常量 -->
-                  <div>
-                    <div
-                      style="font-size: 16px;color: #D50000"
-                      class="lw-global-value-bold"
-                    >
-                      {{ skuListData[skuIndex].task.abnormalQty || 0 }}
-                    </div>
-                    <div
-                      style="color: #D50000"
-                      class="lw-global-title"
-                    >
-                      {{ $lwLanguage.get('wms_project.pda.receive.skuAction.abn','异常量') }}
-                    </div>
-                  </div>
-
-                </div>
+                  <lw-data-look-item
+                    :title="$lwLanguage.get('', '品种数')"
+                    :value="nowSkuInfo.task.skuCount || 0"
+                  />
+                  <lw-data-look-item
+                    :title="$lwLanguage.get('', '计划量')"
+                    :value="nowSkuInfo.task.qtyLabel || 0"
+                  />
+                  <lw-data-look-item
+                    :title="$lwLanguage.get('', '已上架')"
+                    :value="nowSkuInfo.task.paQtyLabel || 0"
+                  />
+                  <lw-data-look-item
+                    :title="$lwLanguage.get('', '待上架')"
+                    :value="nowSkuInfo.task.canPaQtyLabel || 0"
+                  />
+                  <lw-data-look-item
+                    :title="$lwLanguage.get('', '异常量')"
+                    :value="nowSkuInfo.task.abnormalQtyLabel || 0"
+                    color="#D50000"
+                  />
+                </lw-data-look-bg>
 
               </div>
 
               <!-- 商品信息 -->
               <sku-putaway-info
                 style="margin: 10px 0"
-                :item="skuListData[skuIndex]"
+                :item="nowSkuInfo"
                 show-reload
                 @reload="locReload"
               />
@@ -138,69 +96,63 @@
               <!-- 输入框 -->
               <div class="lw-global-model-box">
 
-                <div v-if="itemShowSn">
-                  <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.lab', '序列号条码')" required v-model="input.sn.value" :get-focus.sync="input.sn.focus"
-                            rule-key="sn" @confirm="addSn"/>
-
-                  <div class="lw-global-model-box tag-list">
-                    <div class="tag-list-title">
-                      <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.scan.lab', '当前扫描结果')}}</div>
-                      <div>SN <span>{{ sns.length }}</span></div>
-                      <div style="display: flex; justify-content: center;">
-                        <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.scan.qty', '数量')}}<span>{{ ' ' + snsQty }}</span></div>
-                        <div style="margin-left: 10px;">
-                          <lw-button mini @click="showSns=true">{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.all', '全部')}}</lw-button>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="tag-list-head">
-                      <div>SN</div>
-                      <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.lab.qty', '数量')}}</div>
-                      <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.lab.op', '操作')}}</div>
-                    </div>
-                    <div class="tag-list-row" v-for="t in sns" :key="t.sn">
-                      <div>{{ t.sn }}</div>
-                      <div>{{ t.qty }}</div>
-                      <div>
-                        <lw-button mini @click="removeSn(t)">{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.remove', '剔除')}}</lw-button>
-                      </div>
-                    </div>
-                  </div>
+                <div v-if="nowSkuInfo.needSn">
+                  <lw-input
+                    :title="$lwLanguage.get('','序列号条码')"
+                    required
+                    v-model="input.sn.value"
+                    :get-focus.sync="input.sn.focus"
+                    rule-key="sn"
+                    :create-rule="$lwScanRule.create('入库上架-商品上架-序列号条码','SN')"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :rule-serve-query="nowSkuInfo"
+                    @confirm="addSn"
+                  />
+
+                  <lw-scan-data-list-module
+                    class="lw-global-row"
+                    v-model="sns"
+                    start-bright
+                    row-id="putawaySkuAction"
+                    row-type="sn"
+                    total-type="sn"
+                    total-type-id="putawaySkuAction"
+                  />
                 </div>
 
                 <div v-else>
                   <!-- 商品条码 -->
                   <lw-input
-                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.skuCode','商品条码')"
+                    :title="$lwLanguage.get('','商品条码')"
                     v-model="input.sku.value"
                     :get-focus.sync="input.sku.focus"
                     required
                     rule-key="sku"
+                    :create-rule="$lwScanRule.create('入库上架-商品上架-商品条码','SKU')"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :rule-serve-query="nowSkuInfo"
                     @confirm="skuCodeConfirm"
                   />
 
                   <!-- 数量 -->
-                  <lw-input
-                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.qty','数量')"
-                    v-model="input.num.value"
-                    :get-focus.sync="input.num.focus"
-                    type="digit"
-                    required
-                    @confirm="numConfirm"
+                  <lw-get-qty-by-type
+                    ref="qty"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :sku-id="nowSkuInfo.sku.id"
                   />
                 </div>
 
                 <!-- 接力上架开关 -->
                 <lw-cell
                   style="padding: 0"
-                  :title="$lwLanguage.get('wms_project.pda.receive.skuAction.rely','接力上架')"
+                  :title="$lwLanguage.get('','接力上架')"
                   :is-link="false"
                   required
                 >
                   <template #value>
                     <van-switch
                       v-model="input.wait"
-                      size="22px"
+                      size="18px"
                       @change="waitChange"
                     />
                   </template>
@@ -211,21 +163,27 @@
                   <!-- 目标库位 -->
                   <lw-input
                     class="lw-global-animation-rotate"
-                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.local','目标库位')"
+                    :title="$lwLanguage.get('','目标库位')"
                     v-model="input.local.value"
                     :get-focus.sync="input.local.focus"
                     required
                     rule-key="location"
+                    :create-rule="$lwScanRule.create('入库上架-商品上架-目标库位','LOCATION')"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :rule-serve-query="nowSkuInfo"
                     @confirm="localConfirm"
                   />
 
                   <!-- 目标托盘 -->
                   <lw-input
                     class="lw-global-animation-rotate"
-                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.lpnCode','目标托盘')"
+                    :title="$lwLanguage.get('','目标托盘')"
                     v-model="input.lpn.value"
                     :get-focus.sync="input.lpn.focus"
                     rule-key="lpn"
+                    :create-rule="$lwScanRule.create('入库上架-商品上架-目标托盘','LPN')"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :rule-serve-query="nowSkuInfo"
                     @confirm="lpnConfirm"
                   />
                 </div>
@@ -237,20 +195,26 @@
                 >
                   <!-- 通道库位 -->
                   <lw-input
-                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.localP','通道库位')"
+                    :title="$lwLanguage.get('','通道库位')"
                     v-model="input.local.value"
                     :get-focus.sync="input.local.focus"
                     required
                     rule-key="waitLocal"
+                    :create-rule="$lwScanRule.create('入库上架-商品上架-通道库位','LOCATION')"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :rule-serve-query="nowSkuInfo"
                     @confirm="localConfirm"
                   />
                   <!-- 暂存容器号 -->
                   <lw-input
-                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.waitLpn','暂存容器号')"
+                    :title="$lwLanguage.get('','暂存容器号')"
                     v-model="input.lpn.value"
                     :get-focus.sync="input.lpn.focus"
                     required
                     rule-key="waitLpn"
+                    :create-rule="$lwScanRule.create('入库上架-商品上架-序列号条码','LPN')"
+                    :owner-id="nowSkuInfo.sku.ownerId"
+                    :rule-serve-query="nowSkuInfo"
                     @confirm="lpnConfirm"
                   />
                 </div>
@@ -272,7 +236,7 @@
           <!-- 商品列表 -->
           <van-tab
             name="skuList"
-            :title="$lwLanguage.get('wms_project.pda.receive.skuAction.skuList','商品列表')"
+            :title="$lwLanguage.get('','商品列表')"
           >
 
             <div
@@ -288,7 +252,7 @@
                 class="lw-global-row"
               >
                 <span class="lw-global-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.skuAction.lpn','托盘号') }}
+                  {{ $lwLanguage.get('', '托盘号') }}
                 </span>
                 <span class="lw-global-value-bold">{{ i.fromLpn }}</span>
               </div>
@@ -316,7 +280,7 @@
         type="last"
         @click="abnClick"
       >
-        {{ $lwLanguage.get('wms_project.pda.receive.skuAction.upAbn','上架异常') }}
+        {{ $lwLanguage.get('', '上架异常') }}
       </lw-button>
 
       <!-- 定位商品 -->
@@ -325,65 +289,68 @@
         type="normal"
         @click="seoSku"
       >
-        {{ $lwLanguage.get('wms_project.pda.receive.skuAction.skuIndex','定位商品') }}
+        {{ $lwLanguage.get('', '定位商品') }}
       </lw-button>
 
       <!-- 上架到通道 / 上架到目标库位 -->
       <lw-button @click="putawayConfirm">
         {{
           input.wait ?
-          $lwLanguage.get('wms_project.pda.receive.skuAction.upWay','上架到通道') :
-          $lwLanguage.get('wms_project.pda.receive.skuAction.upLocal','上架到目标库位')
+            $lwLanguage.get('', '上架到通道') :
+            $lwLanguage.get('', '上架到目标库位')
         }}
       </lw-button>
 
     </lw-bottom-bar>
 
-    <van-dialog v-model="showSns" :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.skuAction.index.mpzkwdgh','当前扫描的SN列表')">
-      <div class="lw-global-page-box">
-        <div class="lw-global-model-box">
-          <sns-list :sns="sns" @remove="removeSn"/>
-        </div>
-      </div>
-    </van-dialog>
+    <lw-popup
+      v-model="showSns"
+      :title="$lwLanguage.get('','当前扫描的SN列表')"
+    >
+      <sns-list :sns="sns" @remove="removeSn"/>
+    </lw-popup>
 
     <!-- 异常弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.receive.skuAction.upAbnLocal','入库上架异常')"
+      :title="$lwLanguage.get('','入库上架异常')"
       v-model="abnPopup.show"
       @closed="abnPopup.comShow=false"
     >
       <lw-inner-abnormal-module
         v-if="abnPopup.comShow"
         ref="abnormal"
-        :sku-code="skuListData[skuIndex].sku.code"
-        :sku-name="skuListData[skuIndex].sku.name"
-        :qty="skuListData[skuIndex].qty"
-        :location="skuListData[skuIndex].fromLocationCode"
-        :type="$lwLanguage.get('wms_project.pda.receive.skuAction.inbound','在库')"
-        :ab-type="$lwLanguage.get('wms_project.pda.receive.skuAction.reveiveUp','入库上架')"
+        :sku-code="nowSkuInfo.sku.code"
+        :sku-name="nowSkuInfo.sku.name"
+        :sku-id="nowSkuInfo.sku.id"
+        :owner-id="nowSkuInfo.sku.ownerId"
+        :qty="nowSkuInfo.qty"
+        :qty-label="nowSkuInfo.qtyLabel"
+        :location="nowSkuInfo.fromLocationCode"
+        :type="$lwLanguage.get('','在库')"
+        :ab-type="$lwLanguage.get('','入库上架')"
       />
 
       <template #button>
         <lw-button @click="abnConfirm">
-          {{ $lwLanguage.get('wms_project.pda.receive.skuAction.submitAbn','上报异常') }}
+          {{ $lwLanguage.get('', '上报异常') }}
         </lw-button>
       </template>
     </lw-popup>
 
     <!-- 定位商品 -->
     <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.receive.skuAction.skuIndex','定位商品')"
+      :title="$lwLanguage.get('','定位商品')"
       v-model="seoPopup.show"
       @closed="seoPopupOff"
     >
 
       <!-- 输入框 -->
       <lw-input
-        :title="$lwLanguage.get('wms_project.pda.receive.skuAction.skuNum','商品号')"
+        :title="$lwLanguage.get('','商品号')"
         v-model="seoPopup.sku.value"
         :get-focus.sync="seoPopup.sku.focus"
         rule-key="sku"
+        :create-rule="$lwScanRule.create('入库上架-商品上架-商品号','SKU')"
         @confirm="seoPopupSkuConfirm"
       >
         <template #button>
@@ -391,7 +358,8 @@
             mini
             round
             @click="seoPopupSkuConfirm"
-          >{{ $lwLanguage.get('wms_project.pda.receive.skuAction.seo','搜索') }}</lw-button>
+          >{{ $lwLanguage.get('', '搜索') }}
+          </lw-button>
         </template>
       </lw-input>
 
@@ -407,7 +375,7 @@
           <div>
             <div>
             <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.skuAction.lpn','托盘号') }}
+              {{ $lwLanguage.get('', '托盘号') }}
             </span>
               <span
                 style="color: #D50000;"
@@ -507,27 +475,24 @@ export default {
       },
 
       // 定位商品
-      seoPopup:{
+      seoPopup: {
         show: false,
         // 是否显示空数据状态
         showNotData: false,
-        sku:{
-          value:'',
+        sku: {
+          value: '',
           focus: false
         },
-        list:[]
+        list: []
       }
     }
   },
-  computed:{
-    snsQty () {
-      return this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
-    },
-    itemShowSn(){
-      const item = this.skuListData[this.skuIndex]
-
-      return item && item.needSn
-    },
+  computed: {
+    // 当前商品信息
+    nowSkuInfo() {
+      if (!this.skuListData.length) return {}
+      return this.skuListData[this.skuIndex]
+    }
   },
   mounted() {
     this.backStep = Number('-' + this.$route.query.lwBack)
@@ -535,10 +500,10 @@ export default {
   },
   methods: {
     // 滚动到顶部
-    scrollTop(){
+    scrollTop() {
       document.querySelector('#lw-putaway-sku-top').scrollIntoView({
         behavior: "smooth",
-        block:'start',
+        block: 'start',
       })
     },
 
@@ -548,34 +513,34 @@ export default {
         taskIds: JSON.parse(this.$route.query.lwTaskIdList || '[]')
       }).then(res=>{
 
-        if (!res.length){
+        if (!res || !res.length){
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.receive.skuAction.taskOver','当前任务已全部完成')
+            this.$lwLanguage.get('', '当前任务已全部完成')
           )
           history.go(this.backStep)
           return
         }
 
-        this.skuIndex = this.$lwUtils.cutCardIndexCount(this.skuIndex, res.length)
         this.skuListData = res
+        this.skuIndex = this.$lwUtils.cutCardIndexCount(this.skuIndex, this.skuListData.length)
 
-        const item = this.skuListData[this.skuIndex]
 
-        if(item.needSn){
+        if (this.nowSkuInfo.needSn) {
           this.input.sn.focus = true
-        }else{
+        } else {
           this.input.sku.focus = true
         }
 
-      }).catch(()=>{
-        history.go(this.backStep)
       })
+      /* .catch(()=>{
+       // history.go(this.backStep)
+     })*/
     },
 
     // 清空输入框
     clearInput(){
       this.sns = []
-      this.input.num.value = ''
+      this.$refs.qty?.clearInput()
       this.input.wait = false
       this.input.local.value = ''
       this.input.lpn.value = ''
@@ -584,7 +549,7 @@ export default {
       this.input.sn.value = ''
 
       // 打开后会导致屏幕滚动到当前位置无法显示在头部
-      if(this.itemShowSn){
+      if (this.nowSkuInfo.needSn) {
         this.input.sku.focus = false
         this.input.sn.focus = true
       } else {
@@ -598,7 +563,7 @@ export default {
     // 商品号确认
     skuCodeConfirm(){
       if (this.skuCodeCheck()){
-        this.input.num.focus = true
+        this.$refs.qty?.getFocus()
       }
     },
     // 商品号输入校验
@@ -608,16 +573,16 @@ export default {
       if (!sku.value){
         sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.skuNull','商品号不能为空')
+          this.$lwLanguage.get('', '商品号不能为空')
         )
         return false
       }
 
       // 是否输入正确
-      if (sku.value !== this.skuListData[this.skuIndex].sku.code){
+      if (sku.value !== this.nowSkuInfo.sku.code) {
         sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.skuNot','当前商品与上架商品不一致')
+          this.$lwLanguage.get('', '当前商品与上架商品不一致')
         )
         sku.value = ''
         return false
@@ -626,30 +591,24 @@ export default {
       return true
     },
 
-    // 数量确认
-    numConfirm(){
-      if (this.numCheck()){
-        this.input.local.focus = true
-      }
-    },
     // 数量校验
     numCheck(){
-      const num = Number(this.input.num.value || 0)
+      const num = this.$refs.qty?.getQty() || 0
       if (!num){
         this.input.num.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.skuNumZero','数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('', '数量不能为空，且应当是大于0的整数')
         )
-        this.input.num.value = ''
+        this.$refs.qty?.clearInput()
         return false
       }
 
-      if (num > this.skuListData[this.skuIndex].canPaQty){
+      if (num > this.nowSkuInfo.canPaQty) {
         this.input.num.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.skuMore','数量不能大于待上架量')
+          this.$lwLanguage.get('', '数量不能大于待上架量')
         )
-        this.input.num.value = ''
+        this.$refs.qty?.clearInput()
         return false
       }
 
@@ -676,7 +635,7 @@ export default {
 
         local.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.localNull','库位不能为空')
+          this.$lwLanguage.get('', '库位不能为空')
         )
         return false
       }
@@ -696,7 +655,7 @@ export default {
 
       this.input.lpn.focus = true
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.receive.skuAction.lpnNull','托盘号不能为空')
+        this.$lwLanguage.get('', '托盘号不能为空')
       )
       return false
     },
@@ -706,12 +665,12 @@ export default {
       this.skuIndex = index
       this.tabActive = 'now'
       this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.receive.skuAction.jump','已跳转至任务行：') + (index + 1)
+        this.$lwLanguage.get('', '已跳转至任务行：') + (index + 1)
       )
       this.input.sn.value = ''
       this.input.sku.value = ''
 
-      if(this.itemShowSn) {
+      if (this.nowSkuInfo.needSn) {
         this.input.sn.focus = true
       } else {
         this.input.sku.focus = true
@@ -730,17 +689,18 @@ export default {
 
       if (!success) return
 
-      const item = this.skuListData[this.skuIndex]
+      const item = this.nowSkuInfo
       wmsMobileSubmitPutawayByAbnormal({
         taskId: item.task.taskId,
         skuCode: item.sku.code,
+        skuId: item.sku.id,
         groupKey: item.groupKey,
         ...data
       }).then(()=>{
         this.abnPopup.show = false
         this.abnPopup.comShow = false
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.abnSuccess','异常上报成功')
+          this.$lwLanguage.get('', '异常上报成功')
         )
         this.$refs.abnormal.printLabel()
         this.getData()
@@ -784,10 +744,7 @@ export default {
 
     // 确认上架 - 不区分是否接力上架
     putawayConfirm(){
-      console.log("putawayConfirm")
-      console.log(this.itemShowSn)
-      console.log(this.skuListData[this.skuIndex])
-      if(this.itemShowSn){
+      if (this.nowSkuInfo.needSn) {
         this.putawaySnConfirm()
         return;
       }
@@ -799,11 +756,11 @@ export default {
           this.lpnCheck())
       ) return
 
-      const item = this.skuListData[this.skuIndex]
+      const item = this.nowSkuInfo
       if (!this.input.wait && this.input.local.value !== item.toLocationCode){
         this.$lwDialog.confirm({
-          title: this.$lwLanguage.get('wms_project.pda.receive.skuAction.total','提示'),
-          message: this.$lwLanguage.get('wms_project.pda.receive.skuAction.confirmMsg','当前目标库位与推荐库位不一致，确认上架？')
+          title: this.$lwLanguage.get('', '提示'),
+          message: this.$lwLanguage.get('', '当前目标库位与推荐库位不一致，确认上架？')
         }).then(()=>{
           this.putawaySubmit(item)
         }).catch(()=>{})
@@ -822,11 +779,12 @@ export default {
         toLocationCode: this.input.local.value,
         toLpn: this.input.lpn.value,
         skuCode: this.input.sku.value,
-        qty: this.input.num.value,
+        skuId: item.sku.id,
+        qty: this.$refs.qty?.getQty() || 0,
         relay: this.input.wait,
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.unSuccess','上架成功')
+          this.$lwLanguage.get('', '上架成功')
         )
 
         this.clearInput()
@@ -844,10 +802,10 @@ export default {
       const osn = this.sns.find(i => i.sn === scanData.sn)
       if (osn) {
         this.input.sn.focus = true
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.error.repeat', '重复的序列号'))
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('', '重复的序列号'))
       }
 
-      const item = this.skuListData[this.skuIndex]
+      const item = this.nowSkuInfo
 
       if (scanData.skuCode && scanData.skuCode !== item.sku.code) {
         this.input.sn.focus = true
@@ -860,7 +818,6 @@ export default {
         groupKey: item.groupKey,
         sn:scanData.sn,
       }).then(data => {
-        console.log(data)
         if (data && data.sn) {
           this.sns.unshift({
             sn: data.sn,
@@ -869,7 +826,7 @@ export default {
           this.input.sn.value = ''
         } else {
           this.input.sn.value = ''
-          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.error', '错误的序列号'))
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('', '错误的序列号'))
         }
       }).catch(() =>{
         this.input.sn.value = ''
@@ -886,7 +843,7 @@ export default {
       if(!this.sns || this.sns.length===0){
         this.input.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.null','序列号不能为空')
+          this.$lwLanguage.get('', '序列号不能为空')
         )
         return false
       }
@@ -901,11 +858,11 @@ export default {
           this.lpnCheck())
       ) return
 
-      const item = this.skuListData[this.skuIndex]
+      const item = this.nowSkuInfo
       if (!this.input.wait && this.input.local.value !== item.toLocationCode){
         this.$lwDialog.confirm({
-          title: this.$lwLanguage.get('wms_project.pda.receive.skuAction.total','提示'),
-          message: this.$lwLanguage.get('wms_project.pda.receive.skuAction.confirmMsg','当前目标库位与推荐库位不一致，确认上架？')
+          title: this.$lwLanguage.get('', '提示'),
+          message: this.$lwLanguage.get('', '当前目标库位与推荐库位不一致，确认上架？')
         }).then(()=>{
           this.putawaySnSubmit(item)
         }).catch(()=>{})
@@ -927,7 +884,7 @@ export default {
         lines: this.sns
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.receive.skuAction.unSuccess','上架成功')
+          this.$lwLanguage.get('', '上架成功')
         )
 
         this.clearInput()
@@ -937,11 +894,12 @@ export default {
 
     // 库位二次分配
     async locReload(){
-      const item = this.skuListData[this.skuIndex]
+      const item = this.nowSkuInfo
       await wmsMobileSecondAllocatePutawayBySku({
         taskId: item.task.taskId,
         groupKey: item.groupKey,
-        skuCode: item.sku.code
+        skuCode: item.sku.code,
+        skuId: item.sku.id
       })
 
       this.getData()