@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/page/outbound/pick/index/index.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','出库拣选')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.tlejlbzl','出库拣选')"/>
 
     <div class="lw-global-page-box">
 
@@ -37,7 +37,7 @@
             :border="false"
           >
             <van-collapse-item
-              :title="$lwLanguage.get('','工作区')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.itrshahh','工作区')"
               name="1"
             >
               <template
@@ -52,7 +52,7 @@
                 <span
                   style="font-size: 12px;font-weight: bold"
                   class="lw-global-title"
-                >{{ $lwLanguage.get('','工作区域') }}:</span>
+                >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.jepxuwmf','工作区域') }}:</span>
                   <span
                     style="font-size: 12px"
                     class="lw-global-value"
@@ -63,7 +63,7 @@
                 <span
                   style="font-weight: bold"
                   class="lw-global-title"
-                >{{ $lwLanguage.get('','库区') }}:</span>
+                >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.cbbkhktx','库区') }}:</span>
                   <span
                     class="lw-global-value"
                   >{{ taskData.pickZoneCodes }}</span>
@@ -82,7 +82,7 @@
           class="lw-global-flex-between lw-global-row-end"
         >
           <div style="color: #323233" class="lw-global-value">
-            {{ $lwLanguage.get('','叉车') }}
+            {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.mphocsgl','叉车') }}
           </div>
 
           <div class="lw-global-title">
@@ -112,7 +112,7 @@
           plain
           type="success"
         >
-          {{ $lwLanguage.get('','已完成') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ypzltcuy','已完成') }}
           {{ userPlan }}%
         </lw-tag>
       </div>
@@ -122,30 +122,24 @@
 
         <div>
           <div>{{ taskData.pickData.receiveTaskCount }}</div>
-          <div
-            class="lw-data-look-bg-title"
-          >{{ $lwLanguage.get('','接收行') }}</div>
+          <div>
+            {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmpwxfwy','接收行') }}
+          </div>
         </div>
 
         <div>
           <div>{{ taskData.pickData.finishLineCount }}</div>
-          <div
-            class="lw-data-look-bg-title"
-          >{{ $lwLanguage.get('','完成行') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.rebhfkmi','完成行') }}</div>
         </div>
 
         <div>
           <div>{{ taskData.pickData.skuQty }}</div>
-          <div
-            class="lw-data-look-bg-title"
-          >{{ $lwLanguage.get('','商品数') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vvaytrgg','商品数') }}</div>
         </div>
 
-        <div class="lw-data-last-item">
+        <div>
           <div>{{ useMinutes }}</div>
-          <div
-            class="lw-data-look-bg-title"
-          >{{ $lwLanguage.get('','有效工时') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmmwhidr','有效工时') }}</div>
         </div>
 
       </lw-data-look-bg>
@@ -165,36 +159,36 @@
             type="danger"
             round
             plain
-          >{{ $lwLanguage.get('','待接收') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.yhrczniq','待接收') }}</lw-tag>
           <lw-tag
             v-else
             round
             plain
-          >{{ $lwLanguage.get('','拣选中') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.yjvjisxz','拣选中') }}</lw-tag>
         </div>
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','拣选方式')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.isbaqhcq','拣选方式')"
           :value="taskData.pickTask.pickMethodLabel"
           val-bold
           val-red
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','拣选单位')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.oaqrzmuc','拣选单位')"
           :value="taskData.pickTask.pickUomLabel"
           val-bold
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','捆包类型')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ruzseogh','捆包类型')"
           :value="taskData.pickTask.pickPackTypeLabel"
           val-bold
           val-red
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','高低位')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.cmqistfm','高低位')"
           :value="taskData.pickTask.locationPositionLabel"
           val-bold
         />
@@ -204,14 +198,14 @@
           <div class="lw-global-flex-between">
             <lw-title-value-cell
               style="flex:1"
-              :title="$lwLanguage.get('','拣选库区')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.eznirkcm','拣选库区')"
               :value="taskData.pickTask.pickZoneCodeList.join(',')"
               val-bold
               :is-row="false"
             />
             <lw-title-value-cell
               style="flex-shrink: 0"
-              :title="$lwLanguage.get('','行数')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ehnmuckr','行数')"
               :value="taskData.pickTask.lineCount"
               val-bold
               :is-row="false"
@@ -224,13 +218,13 @@
             class="lw-global-flex-between"
           >
             <lw-title-value-cell
-              :title="$lwLanguage.get('','客户数')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ntfwzbfw','客户数')"
               :value="taskData.pickTask.customerCount"
               val-bold
               :is-row="false"
             />
             <lw-title-value-cell
-              :title="$lwLanguage.get('','商品数')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vvaytrgg','商品数')"
               :value="taskData.pickTask.totalQty"
               val-bold
               :is-row="false"
@@ -253,15 +247,15 @@
           type="last"
           plain
           @click="rejectBtnClick"
-        >{{ $lwLanguage.get('','拒绝') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.mtqbwgfh','拒绝') }}</lw-button>
         <lw-button @click="receive">
-          {{ $lwLanguage.get('','接收任务 & 拣选') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.kirpivou','接收任务 & 拣选') }}
         </lw-button>
       </template>
 
       <template v-else>
         <lw-button @click="actionPick">
-          {{ $lwLanguage.get('','执行拣选') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ozvoiore','执行拣选') }}
         </lw-button>
       </template>
 
@@ -269,25 +263,25 @@
 
     <!-- 用户下线理由弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('','下线')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.pdenuvpo','下线')"
       v-model="offLinePopup.show"
       @closed="offLinePopupOff"
     >
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','下线原因')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.jnvttgpl','下线原因')"
         required
         v-model="offLinePopup.reason"
         :columns="offLinePopup.reasonList"
       />
 
       <lw-input
-        :title="$lwLanguage.get('','其他原因')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.zhzghnao','其他原因')"
         v-model="offLinePopup.reasonOther"
       />
 
       <template #button>
         <lw-button @click="userOffLineConfirm">
-          {{ $lwLanguage.get('','确定') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.wqhnusfp','确定') }}
         </lw-button>
       </template>
 
@@ -296,27 +290,27 @@
 
     <!-- 拒绝任务弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('','拒绝任务')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.akjygike','拒绝任务')"
       v-model="rejectPopup.show"
       @closed="rejectPopupOff"
     >
 
       <lw-cell-popup-radio
-        :title="$lwLanguage.get('','拒绝原因')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.bosxxhdo','拒绝原因')"
         required
         v-model="rejectPopup.refuseReasonType"
         :columns="rejectPopup.refuseReasonTypeList"
       />
 
       <lw-input
-        :title="$lwLanguage.get('','其他原因')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.zhzghnao','其他原因')"
         v-model="rejectPopup.refuseReason"
         input-align="right"
       />
 
       <template #button>
         <lw-button @click="rejectConfirm">
-          {{ $lwLanguage.get('','确定') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.wqhnusfp','确定') }}
         </lw-button>
       </template>
 
@@ -344,15 +338,15 @@ export default {
       if (this.taskData.status === 'ONLINE') {
         return {
           type: 'primary',
-          label: this.$lwLanguage.get('', '在线'),
-          btn: this.$lwLanguage.get('', '下线')
+          label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.qhvmgnvx','在线'),
+          btn: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ywfusvvu','下线')
         }
       }
 
       return {
         type: 'danger',
-        label: this.$lwLanguage.get('', '离线'),
-        btn: this.$lwLanguage.get('', '上线')
+        label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.pooyjzzy','离线'),
+        btn: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vldsejsa','上线')
       }
     },
 
@@ -366,12 +360,12 @@ export default {
     useMinutes(){
       const time=this.taskData.pickData.useMinutes
       if (time>=0 && time<60){
-        return time + this.$lwLanguage.get('','分钟')
+        return time + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.oghgqzjq','分钟')
       }else {
         return Math.floor(time/60) +
-          this.$lwLanguage.get('','小时') +
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.zxpkngyd','小时') +
           time%60 +
-          this.$lwLanguage.get('','分钟')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.oghgqzjq','分钟')
       }
     }
   },
@@ -394,16 +388,16 @@ export default {
         // 下线原因选项
         reasonList:[
           {
-            label:this.$lwLanguage.get('','中途休息'),
-            value:this.$lwLanguage.get('','中途休息')
+            label:this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.qqkcvsfj','中途休息'),
+            value:this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.qqkcvsfj','中途休息')
           },
           {
-            label: this.$lwLanguage.get('','下班'),
-            value: this.$lwLanguage.get('','下班')
+            label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.bbrpohzy','下班'),
+            value: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.bbrpohzy','下班')
           },
           {
-            label: this.$lwLanguage.get('','其他'),
-            value: this.$lwLanguage.get('','其他')
+            label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.dorvlmnr','其他'),
+            value: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.dorvlmnr','其他')
           },
         ],
         // 下线原因
@@ -420,20 +414,20 @@ export default {
         // 原因选择
         refuseReasonTypeList: [
           {
-            label: this.$lwLanguage.get('','中途休息'),
-            value: this.$lwLanguage.get('','中途休息'),
+            label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.qqkcvsfj','中途休息'),
+            value: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.qqkcvsfj','中途休息'),
           },
           {
-            label: this.$lwLanguage.get('','下班'),
-            value: this.$lwLanguage.get('','下班')
+            label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.bbrpohzy','下班'),
+            value: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.bbrpohzy','下班')
           },
           {
-            label: this.$lwLanguage.get('','设备不匹配'),
-            value: this.$lwLanguage.get('','设备不匹配'),
+            label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.yeqdvajh','设备不匹配'),
+            value: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.yeqdvajh','设备不匹配'),
           },
           {
-            label: this.$lwLanguage.get('','其他'),
-            value: this.$lwLanguage.get('','其他')
+            label: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.dorvlmnr','其他'),
+            value: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.dorvlmnr','其他')
           },
         ],
         // 其他原因
@@ -489,7 +483,7 @@ export default {
         operationType: "PICK"
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','已上线')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.rlmzugoo','已上线')
         )
         clearTimeout(this.autoTimer)
         this.getData()
@@ -500,7 +494,7 @@ export default {
 
       if (!this.offLinePopup.reason){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','下线原因不能为空！')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.ftqkgcsj','下线原因不能为空！')
         )
         return
       }
@@ -511,7 +505,7 @@ export default {
         reasonOther: this.offLinePopup.reasonOther
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','已下线')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vyyqyewy','已下线')
         )
         this.offLinePopup.show = false
         this.getData()
@@ -540,7 +534,7 @@ export default {
 
       if (!this.rejectPopup.refuseReasonType){
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拒绝原因不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.tgbitfun','拒绝原因不能为空')
         )
         return
       }
@@ -551,7 +545,7 @@ export default {
         refuseReason: this.rejectPopup.refuseReason
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','已拒绝')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.dhdvigfg','已拒绝')
         )
         this.rejectPopup.show = false
         this.getData()
@@ -569,14 +563,24 @@ export default {
     },
     // 判断跳转页面
     checkPage(data, jumpType = 'push'){
+      const query = {
+        lwPickId: data.pickId
+      }
+
+      if (data.pickMethod === '400'){
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwSowAction',
+          query
+        })
+        return
+      }
+
 
       // 整箱
       if (data.pickUom === 'CASE'){
         this.$router[jumpType]({
           path: '/outbound/pick/lwBoxAction',
-          query:{
-            lwPickId: data.pickId
-          }
+          query
         })
         return
       }
@@ -585,9 +589,7 @@ export default {
       if (data.pickUom === 'LPN'){
         this.$router[jumpType]({
           path: '/outbound/pick/lwLpnAction',
-          query:{
-            lwPickId: data.pickId
-          }
+          query
         })
         return
       }
@@ -596,9 +598,7 @@ export default {
       if (data.pickPackType === 'ALONE'){
         this.$router[jumpType]({
           path: '/outbound/pick/lwAloneAction',
-          query:{
-            lwPickId: data.pickId
-          }
+          query
         })
         return
       }
@@ -606,9 +606,7 @@ export default {
       // 非独立件
       this.$router[jumpType]({
         path: '/outbound/pick/lwNotAloneAction',
-        query:{
-          lwPickId: data.pickId
-        }
+        query
       })
 
     }

package/src/components/page/outbound/pick/lpn/index.js

@@ -1,11 +1,11 @@
-/*
-* 出库拣选 - 按托盘
-* @author: 张文
-* @date  2022-06-17
-* */
-
-import lwOutboundPickLpnActionPage from "./index.vue";
-
-lwOutboundPickLpnActionPage.install = Vue => Vue.component(lwOutboundPickLpnActionPage.name, lwOutboundPickLpnActionPage)
-
-export default lwOutboundPickLpnActionPage
+/*
+* 出库拣选 - 按托盘
+* @author: 张文
+* @date  2022-06-17
+* */
+
+import lwOutboundPickLpnActionPage from "./index.vue";
+
+lwOutboundPickLpnActionPage.install = Vue => Vue.component(lwOutboundPickLpnActionPage.name, lwOutboundPickLpnActionPage)
+
+export default lwOutboundPickLpnActionPage

package/src/components/page/outbound/pick/lpn/index.vue

@@ -10,7 +10,7 @@
     type="lpn"
     :task-index="taskIndex"
     :pick-data="pickData"
-    :pick-container="pickData.pendingPickLpnList[taskIndex].fromLpn"
+    :pick-container="nowPickData.fromLpn"
     :lack-confirm-fn="lackConfirm"
     :abn-confirm-fn="abnConfirm"
     :get-data="getData"
@@ -27,28 +27,28 @@
       >
 
         <van-tab
-          :title="$lwLanguage.get('','正在拣选')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.rvchimpl','正在拣选')"
           name="ing"
         >
           <div class="lw-global-model-box">
 
             <lw-title-value-cell
               style="padding-top: 0"
-              :title="$lwLanguage.get('','拣选库位')"
-              :value="pickData.pendingPickLpnList[taskIndex].fromLocationCode"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.jtsvfnxg','拣选库位')"
+              :value="nowPickData.fromLocationCode"
               val-bold
               val-red
               :val-size="16"
             />
 
             <lw-title-value-cell
-              :title="$lwLanguage.get('','托盘号')"
-              :value="pickData.pendingPickLpnList[taskIndex].fromLpn"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.rwbnfvbd','托盘号')"
+              :value="nowPickData.fromLpn"
               val-bold
             />
 
             <lw-input
-              :title="$lwLanguage.get('','拣选库位')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.jtsvfnxg','拣选库位')"
               v-model="locationCode.value"
               :get-focus.sync="locationCode.focus"
               required
@@ -57,7 +57,7 @@
             />
 
             <lw-input
-              :title="$lwLanguage.get('','托盘号')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.rwbnfvbd','托盘号')"
               v-model="lpn.value"
               :get-focus.sync="lpn.focus"
               required
@@ -66,11 +66,11 @@
             />
 
             <div style="margin-top: 10px" class="lw-global-title">
-              {{ $lwLanguage.get('','商品明细') }}
+              {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.elzsudki','商品明细') }}
             </div>
             <div style="padding: 0 5px">
               <lw-sku-info-module
-                v-for="(i,k) in pickData.pendingPickLpnList[taskIndex].skuList"
+                v-for="(i,k) in nowPickData.skuList"
                 :key="k"
                 v-bind="i"
                 is-row
@@ -89,7 +89,7 @@
         </van-tab>
 
         <van-tab
-          :title="$lwLanguage.get('','待拣托盘')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.llddegps','待拣托盘')"
           name="wait"
         >
 
@@ -106,14 +106,14 @@
             >
               <div class="lw-global-value-bold">{{ i.fromLpn }}</div>
               <lw-tag type="danger" plain round>
-                {{ $lwLanguage.get('','待拣选') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.zndsezux','待拣选') }}
               </lw-tag>
             </div>
 
             <div class="lw-global-flex-between">
 
               <lw-title-value-cell
-                :title="$lwLanguage.get('','拣选库位')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.jtsvfnxg','拣选库位')"
                 :value="i.fromLocationCode"
                 :val-size="16"
                 val-bold
@@ -122,7 +122,7 @@
               />
 
               <lw-title-value-cell
-                :title="$lwLanguage.get('','数量')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.lwgstunb','数量')"
                 :value="i.totalQty"
                 val-bold
                 :is-row="false"
@@ -177,6 +177,14 @@ export default {
       },
     }
   },
+  computed:{
+    nowPickData(){
+      if (this.pickData.pendingPickLpnList && this.pickData.pendingPickLpnList.length){
+        return this.pickData.pendingPickLpnList[this.taskIndex]
+      }
+      return {}
+    }
+  },
   mounted() {
     this.getData()
   },
@@ -202,7 +210,7 @@ export default {
 
       return this.inputCheck({
         key: 'locationCode',
-        checkVal: this.pickData.pendingPickLpnList[this.taskIndex].fromLocationCode,
+        checkVal: this.nowPickData.fromLocationCode,
       })
     },
 
@@ -212,10 +220,17 @@ export default {
     },
     // 托盘号校验
     lpnCheck(){
-
+      // 非空判断, 支持扫描CaseNun和Sn定位 LPN
+      /*if (!this.lpn.value) {
+        this.lpn.focus = true
+        this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.lpnNull','托盘号不能为空'))
+        return false
+      }
+      return true;*/
       return this.inputCheck({
         key: 'lpn',
         checkVal: this.pickData.pendingPickLpnList[this.taskIndex].fromLpn,
+        needCheck: false
       })
     },
 
@@ -233,7 +248,7 @@ export default {
 
     // 确认缺货
     lackConfirm(data){
-      const item = this.pickData.pendingPickLpnList[this.taskIndex]
+      const item = this.nowPickData
 
       return projectWmsOutboundSubmitLpnPickSockout({
         pickId: this.pickData.pickId,
@@ -248,7 +263,7 @@ export default {
 
     // 确认异常
     abnConfirm(data){
-      const item = this.pickData.pendingPickLpnList[this.taskIndex]
+      const item = this.nowPickData
 
       return projectWmsOutboundSubmitLpnPickAbnormal({
         pickId: this.pickData.pickId,
@@ -269,12 +284,13 @@ export default {
         this.lpnCheck()
       )) return
 
-      const item = this.pickData.pendingPickLpnList[this.taskIndex]
+      const item = this.nowPickData
       projectWmsOutboundWholeLpnPick({
         pickId: this.pickData.pickId,
         pickNo: this.pickData.pickNo,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
+        actFromLpn: this.lpn.value
       }).then(res=>{
 
         // 判断是否需要打印箱票
@@ -283,7 +299,7 @@ export default {
         }
 
         this.$lwToast.success(
-          this.$lwLanguage.get('','拣选成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.hfeqlmal','拣选成功')
         )
 
         // 拣选完了就不要覆盖数据，会导致页面没有数据而崩溃