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

package/src/views/wms/page/outbound/pick/components/taskInfo.vue

@@ -23,55 +23,56 @@
             style="margin-left: 0"
             plain
             round
-          >{{ item.pickPackTypeLabel }}</lw-tag>
+          >
+            {{ item.pickPackTypeLabel }}
+          </lw-tag>
+
           <!-- 拣选方式 -->
           <lw-tag
             v-if="item.pickMethodLabel"
             type="warning"
             plain
             round
-          >{{ pickMethod }}</lw-tag>
+          >
+            {{ item.pickMethodLabel }}
+          </lw-tag>
+
+          <!-- 拣选方式 -->
+          <lw-tag
+            v-if="pickMethod"
+            type="success"
+            plain
+            round
+          >
+            {{ pickMethod }}
+          </lw-tag>
         </div>
 
       </div>
     </div>
-    <lw-data-look-bg type="not">
-
-      <!-- 计划量 -->
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.tyxurdvg','计划量')"
-        :value="item.totalQty || 0"
-      />
-
-      <!-- 已拣量 -->
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.zzeboixn','已拣量')"
-        :value="item.pickQty || 0"
-      />
-
-      <!-- 待拣量 -->
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nbwstigk','待拣量')"
-        :value="item.waitPickQty || 0"
-      />
-
-      <!-- 异常量 -->
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.chaslvxr','异常量')"
-        :value="item.abnormalQty || 0"
-      />
-
-    </lw-data-look-bg>
+    <lw-data-look-bg
+      type="not"
+      :data="item.labeledQtyList"
+      value-key="qtyLabel"
+      title-key="fieldCode"
+    />
     <div
       class="lw-global-model-bottom-radius"
       style="margin-bottom: 10px"
     >
       <!--进度条-->
-      <van-progress
-        style="margin: 5px 0"
-        stroke-width="8"
-        :percentage="percentage"
-        color="linear-gradient(90deg, #FF8E8F 0%, #C5000A 100%)"
+      <div class="lw-global-row-start">
+        <van-progress
+          style="margin: 5px 0"
+          stroke-width="8"
+          :percentage="percentage"
+          color="linear-gradient(90deg, #FF8E8F 0%, #C5000A 100%)"
+        />
+      </div>
+      <lw-label-value-group
+        :list="item.headers"
+        :show-end-row-style="false"
+        :show-start-row-style="false"
       />
       <slot></slot>
     </div>
@@ -100,13 +101,13 @@ export default {
     // 拣选方式
     pickMethod(){
       if (this.item.pickUom === 'CASE'){
-        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gjxccjvg','按箱拣选')
+        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gjxccjvg', '按箱拣')
       }
       if (this.item.pickUom === 'LPN'){
-        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.htxwnpou','整托盘拣选')
+        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.htxwnpou', '整托盘拣')
       }
 
-      return this.item.pickMethodLabel
+      return ''
     }
   },
   data() {

package/src/views/wms/page/outbound/pick/components/waitPickCollapseItem.vue

@@ -0,0 +1,104 @@
+<!--
+  待拣列表项
+  @author: 张文
+  @date: 2023-08-23
+-->
+<template>
+  <div class="lw-global-model-box lw-global-model-box-3px lw-global-collapse-box">
+    <van-collapse
+      v-model="activeCollapse"
+      :border="false"
+    >
+      <van-collapse-item
+        name="1"
+        :lazy-render="false"
+      >
+
+        <template #title>
+          <div class="lw-global-flex-between">
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('','托盘')"
+              :value="item.fromLpn"
+              val-bold
+              :is-row="false"
+            />
+
+            <lw-tag
+              round
+              plain
+            >
+              {{ item.uomLabel }}
+            </lw-tag>
+
+          </div>
+          <div class="lw-global-flex-between">
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('','库位')"
+              :value="item.fromLocationCode"
+              val-bold
+              :is-row="false"
+            />
+
+            <div class="lw-global-value-bold-red" style="font-size: 16px">
+              {{ item.totalQtyLabel }}
+            </div>
+
+          </div>
+        </template>
+
+        <lw-sku-info-module
+          class="lw-global-click-style"
+          v-for="(i,k) in item.skuList"
+          :key="k"
+          :sku-code="i.skuCode"
+          :sku-name="i.skuName"
+          :qty="i.totalQtyLabel"
+          :is-row="k!==0 && (k+1) !== item.skuList.length"
+          :is-row-first="k===0 && item.skuList.length !== 1"
+          :is-row-last="item.skuList.length===1 || (k+1)===item.skuList.length"
+          @click="$emit('skuClick',i.showLineKey)"
+        />
+      </van-collapse-item>
+    </van-collapse>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "waitPickCollapseItem",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      activeCollapse: [],
+      aa: [
+        {
+          skuCode: 123,
+          skuName: 123,
+        },
+        {
+          skuCode: 123,
+          skuName: 123,
+        },
+        {
+          skuCode: 123,
+          skuName: 123,
+        },
+      ]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/pick/container/index.vue

@@ -31,6 +31,7 @@
         rule-key="container"
         :create-rule="$lwScanRule.create('出库 - 容器拣选 - 拣选托盘','LPN')"
         :show-bottom-border="false"
+        :rule-serve-query="pickData"
         required
         @confirm="pickLpnClick"
       >
@@ -56,7 +57,7 @@
         type="card"
         animated
         v-model="tabActive"
-        @change="goTop"
+        @change="mixinAllGoTop"
       >
 
         <!-- 正在拣选 -->
@@ -90,12 +91,14 @@
 
             <!-- 库位 -->
             <lw-input
+              v-if="mixinNeedInputLoc"
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.container.index.emovmynk','拣选库位')"
               v-model="locationCode.value"
               :get-focus.sync="locationCode.focus"
               required
               rule-key="location"
               :create-rule="$lwScanRule.create('容器拣选-库位','LOCATION')"
+              :rule-serve-query="pickData"
               @confirm="locationCodeConfirm"
             />
 
@@ -107,6 +110,7 @@
               required
               rule-key="container"
               :create-rule="$lwScanRule.create('容器拣选-容器号','CONTAINER')"
+              :rule-serve-query="pickData"
               auto-clear-val
               @confirm="containerCodeConfirm"
             />
@@ -174,7 +178,8 @@
         v-model="lpn.popup.value"
         :get-focus.sync="lpn.popup.focus"
         rule-key="cutContainer"
-        :create-rule="$lwScanRule.create('出库 - 容器拣选 - 切换拣选托盘','LPN')"
+        :create-rule="$lwScanRule.create('容器拣选-切换拣选托盘','LPN')"
+        :rule-serve-query="pickData"
         @confirm="pickLpnConfirm"
       />
 
@@ -207,11 +212,6 @@ export default {
   mixins: [all],
   data() {
     return {
-      // 当前任务索引
-      taskIndex: 0,
-
-      // 拣选数据
-      pickData: {},
 
       // 绑定的容器号
       lpn: {
@@ -225,11 +225,7 @@ export default {
         }
       },
 
-      // 拣选库位
-      locationCode: {
-        value: '',
-        focus: false
-      },
+
       // 拣选库位
       containerCode: {
         value: '',
@@ -253,12 +249,12 @@ export default {
 
     // 获取数据
     getData() {
-      this.checkTaskIndex(this.pickData.pendingPickLineList?.length || 0)
+      this.mixinAllCheckTaskIndex(this.pickData.pendingPickLineList?.length || 0)
       projectWmsOutboundContainerPickOrderQueryInfo({
         pickId: this.$route.query.lwPickId
       }).then(res => {
         this.pickData = res
-        this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+        this.mixinAllCheckTaskIndex(this.pickData.pendingPickLineList.length)
       }).catch(() => history.go(-1))
     },
 
@@ -280,6 +276,8 @@ export default {
       }
       this.lpn.confirm = true
 
+      this.mixinAllInitGetFocus()
+
     },
     // 弹框确认切换托盘
     pickLpnConfirm() {
@@ -296,21 +294,13 @@ export default {
 
     // 拣选库位确认
     locationCodeConfirm() {
-      if (this.locationCodeCheck()) this.containerCode.focus = true
-    },
-    // 检查拣选库位
-    locationCodeCheck() {
-
-      return this.inputCheck({
-        key: 'locationCode',
-        checkVal: this.nowPickData.fromLocationCode,
-      })
+      if (this.mixinAllLocationCodeCheck()) this.containerCode.focus = true
     },
 
     // 容器号扫描完成
     containerCodeConfirm(val, {data}) {
 
-      if (!data.key || !this.locationCodeCheck()) return
+      if (!data.key || !this.mixinAllLocationCodeCheck()) return
 
       this.containerCode.focus = false
       projectWmsOutboundContainerPickCheckSn({
@@ -362,7 +352,7 @@ export default {
     },
     // 任务行切换后
     cutEnd() {
-      this.clearInputVal(
+      this.mixinAllClearInputVal(
         ['locationCode'],
         ['containerCode'],
         true
@@ -455,7 +445,7 @@ export default {
 
       this.cutEnd()
       this.pickData = res.pickTaskData
-      this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+      this.mixinAllCheckTaskIndex(this.pickData.pendingPickLineList.length)
     },
   }
 }

package/src/views/wms/page/outbound/pick/index/index.vue

@@ -230,7 +230,7 @@
             />
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vvaytrgg','商品数')"
-              :value="taskData.pickTask.totalQty"
+              :value="taskData.pickTask.totalQtyLabel"
               val-bold
               :is-row="false"
             />
@@ -337,18 +337,20 @@ import {
   wmsMobileBizTaskOffline,
   wmsMobileBizTaskOnline
 } from "../../../../api/outbound/pick";
+import {pickMixin} from "./../../../../mixin/pickMixin";
 
 export default {
   name: "lwOutboundPickIndexPage",
+  mixins: [pickMixin],
   computed: {
     // 用户状态信息
     userStatus() {
       if (this.taskData.status === 'ONLINE') {
         return {
           type: 'primary',
-          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','下线'),
-          animation:'lw-global-animation-out'
+          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', '下线'),
+          animation: 'lw-global-animation-out'
         }
       }
 
@@ -435,7 +437,7 @@ export default {
       projectWmsPickTaskByTaskId({
         taskId: lwTaskId
       }).then(res=>{
-        this.checkPage(res, 'replace')
+        this.mixinCheckPage(res, 'replace')
       })
     }else {
       this.getData()
@@ -537,66 +539,8 @@ export default {
 
     // 执行拣选
     actionPick(){
-      this.checkPage(this.taskData.pickTask)
+      this.mixinCheckPage(this.taskData.pickTask)
     },
-    // 判断跳转页面
-    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
-        })
-        return
-      }
-
-      // 整托盘
-      if (data.pickUom === 'LPN'){
-        this.$router[jumpType]({
-          path: '/outbound/pick/lwLpnAction',
-          query
-        })
-        return
-      }
-
-      // 容器
-      if (data.pickSKuType === 'CONTAINER'){
-        this.$router[jumpType]({
-          path: '/outbound/pick/lwContainerAction',
-          query
-        })
-        return
-      }
-
-      // 独立件
-      if (data.pickPackType === 'ALONE'){
-        this.$router[jumpType]({
-          path: '/outbound/pick/lwAloneAction',
-          query
-        })
-        return
-      }
-
-      // 非独立件
-      this.$router[jumpType]({
-        path: '/outbound/pick/lwNotAloneAction',
-        query
-      })
-
-    }
   },
   beforeDestroy(){
     clearTimeout(this.autoTimer)

package/src/views/wms/page/outbound/pick/lpn/index.vue

@@ -23,7 +23,7 @@
         type="card"
         animated
         v-model="tabActive"
-        @change="goTop"
+        @change="mixinAllGoTop"
       >
 
         <van-tab
@@ -48,11 +48,15 @@
             />
 
             <lw-input
+              v-if="mixinNeedInputLoc"
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.jtsvfnxg','拣选库位')"
               v-model="locationCode.value"
               :get-focus.sync="locationCode.focus"
               required
               rule-key="location"
+              :create-rule="$lwScanRule.create('托盘拣选-拣选库位','LOCATION')"
+              :owner-id="nowPickData.ownerId"
+              :rule-serve-query="nowPickData"
               @confirm="locationCodeConfirm"
             />
 
@@ -62,6 +66,9 @@
               :get-focus.sync="lpn.focus"
               required
               rule-key="lpn"
+              :create-rule="$lwScanRule.create('托盘拣选-托盘号','LPN')"
+              :owner-id="nowPickData.ownerId"
+              :rule-serve-query="nowPickData"
               @confirm="lpnConfirm"
             />
 
@@ -73,13 +80,14 @@
                 v-for="(i,k) in nowPickData.skuList"
                 :key="k"
                 v-bind="i"
+                :qty="i.qtyLabel"
                 is-row
               />
             </div>
 
             <lw-cut-card
               v-model="taskIndex"
-              :length="pickData.pendingPickLpnList.length"
+              :length="waitPick.length"
               :cut-start="cutStart"
               :cut-end="cutEnd"
             />
@@ -98,7 +106,7 @@
             v-for="(i,k) in pickData.pendingPickLpnList"
             :key="k"
             :style="{animationDelay: 50 * k + 'ms'}"
-            @click="waitPickClick(k)"
+            @click="mixinAllWaitPickClick(k)"
           >
             <div
               class="lw-global-flex-between lw-global-row-start"
@@ -123,7 +131,7 @@
 
               <lw-title-value-cell
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.lpn.lwgstunb','数量')"
-                :value="i.totalQty"
+                :value="i.totalQtyLabel"
                 val-bold
                 :is-row="false"
               />
@@ -147,6 +155,7 @@ import {
   projectWmsOutboundWholeLpnPick
 } from "../../../../api/outbound/pick/lpn";
 import {all} from "../mixin/all";
+import {projectWmsPickTaskByTaskId} from "./../../../../api/outbound/pick";
 
 export default {
   name: "lwOutboundPickLpnActionPage",
@@ -156,30 +165,13 @@ export default {
   mixins: [all],
   data() {
     return {
-      // 拣选数据
-      pickData: {},
-      // 任务行索引
-      taskIndex: 0,
-
-      // 拣选库位
-      locationCode: {
-        value: '',
-        focus: false
-      },
-
-      // 托盘号
-      lpn: {
-        value: '',
-        focus: false
-      },
-
-      printData: {}
+      waitPick: []
     }
   },
   computed: {
     nowPickData() {
-      if (this.pickData.pendingPickLpnList && this.pickData.pendingPickLpnList.length) {
-        return this.pickData.pendingPickLpnList[this.taskIndex]
+      if (this.waitPick.length) {
+        return this.waitPick[this.taskIndex]
       }
       return {}
     }
@@ -188,6 +180,11 @@ export default {
     this.getData()
   },
   methods: {
+    // 处理掉不能整托盘拣选的数据
+    formatWholeLpn() {
+      this.waitPick = this.pickData.pendingPickLpnList.filter(item => item.canWholePick)
+      this.mixinAllCheckTaskIndex(this.waitPick.length)
+    },
 
     // 获取数据
     getData() {
@@ -195,53 +192,31 @@ export default {
         pickId: this.$route.query.lwPickId
       }).then(res => {
         this.pickData = res
-        this.checkTaskIndex(this.pickData.pendingPickLpnList.length)
+        this.formatWholeLpn()
+        this.mixinAllInitGetFocus('lpn')
       }).catch(() => history.go(-1))
     },
 
 
     // 拣选库位确认
     locationCodeConfirm() {
-      if (this.locationCodeCheck()) this.lpn.focus = true
-    },
-    // 检查拣选库位
-    locationCodeCheck() {
-
-      return this.inputCheck({
-        key: 'locationCode',
-        checkVal: this.nowPickData.fromLocationCode,
-      })
+      if (this.mixinAllLocationCodeCheck()) this.lpn.focus = true
     },
 
     // 托盘号确认
     lpnConfirm() {
-      if (this.lpnCheck()) this.pickConfirm()
-    },
-    // 托盘号校验
-    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
-      })
+      if (this.mixinAllLpnCheck()) this.pickConfirm()
     },
 
 
     // 任务行切换前
     cutStart() {
-      return this.checkInputVal(['locationCode', 'lpn'])
+      return this.mixinAllCheckInputVal(['locationCode', 'lpn'])
 
     },
     // 任何行切换后
     cutEnd() {
-      this.clearInputVal(
+      this.mixinAllClearInputVal(
         ['locationCode'],
         ['lpn'],
         true
@@ -283,8 +258,8 @@ export default {
     async pickConfirm() {
       // 校验必填项
       if (!(
-        this.locationCodeCheck() &&
-        this.lpnCheck()
+        this.mixinAllLocationCodeCheck() &&
+        this.mixinAllLpnCheck()
       )) return
 
       const item = this.nowPickData
@@ -309,12 +284,21 @@ export default {
 
       // 拣选完了就不要覆盖数据，会导致页面没有数据而崩溃
       if (res.pickOrderFinish) {
-        this.$refs.dataLookAndChange.openPickSuccessPopup(res)
+        await this.$refs.dataLookAndChange.openPickSuccessPopup(res)
+        return
+      }
+
+      if (res.needChangePickUomType) {
+        projectWmsPickTaskByTaskId({
+          pickId: this.pickData.pickId
+        }).then(res => {
+          this.mixinCheckPage(res, 'replace')
+        })
         return
       }
 
       this.pickData = res.pickTaskData
-      this.checkTaskIndex(this.pickData.pendingPickLpnList.length)
+      this.formatWholeLpn()
     }
   }
 }