@logwire/logwire-wms-pda-ui 3.5.5 → 3.5.6

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

@@ -15,8 +15,14 @@
     :lack-confirm-fn="mixinAloneLackConfirm"
     :abn-confirm-fn="mixinAloneAbnConfirm"
     :get-data="getData"
+    :nav-back-fn="mixinAloneBackPage"
     @pickConfirm="pickConfirm"
   >
+  <template v-slot:task-header v-if="pickPathSort">
+    <pick-path-search :pickData="pickData" 
+      @pickTaskLineSorted="pickTaskLineSorted"
+      style="display: flex; flex:1; margin-bottom: 18px; justify-content: end;"/>
+  </template>
 
     <div
       style="margin-bottom: 10px;"
@@ -344,6 +350,7 @@
 </template>
 
 <script>
+import pickPathSearch from '../components/pickPathSearch.vue'
 import dataLookAndChange from './../components/dataLookAndChange/index.vue'
 import skuLocationInfo from './../components/skuLocationInfo/index.vue'
 import splitPutDown from './../components/splitPutDown/index.vue'
@@ -366,6 +373,7 @@ export default {
     splitPutDown,
     exchangePickContainer,
     waitPickCollapseItem,
+    pickPathSearch,
   },
   mixins: [all, aloneAndNotAlone],
   data() {
@@ -385,44 +393,27 @@ export default {
         }
       },
 
-
       // 打印机
       printLpnData: {},
       // 是否打印原标签开关
       printOldLabel: {
         open: false,
-      },
-
-      // TODO 开发数据
-      needSnList: [
-        {sn: 123, qty: 1}
-      ]
+      }
     }
   },
   mounted() {
-    this.getData().then(() => {
-      // 检验是否自带扫描托盘号拣选
-      const pickLpn = this.$route.query.pickLpn
-      if (this.hasLpn && pickLpn) {
-        const pending = this.pickData.pendingPickLineList || []
-        for (let i = 0; i < pending.length; i++) {
-          const item = pending[i]
-          if (item.fromLpn === pickLpn) {
-            this.taskIndex = i
-            this.lpn.value = pickLpn
-            this.mixinAloneLpnConfirm(
-              pickLpn,
-              {data: {key: pickLpn, lpn: pickLpn}}
-            )
-            break
-          }
-        }
-      }
-    })
     this.checkLpnPrint()
+    this.getData()
+    const backPageInfo = JSON.parse(this.$route.query.backPageInfo || '{}')
+    this.usePickContainer = backPageInfo.query?.container?.split(',') || []
   },
   methods: {
-
+    // 拣选任务行排序完成
+    pickTaskLineSorted(sortedList) {
+      if (this.pickData.pendingPickLineList) {
+        this.pickData.pendingPickLineList = sortedList
+      }
+    },
     // 托盘打印机校验
     checkLpnPrint(needCheck) {
 
@@ -436,7 +427,6 @@ export default {
       this.printLpnData = printData
       return success
     },
-
     // 补打拣选容器
     reprint() {
       projectWmsOutboundPickPrint({
@@ -454,35 +444,78 @@ export default {
       })
     },
     // 拣选容器按钮点击
-    containerBtnClick() {
+    async containerBtnClick() {
       if (this.container.confirm) {
         this.container.popup.show = true
         this.container.popup.focus = true
         return
       }
 
-      this.containerConfirm()
+      await this.containerConfirm()
+
+      // 检验是否自带扫描托盘号拣选
+      const {pickLpn, pickSkuCode} = this.$route.query
+      if (this.hasLpn && pickLpn) {
+        const pending = this.pickData.pendingPickLineList || []
+        let index = -1
+        for (let i = 0; i < pending.length; i++) {
+          const item = pending[i]
+          if (item.fromLpn === pickLpn) {
+
+            index = i
+            // 找到托盘号后找商品号
+            if (this.mixinNeedInputSku && pickSkuCode && item.skuCode !== pickSkuCode) continue
+
+            this.lpn.value = pickLpn
+            this.mixinAloneLpnConfirm(
+              pickLpn,
+              {data: {key: pickLpn, lpn: pickLpn}}
+            )
+
+            if (pickSkuCode) {
+              this.sku.value = pickSkuCode
+              this.skuConfirm(
+                pickSkuCode,
+                {data: {key: pickSkuCode, skuCode: pickSkuCode}}
+              )
+            }
+
+            this.taskIndex = index
+
+            return
+          }
+        }
+
+        if (index > 0) {
+          this.lpn.value = pickLpn
+          this.mixinAloneLpnConfirm(
+            pickLpn,
+            {data: {key: pickLpn, lpn: pickLpn}}
+          )
+          this.taskIndex = index
+        }
+      }
     },
     // 绑定拣选容器号确认
-    containerConfirm() {
+    async containerConfirm() {
 
       if (!this.containerCheck()) return
 
       const container = this.container.confirm ? this.container.popup.value : this.container.value
-      projectWmsOutboundPickCheckContainer({
+      await projectWmsOutboundPickCheckContainer({
         ...this.apiCommonParam,
         pickNo: this.pickData.pickNo,
         pickContainer: container
-      }).then(() => {
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.atjhrrvp', '容器绑定成功')
-        )
-        this.container.popup.show = false
-        this.container.value = container
-        this.container.confirm = true
-
-        this.mixinAllInitGetFocus()
       })
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.atjhrrvp', '容器绑定成功')
+      )
+      this.container.popup.show = false
+      this.container.value = container
+      this.container.confirm = true
+
+      this.mixinAllInitGetFocus()
     },
     // 校验拣选容器号
     containerCheck() {
@@ -505,7 +538,11 @@ export default {
     // 获取数据
     getData() {
       return new Promise((resolve) => {
-        projectQueryStandardPickData(this.apiCommonParam).then(res => {
+        const {pickLpn, backPageInfo} = this.$route.query
+        projectQueryStandardPickData({
+          ...this.apiCommonParam,
+          lpn: backPageInfo ? pickLpn : ''
+        }).then(res => {
           this.mixinAloneFormatData(res)
 
           resolve()
@@ -756,7 +793,8 @@ export default {
         printDeviceId: printId,
         printTemplate: templateId,
         needPrintOldLpnLabel: this.printOldLabel.open,
-        ...data
+        ...data,
+        lpn: this.$route.query.pickLpn
       })
 
       // 打印原始标签

package/src/views/wms/page/outbound/pick/notAlone/selectPickTask.vue

@@ -0,0 +1,112 @@
+<!--
+  选择拣选任务
+  @author: 张文
+  @date: 2024-09-13
+-->
+<template>
+  <div>
+    <lw-nav-bar
+      :title="$lwLanguage.get('', '选择拣选任务')"
+      :click-left="pickTaskOver"
+    />
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box">
+        <lw-title-value-cell
+          :title="$lwLanguage.get('', '拣选托盘')"
+          :value="$route.query.lpn"
+          val-bold
+          :is-row="false"
+        />
+      </div>
+
+      <div
+        class="lw-global-model-box lw-global-click-style"
+        v-for="(i,k) in pickList"
+        :key="k"
+        :style="{animationDelay:k*50+'ms'}"
+        @click="pickTaskClick(i)"
+      >
+        <div class="lw-global-row-start lw-global-flex-between">
+          <div class="lw-global-value-bold">{{ i.pickNo }}</div>
+          <lw-tag>{{ i.sort }}</lw-tag>
+        </div>
+        <lw-label-value-group
+          class="lw-global-row-end"
+          :list="i.content"
+          :show-row-style="false"
+        />
+      </div>
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+
+import {projectDeliveryListLpnPickTask} from "../../../../api/outbound/pick/notAlone";
+
+export default {
+  name: "selectPickTask",
+  data() {
+    return {
+      pickList: []
+    }
+  },
+  mounted() {
+    this.getPickList()
+  },
+  methods: {
+    getPickList() {
+      projectDeliveryListLpnPickTask({
+        lpn: this.$route.query.lpn,
+        deliveryId: this.$route.query.deliveryId
+      }).then((res = []) => {
+        if (res.length === 0) {
+          this.pickTaskOver()
+          return
+        }
+
+        this.pickList = res
+      })
+    },
+
+    // 拣选任务点击
+    pickTaskClick(item) {
+
+      this.$router.replace({
+        path: '/outbound/pick/lwNotAloneAction',
+        query: {
+          pickId: item.pickId,
+          lwPickId: item.pickId,
+          deliveryId: this.$route.query.deliveryId,
+          pickLpn: this.$route.query.lpn,
+          backPageInfo: JSON.stringify({
+            path: '/outbound/pick/selectPickTask',
+            query: this.$route.query
+          })
+        }
+      })
+    },
+
+    // 拣选任务完成
+    pickTaskOver() {
+      const {backPageInfo, container} = this.$route.query
+      const back = JSON.parse(backPageInfo)
+      this.$router.replace({
+        path: back.path,
+        query: {
+          ...back.query,
+          container,
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/pickConsole/orderAction/index.vue

@@ -8,7 +8,15 @@
 
     <lw-nav-bar
       :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.rvozzvrp','出库订单拣选')"
-    />
+    >
+      <template #right>
+        <van-icon
+          name="replay"
+          size="16px"
+          @click="init"
+        />
+      </template>
+    </lw-nav-bar>
 
     <lw-page-body-module>
       <order-head-data
@@ -17,6 +25,27 @@
         @allocateSuccess="init"
       />
 
+      <!-- 拦截信息 -->
+      <div
+        v-if="orderData.hasBlock"
+        class="lw-global-flex-between lw-global-model-box"
+        style="background: #E9FF4F;margin-top: 10px"
+      >
+        <div class="lw-global-value-bold-red">
+          {{ $lwLanguage.get('', '存在商品需要拦截/冻结处理') }}
+        </div>
+
+        <lw-button
+          style="flex-shrink: 0"
+          type="last"
+          plain
+          small
+          @click="blockDispose"
+        >
+          {{ $lwLanguage.get('', '拦截处理') }}
+        </lw-button>
+      </div>
+
       <!-- 拣选tab页 -->
       <lw-tab-box style="margin-top: 10px">
         <van-tabs
@@ -315,61 +344,12 @@
                 </div>
 
                 <!-- 序列号拣选扫描结果显示 -->
-                <template v-if="snScanData.length">
-                  <div class="lw-global-model-top-radius lw-global-flex-between sn-data-head">
-
-                    <lw-title-value-cell
-                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.smefwuxh', '已扫序列号')"
-                      :value="snScanData.length"
-                      :title-style="{color:'#fff'}"
-                      val-color="#fff"
-                      :is-row="false"
-                      val-bold
-                      val-size="16px"
-                    />
-
-                    <lw-title-value-cell
-                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.wynmgtiy', '已扫数量')"
-                      :value="snScanData.reduce((t,n)=>t+Number(n.qty),0)"
-                      :title-style="{color:'#fff'}"
-                      val-color="#fff"
-                      :is-row="false"
-                      val-bold
-                      val-size="16px"
-                    />
-
-                  </div>
-                  <div class="lw-global-model-bottom-radius">
-
-                    <div
-                      v-for="(i,k) in snScanData"
-                      :key="k"
-                      :class="[
-                        'lw-global-flex-between',
-                        $lwUtils.getCellClass(k,snScanData.length)
-                      ]"
-                    >
-                      <div
-                        style="flex: 1;margin-right: 10px"
-                        class="lw-global-flex-between"
-                      >
-
-                        <div class="lw-global-value">{{ i.sn }}</div>
-                        <div class="lw-global-value-bold">{{ i.qty }}</div>
-
-                      </div>
-
-                      <van-icon
-                        style="flex-shrink: 0"
-                        name="delete-o"
-                        size="18px"
-                        color="#d50000"
-                        @click="delSn(i,k)"
-                      />
-                    </div>
+                <lw-scan-data-list-module
+                  v-if="snScanData.length"
+                  class="lw-global-model-box"
+                  v-model="snScanData"
+                />
 
-                  </div>
-                </template>
               </template>
               <lw-not-data v-else/>
 
@@ -683,6 +663,18 @@ export default {
     this.init()
   },
   methods: {
+    // 拦截处理
+    blockDispose() {
+
+      this.$router.push({
+        path: '/outbound/blockV2/action',
+        query: {
+          soId: this.orderData.soId
+        }
+      })
+
+    },
+
     // 全部统计数据组格式化
     getGroupData(item) {
       return [[
@@ -734,6 +726,7 @@ export default {
       await this.getOrderData()
       await this.getPickLocList()
       this.formatData()
+      this.cutEnd()
     },
 
     // tab切换
@@ -749,6 +742,7 @@ export default {
         this.orderData = await projectWmsOutboundPDASoLoadDataV2({
           soId: this.$route.query.lwOrderId
         })
+
       } catch {
         history.go(-1)
       }
@@ -1152,17 +1146,6 @@ export default {
       })
 
 
-    },
-    // 序列号删除
-    delSn(item, index) {
-      this.$lwDialog.confirm({
-        type: 'warning',
-        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.hbbogoqz', '提示'),
-        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.tzphjoco', '确认删除序列号：{sn}', {sn: item.sn})
-      }).then(() => {
-        this.snScanData.splice(index, 1)
-      }).catch(() => {
-      })
     },
     // 序列号数量校验
     checkQtyBySn(sn) {

package/src/views/wms/page/outbound/pickConsoleV2/action.vue

@@ -80,10 +80,24 @@
         >
           {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.tqvdcbpe', '发运') }}
         </lw-button>
+      </div>
+
+      <!-- 拦截信息 -->
+      <div
+        v-if="orderData.hasBlock"
+        class="lw-global-flex-between lw-global-model-box"
+        style="background: #E9FF4F;margin-top: 10px"
+      >
+        <div class="lw-global-value-bold-red">
+          {{ $lwLanguage.get('', '存在商品需要拦截/冻结处理') }}
+        </div>
+
         <lw-button
-          v-if="orderData.blockStatus !=='100'"
+          style="flex-shrink: 0"
+          type="last"
+          plain
           small
-          @click="onBlock"
+          @click="blockDispose"
         >
           {{ $lwLanguage.get('', '拦截处理') }}
         </lw-button>
@@ -482,61 +496,11 @@
                 </div>
 
                 <!-- 序列号拣选扫描结果显示 -->
-                <template v-if="snScanData.length">
-                  <div class="lw-global-model-top-radius lw-global-flex-between sn-data-head">
-
-                    <lw-title-value-cell
-                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.nlznaogt', '已扫序列号')"
-                      :value="snScanData.length"
-                      :title-style="{color:'#fff'}"
-                      val-color="#fff"
-                      :is-row="false"
-                      val-bold
-                      val-size="16px"
-                    />
-
-                    <lw-title-value-cell
-                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.ylvbfmqu', '已扫数量')"
-                      :value="snScanData.reduce((t,n)=>t+Number(n.qty),0)"
-                      :title-style="{color:'#fff'}"
-                      val-color="#fff"
-                      :is-row="false"
-                      val-bold
-                      val-size="16px"
-                    />
-
-                  </div>
-                  <div class="lw-global-model-bottom-radius">
-
-                    <div
-                      v-for="(i,k) in snScanData"
-                      :key="k"
-                      :class="[
-                        'lw-global-flex-between',
-                        $lwUtils.getCellClass(k,snScanData.length)
-                      ]"
-                    >
-                      <div
-                        style="flex: 1;margin-right: 10px"
-                        class="lw-global-flex-between"
-                      >
-
-                        <div class="lw-global-value">{{ i.sn }}</div>
-                        <div class="lw-global-value-bold">{{ i.qty }}</div>
-
-                      </div>
-
-                      <van-icon
-                        style="flex-shrink: 0"
-                        name="delete-o"
-                        size="18px"
-                        color="#d50000"
-                        @click="delSn(i,k)"
-                      />
-                    </div>
-
-                  </div>
-                </template>
+                <lw-scan-data-list-module
+                  v-if="snScanData.length"
+                  class="lw-global-model-box"
+                  v-model="snScanData"
+                />
               </template>
               <lw-not-data v-else/>
 
@@ -1084,6 +1048,17 @@ export default {
     this.checkSkuPrint()
   },
   methods: {
+    // 拦截处理
+    blockDispose() {
+
+      this.$router.push({
+        path: '/outbound/blockV2/action',
+        query: {
+          soId: this.orderData.soId,
+        }
+      })
+
+    },
     // 商品打印机校验
     checkSkuPrint(needCheck) {
 
@@ -1190,6 +1165,7 @@ export default {
 
       await this.getOrderData()
       await this.formatData()
+      this.cutEnd()
     },
 
     // tab切换
@@ -1255,16 +1231,6 @@ export default {
       }).catch(() => {
       })
     },
-    // 处理拦截
-    onBlock() {
-
-      if (this.orderData.blockStatus === '300') {
-        this.allBlock()
-      } else {
-        this.$refs.pickBackPopup.getBlockData()
-      }
-
-    },
 
     // 发放拣选任务
     releaseTask() {
@@ -1803,17 +1769,6 @@ export default {
       })
 
 
-    },
-    // 序列号删除
-    delSn(item, index) {
-      this.$lwDialog.confirm({
-        type: 'warning',
-        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.uxkbczjp', '提示'),
-        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.cexcdbcc', '确认删除序列号：{sn}', {sn: item.sn})
-      }).then(() => {
-        this.snScanData.splice(index, 1)
-      }).catch(() => {
-      })
     },
     // 序列号数量校验
     checkQtyBySn(sn) {