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

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

@@ -9,7 +9,7 @@
     <div class="lw-global-page-box">
 
       <!-- tab -->
-      <lw-tab-box>
+      <lw-tab-box v-if="lpnList.length">
         <van-tabs
           type="card"
           animated
@@ -32,14 +32,12 @@
         <div class="lw-global-model-box">
 
           <!-- 托盘号 -->
-          <div class="lw-global-row-start">
-          <span class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.receive.putaway.lpnCode', '托盘号') }}
-          </span>
-            <span class="lw-global-value-bold">
-            {{ lpnTaskData.lpn }}
-          </span>
-          </div>
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.lpnCode', '托盘号')"
+            :value="$lwCheckVal(lpnTaskData.lpn)"
+            val-bold
+            is-row-start
+          />
 
           <!-- 原库位、目标库位 -->
           <lw-title-value-cell
@@ -75,16 +73,16 @@
           />
 
           <!-- 总数量、行数 -->
-          <div class="lw-global-row lw-global-flex-between">
+          <div class="lw-global-row-end lw-global-flex-between">
 
             <div>
             <span class="lw-global-title">
-                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架') }}
+                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty', '总数量/待上架') }}
               </span>
               <span class="lw-global-value-bold">
-                <span>{{ lpnTaskData.qty }}</span>
+                <span>{{ lpnTaskData.qtyLabel }}</span>
                 /
-                <span style="color: #D50000">{{ lpnTaskData.canPaQty }}</span>
+                <span style="color: #D50000">{{ lpnTaskData.canPaQtyLabel }}</span>
               </span>
             </div>
 
@@ -101,12 +99,15 @@
 
         </div>
 
-        <div class="lw-global-model-box lpn-title">
+        <div class="lw-global-model-box lw-global-model-box-3px">
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.receive.putaway.caseNum', '箱号')"
             required v-model="caseNum.value" :get-focus.sync="caseNum.focus"
             rule-key="case"
-            @confirm="scanCase"/>
+            :create-rule="$lwScanRule.create('入库上架-整箱-箱号','CASE')"
+            :show-bottom-border="false"
+            @confirm="scanCase"
+          />
         </div>
 
         <div class="lw-global-tab-box" style="margin-top: 10px">
@@ -199,6 +200,7 @@
             :get-focus.sync="local.focus"
             required
             rule-key="location"
+            :create-rule="$lwScanRule.create('入库上架-整箱-目标库位','LOCATION')"
             @confirm="confirmLocal"
           />
 
@@ -207,6 +209,7 @@
             :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLpn','目标托盘')"
             v-model="lpn.value"
             rule-key="lpn"
+            :create-rule="$lwScanRule.create('入库上架-整箱-目标托盘','LPN')"
             :get-focus.sync="lpn.focus"
             :show-bottom-border="false"
             @confirm="confirmLpn"
@@ -222,6 +225,7 @@
             :get-focus.sync="local.focus"
             required
             rule-key="location"
+            :create-rule="$lwScanRule.create('入库上架-整箱-通道库位','LOCATION')"
             @confirm="confirmLocal"
           />
 
@@ -229,7 +233,8 @@
             class="lw-global-animation-left"
             :title="$lwLanguage.get('wms_project.pda.receive.putaway.tempLpn','暂存容器')"
             v-model="lpn.value"
-            rule-key="lpn"
+            rule-key="waitLpn"
+            :create-rule="$lwScanRule.create('入库上架-整箱-暂存容器','LPN')"
             :get-focus.sync="lpn.focus"
             :show-bottom-border="false"
             @confirm="confirmLpn"
@@ -266,7 +271,9 @@
 import CaseInfo from './../components/CaseInfo/index.vue'
 
 import {
-  wmsMobileGetPutawayTaskByWholeLpn, wmsMobileSecondAllocatePutawayByWholeCase,
+  wmsMobileGetPutawayTaskByTask,
+  wmsMobileGetPutawayTaskByWholeLpn,
+  wmsMobileSecondAllocatePutawayByWholeCase,
   wmsMobileSubmitPutawayByWholeCase
 } from "../../../../api/receive/putaway";
 
@@ -282,6 +289,8 @@ export default {
       backStep: -1,
       // 托盘列表
       lpnList: [],
+      // 任务id，解决任务进来没有lpn的问题
+      taskId: '',
 
       // tab当前激活项
       tabActive: 0,
@@ -311,21 +320,24 @@ export default {
     }
   },
   mounted() {
-    const {lwLpnList, lwBack} = this.$route.query
+    const {lwLpnList, lwBack, lwTaskId} = this.$route.query
     const lpnList = JSON.parse(lwLpnList || '[]')
+
+    this.taskId = lwTaskId
     this.backStep = Number('-' + lwBack)
 
-    if (!lpnList.length) {
+    if (!lpnList.length && !this.taskId) {
       this.$lwShowErrorMsg(
         this.$lwLanguage.get('wms_project.pda.receive.putaway.lpnCodeNull', '托盘数据为空')
       )
-      history.go(this.backStep)
+      // history.go(this.backStep)
 
       return
     }
 
     this.lpnList = lpnList
-    this.tabChange()
+
+    this.lpnList.length ? this.tabChange() : this.getTaskByTaskId()
 
   },
   methods: {
@@ -360,34 +372,50 @@ export default {
         })
       } else {
         this.tabActive + 1 > this.lpnList.length ? this.tabActive = 0 : ''
+        this.getTaskByLpn()
 
-        wmsMobileGetPutawayTaskByWholeLpn({
-          lpn: this.lpnList[this.tabActive]
-        }).then(res => {
-          if(res && res.caseList){
-            res.caseList.forEach(c=>c._scanned = false)
-          }
-          this.tabCaseActive = 0
-          this.lpnTaskData = res
-        }).catch((err) => {
-          this.$lwDialog.confirm({
-            title: this.$lwLanguage.get('wms_project.pda.receive.putaway.dataError', '数据异常'),
-            message:
-              this.$lwLanguage.get('wms_project.pda.receive.putaway.errorInfo', '错误信息：') +
-              err.data.message +
-              '\n' +
-              this.$lwLanguage.get('wms_project.pda.receive.putaway.errorMsg', '点击确定继续执行剩余任务，点击返回回退至上一页')
-            ,
-            cancelButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.back', '返回'),
-          }).then(() => {
-            this.lpnList.splice(this.tabActive, 1)
-            this.tabChange()
-          }).catch(() => {
-            history.go(this.backStep)
-          })
-        })
       }
     },
+    // 通过托盘号获取任务
+    getTaskByLpn() {
+      wmsMobileGetPutawayTaskByWholeLpn({
+        lpn: this.lpnList[this.tabActive]
+      }).then(res => {
+        if (res && res.caseList) {
+          res.caseList.forEach(c => c._scanned = false)
+        }
+        this.tabCaseActive = 0
+        this.lpnTaskData = res
+      }).catch((err) => {
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('wms_project.pda.receive.putaway.dataError', '数据异常'),
+          message:
+            this.$lwLanguage.get('wms_project.pda.receive.putaway.errorInfo', '错误信息：') +
+            err.data.message +
+            '\n' +
+            this.$lwLanguage.get('wms_project.pda.receive.putaway.errorMsg', '点击确定继续执行剩余任务，点击返回回退至上一页')
+          ,
+          cancelButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.back', '返回'),
+        }).then(() => {
+          this.lpnList.splice(this.tabActive, 1)
+          this.tabChange()
+        }).catch(() => {
+          history.go(this.backStep)
+        })
+      })
+    },
+    // 通过任务号获取信息
+    getTaskByTaskId() {
+      wmsMobileGetPutawayTaskByTask({taskId: this.taskId}).then(res => {
+        if (res && res.caseList) {
+          res.caseList.forEach(c => c._scanned = false)
+        }
+        this.tabCaseActive = 0
+        this.lpnTaskData = res
+      }).catch(() => {
+        history.go(this.backStep)
+      })
+    },
 
     scanCase() {
       const caseNum = this.caseNum.value

package/src/views/wms/page/receive/putaway/components/CaseInfo/index.vue

@@ -45,7 +45,7 @@
 
               <div class="lw-global-flex-start">
                 <div class="lw-global-title lw-global-value-bold" style="color: red;">
-                  {{ showPaQty?i.canPaQty:i.qty }}
+                  {{ showPaQty ? i.canPaQtyLabel : i.qtyLabel }}
                 </div>
 
                 <div style="margin: 0px 12px 0px 32px;" v-if="showDel">
@@ -76,7 +76,7 @@
             />
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量')"
-              :value="showPaQty?i.canPaQty:i.qty"
+              :value="showPaQty?i.canPaQtyLabel:i.qtyLabel"
               :is-row="false"
               val-bold
               val-red

package/src/views/wms/page/receive/putaway/components/SkuInfo/index.vue

@@ -125,7 +125,7 @@
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量')"
-          :value="showPaQty?i.canPaQty:i.qty"
+          :value="showPaQty?i.canPaQtyLabel:i.qtyLabel"
           :is-row="false"
           val-bold
           val-red
@@ -183,7 +183,10 @@
         ref="abnormal"
         :sku-code="abnPopup.sku.skuCode"
         :sku-name="abnPopup.sku.skuName"
+        :sku-id="abnPopup.sku.skuId"
+        :owner-id="abnPopup.sku.ownerId"
         :qty="abnPopup.sku.qty"
+        :qty-label="abnPopup.sku.qtyLabel"
         :location="locationCode"
         :type="$lwLanguage.get('wms_project.pda.receive.putaway.inbound','在库')"
         :ab-type="$lwLanguage.get('wms_project.pda.receive.putaway.putaway','入库上架')"
@@ -273,7 +276,10 @@ export default {
       this.abnPopup.sku = {
         skuCode: item.sku.code,
         skuName: item.sku.name,
-        qty:item.qty,
+        skuId: item.sku.id,
+        ownerId: item.sku.ownerId,
+        qty: item.qty,
+        qtyLabel: item.qtyLabel,
         groupKey: item.groupKey
       }
       this.abnPopup.show = true
@@ -289,6 +295,7 @@ export default {
         taskId: this.taskId,
         skuCode: this.abnPopup.sku.skuCode,
         groupKey: this.abnPopup.sku.groupKey,
+        skuId: this.abnPopup.sku.skuId,
         ...data
       }).then(()=>{
         this.abnPopup.show = false

package/src/views/wms/page/receive/putaway/components/SkuPutAwayInfo/index.vue

@@ -150,24 +150,28 @@
     </div>
 
     <!-- 看板 -->
-    <lw-data-look-bg :type="lookType">
+    <lw-data-look-bg
+      :type="lookType"
+      :show-end-line="false"
+      need-show
+    >
 
       <!-- 计划量 -->
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.receive.putaway.planQty','计划量')"
-        :value="item.qty || 0"
+        :value="item.qtyLabel || 0"
       />
 
       <!-- 已上架 -->
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.receive.putaway.paQty','已上架')"
-        :value="item.paQty || 0"
+        :value="item.paQtyLabel || 0"
       />
 
       <!-- 异常 -->
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.receive.putaway.abnQty','异常量')"
-        :value="item.abnormalQty || 0"
+        :value="item.abnormalQtyLabel || 0"
       />
     </lw-data-look-bg>
 

package/src/views/wms/page/receive/putaway/components/TaskInfo/index.vue

@@ -93,9 +93,9 @@
                 {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架') }}
               </span>
               <span class="lw-global-value-bold">
-                <span>{{ item.qty }}</span>
+                <span>{{ item.qtyLabel }}</span>
                 /
-                <span style="color: #D50000">{{ item.canPaQty }}</span>
+                <span style="color: #D50000">{{ item.canPaQtyLabel }}</span>
               </span>
             </div>
             <div>
@@ -241,7 +241,8 @@ export default {
       if (!Object.keys(this.printInfo).length){
         const {success, printData} = this.$lwPrint.test(
           'PART_PUTAWAY_LABEL',
-          this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.TaskInfo.index.vegillyf','入库上架标签')
+          this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.TaskInfo.index.vegillyf', '入库上架标签'),
+          true
         )
         if (!success) return
 

package/src/views/wms/page/receive/putaway/components/lpnBatchItem.vue

@@ -68,7 +68,7 @@
           <div class="lw-global-flex-between lw-global-row-end">
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架')"
-              :value="item.qty +'/' + item.canPaQty"
+              :value="item.qtyLabel +'/' + item.canPaQtyLabel"
               :is-row="false"
             />
 

package/src/views/wms/page/receive/putaway/components/overPutawayItem.vue

@@ -34,7 +34,7 @@
 
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.ymfsbcri','数量')"
-              :value="item.qty"
+              :value="item.qtyLabel"
               val-bold
               :is-row="false"
             />

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

@@ -28,7 +28,7 @@
             <!-- 输入框 -->
             <div
               v-if="!fromTask"
-              class="lw-global-model-box"
+              class="lw-global-model-box lw-global-model-box-3px"
             >
               <lw-input
                 :title="$lwLanguage.get('wms_project.pda.receive.putaway.lpn','托盘号/上架标签')"
@@ -36,6 +36,8 @@
                 :get-focus.sync="lpn.focus"
                 required
                 rule-key="lpn"
+                :create-rule="$lwScanRule.create('入库上架-执行上架-上架标签','LPN')"
+                :show-bottom-border="local.show"
                 @confirm="lpnConfirm"
               />
 
@@ -45,10 +47,10 @@
                 v-model="local.value"
                 :get-focus.sync="local.focus"
                 rule-key="location"
+                :create-rule="$lwScanRule.create('入库上架-执行上架-库位','LOCATION')"
                 @confirm="lpnConfirm"
               />
             </div>
-
             <!-- 扫描得到的数据 -->
             <task-info
               class="lw-global-animation-out"
@@ -56,10 +58,10 @@
               :key="i.taskId"
               :style="{animationDelay: 50 * k + 'ms'}"
               :item="i"
-              :show-del="showDel && !fromTask"
-              :show-print="showPrint"
-              :show-sku-abnormal="showSkuAbnormal"
-              :location-code="locationCode"
+              :show-del="!fromTask"
+              :show-print="$lwWarehouseConfig.get('systemConfig.INBOUND_PUTAWAY_PRINT_LABEL')==='true'"
+              show-sku-abnormal
+              :location-code="i.fromLocationCode"
               show-confirm-end-task
               @preConfirmEndTask="preConfirmEndTask(i,k)"
               @del="itemDel(k)"
@@ -101,10 +103,10 @@
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.receive.putaway.inventory.title', '库存')"
       :showOffBtn="false"
-      class="abnormal-popup-bg"
-      position="center"
       @clickCloseBtn="hideInventory"
-      v-model="showInventoryDialog">
+      v-model="showInventoryDialog"
+      :show-keyboard-placeholder="false"
+    >
 
       <div v-if="inventoryData">
 
@@ -187,7 +189,10 @@ import CaseInfo from './../components/CaseInfo/index.vue'
 import {
   wmsMobileGetPutawayTaskByLpn,
   wmsMobileQueryPutawayInventory,
-  wmsMobileGetPutawayTaskByTask, wmsMobileQueryHasPutawayTask, wmsMobilePutawayTaskCancelLine
+  wmsMobileGetPutawayTaskByTask,
+  wmsMobileQueryHasPutawayTask,
+  wmsMobilePutawayTaskCancelLine,
+  wmsMobileQueryPutawayTaskByLpns
 } from "../../../../api/receive/putaway";
 
 export default {
@@ -195,31 +200,6 @@ export default {
   components: {
     TaskInfo,overPutawayItem,SkuInfo,CaseInfo
   },
-  props:{
-    // 是否显示删除按钮
-    showDel:{
-      type: Boolean,
-      default: true
-    },
-
-    // 是否显示补打标签按钮
-    showPrint:{
-      type: Boolean,
-      default: true
-    },
-
-    // 是否显示商品异常上报按钮
-    showSkuAbnormal:{
-      type: Boolean,
-      default: true
-    },
-
-    // 库位 - 异常使用
-    locationCode:{
-      type: String,
-      default: ''
-    },
-  },
   data() {
     return {
       // tab激活项
@@ -293,19 +273,30 @@ export default {
 
       // 找出所有托盘的并集
       let btnList = []
-      this.taskList.forEach(item=>{
+      this.taskList.forEach(item => {
         btnList = btnList.concat(item.putawayMethodList || [])
       })
 
       // 去重
-      let arr =  [...new Set(btnList)].map(item=>this.allBtnList[item])
+      let arr = [...new Set(btnList)]
+
+      // 校验是否显示按商品上架按钮
+      const showSkuBtn = this.$lwSystemConfig.get('wms.receive.putaway.showSkuPutawayBtn')
+      if (!showSkuBtn) {
+        for (let i = 0; i < arr.length; i++) {
+          if (arr[i] === 'sku') {
+            arr.splice(i, 1)
+            break
+          }
+        }
+      }
 
-      // 商品上架 - 如果没有任何交集，按商品上架就是兜底方案
-      if (!arr.length){
+      // 商品上架 - 如果没有任何交集，按商品上架就是兜底方案，同时查看项目是否配置禁用
+      if (showSkuBtn && !arr.length) {
         arr.push(this.allBtnList.sku)
       }
 
-      return arr
+      return arr.map(item => this.allBtnList[item])
     }
 
   },
@@ -321,22 +312,29 @@ export default {
     }
   },
   mounted() {
-    const {lwTaskId} = this.$route.query
+    const {lwTaskId, lpn} = this.$route.query
     if (lwTaskId){
       // 如果是任务进入的就不显示输入框
       this.fromTask = true
 
       wmsMobileGetPutawayTaskByTask({
         taskId: lwTaskId
-      }).then(res=>{
+      }).then(res => {
         this.taskList = [res]
 
-        this.showLpnShelf = this.taskList.every(item=>item.wholeLpnPutaway)
+        this.showLpnShelf = this.taskList.every(item => item.wholeLpnPutaway)
 
-      }).catch(()=>{
+      }).catch(() => {
         history.go(-1)
       })
     }
+    if (lpn) {
+      wmsMobileQueryPutawayTaskByLpns({
+        lpnList: lpn.split(',')
+      }).then(res => {
+        this.taskList = res.list
+      })
+    }
     this.getOverListData()
   },
   methods: {
@@ -530,13 +528,12 @@ export default {
 
     // 按商品上架
     skuShelf(){
-      const taskIdList = this.taskList.map(item=>{
-        return item.taskId
-      })
+      this.jumpBefore()
 
+      const taskIdList = this.taskList.map(item => item.taskId)
       this.$router.push({
-        path:'/receive/putaway/lwSkuAction',
-        query:{
+        path: '/receive/putaway/lwSkuAction',
+        query: {
           lwTaskIdList: JSON.stringify(taskIdList),
           lwBack: this.fromTask ? 2 : 1
         }
@@ -545,10 +542,11 @@ export default {
 
     // 整托盘上架
     lpnShelf(){
+
       this.$router.push({
-        path:'/receive/putaway/lwLpnAction',
-        query:{
-          lwLpnList: JSON.stringify(this.taskList.map(item=>item.lpn)),
+        path: '/receive/putaway/lwLpnAction',
+        query: {
+          lwLpnList: JSON.stringify(this.jumpBefore()),
           lwBack: this.fromTask ? 2 : 1
         }
       })
@@ -557,25 +555,39 @@ export default {
     // 整托盘批量上架
     lpnBatchShelf(){
       this.$router.push({
-        path:'/receive/putaway/lwLpnBatchAction',
-        query:{
-          lwLpnList: JSON.stringify(this.taskList.map(item=>item.lpn)),
+        path: '/receive/putaway/lwLpnBatchAction',
+        query: {
+          lwLpnList: JSON.stringify(this.jumpBefore()),
           lwBack: this.fromTask ? 2 : 1
         }
       })
     },
 
     // 整箱上架
-    caseShelf(){
+    caseShelf() {
       this.$router.push({
-        path:'/receive/putaway/lwCaseAction',
-        query:{
-          lwLpnList: JSON.stringify(this.taskList.map(item=>item.lpn)),
+        path: '/receive/putaway/lwCaseAction',
+        query: {
+          lwLpnList: JSON.stringify(this.jumpBefore()),
+          lwTaskId: this.$route.query.lwTaskId,
           lwBack: this.fromTask ? 2 : 1
         }
       })
     },
 
+    // 页面跳转前记录当前扫描的LPN数据
+    jumpBefore() {
+      const lpnList = this.taskList.filter(item => item.lpn).map(item => item.lpn)
+      this.$router.replace({
+        path: '/receive/putaway/lwIndex',
+        query: {
+          lpn: lpnList.join(','),
+          lwTaskId: this.$route.query.lwTaskId,
+          _time: new Date().getTime()
+        }
+      })
+      return lpnList
+    }
   }
 }
 </script>

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

@@ -81,9 +81,9 @@
                 {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架') }}
               </span>
             <span class="lw-global-value-bold">
-                <span>{{ lpnTaskData.qty }}</span>
+                <span>{{ lpnTaskData.qtyLabel }}</span>
                 /
-                <span style="color: #D50000">{{ lpnTaskData.canPaQty }}</span>
+                <span style="color: #D50000">{{ lpnTaskData.canPaQtyLabel }}</span>
               </span>
           </div>
 
@@ -119,11 +119,10 @@
       </div>
 
       <!-- 输入框 -->
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box lw-global-model-box-3px">
 
         <!-- 接力上架 -->
         <lw-cell
-          style="padding: 0"
           :title="$lwLanguage.get('wms_project.pda.receive.putaway.relayUp','接力上架')"
           :is-link="false"
           required
@@ -131,7 +130,7 @@
           <template #value>
             <van-switch
               v-model="relay"
-              size="22px"
+              size="18px"
               @change="relayChange"
             />
           </template>
@@ -146,6 +145,8 @@
           :get-focus.sync="local.focus"
           required
           rule-key="location"
+          :create-rule="$lwScanRule.create('入库上架-整托盘-目标库位','LOCATION')"
+          :show-bottom-border="false"
           @confirm="putawayAction"
         />
 
@@ -158,6 +159,8 @@
           :get-focus.sync="local.focus"
           required
           rule-key="location"
+          :create-rule="$lwScanRule.create('入库上架-整托盘-通道库位','LOCATION')"
+          :show-bottom-border="false"
           @confirm="putawayAction"
         />
 

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

@@ -52,6 +52,7 @@
           :title="actionText.title"
           v-model="locationCode"
           rule-key="location"
+          :create-rule="$lwScanRule.create('入库上架-整托盘批量上架','LOCATION')"
           :get-focus.sync="locationCodeFocus"
           required
           @confirm="confirmAction"