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

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

@@ -88,6 +88,27 @@
 
       </div>
 
+      <!-- 拦截信息 -->
+      <div
+        v-if="orderInfo.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>
+
       <lw-tab-box style="margin-top: 10px">
 
         <van-tabs
@@ -155,7 +176,7 @@
               <div
                 v-if="lpnScanType==='need'"
                 class="lw-global-row-start lw-global-value-bold"
-                style="text-align: center;"
+                style="text-align: center;margin-bottom: 5px"
                 :style="{color: lpn.data.status==='success' ?'#07c160' :'#D50000'}"
               >
                 {{ lpn.data.statusLabel }}
@@ -163,7 +184,7 @@
               <div
                 v-else
                 class="lw-global-row-start lw-global-value-bold"
-                style="text-align: center;color: #07c160"
+                style="text-align: center;color: #07c160;margin-bottom: 5px"
               >
                 {{
                   lpnScanType === 'delivery' ?
@@ -172,35 +193,41 @@
                 }}
               </div>
 
-              <lw-title-value-cell
-                :title="$lwLanguage.get('', '托盘号')"
-                :value="lpn.data.pickContainerNo"
-                val-bold
-              />
-
               <div
-                v-for="(i,k) in lpn.data.skuList"
+                class="lw-global-group-base-color"
+                v-for="(i,k) in lpn.data.lpnList"
                 :key="k"
-                :class="$lwUtils.getCellClass({
-                  index: k,
-                  length: lpn.data.skuList.length,
-                  only:'lw-global-row-end',
-                  start:'lw-global-row'
-                })"
               >
-                <lw-sku-info-module
-                  :sku-code="i.skuCode"
-                  :sku-name="i.skuName"
-                  :qty="i.qtyLabel"
-                  :qty-text="$lwLanguage.get('', '拣选量')"
-                />
                 <lw-title-value-cell
-                  v-for="(lot,lotK) in i.lotDisplayList"
-                  :key="'lot'+lotK"
-                  :title="lot.title"
-                  :value="lot.value"
-                  :is-row="false"
+                  :title="$lwLanguage.get('', '托盘号')"
+                  :value="i.pickContainerNo"
+                  val-bold
                 />
+
+                <div
+                  v-for="(sku,skuKey) in i.skuList"
+                  :key="'sku'+skuKey"
+                  :class="$lwUtils.getCellClass({
+                  index: skuKey,
+                  length: i.skuList.length,
+                  only:'lw-global-row-end',
+                  start:'lw-global-row'
+                })"
+                >
+                  <lw-sku-info-module
+                    :sku-code="sku.skuCode"
+                    :sku-name="sku.skuName"
+                    :qty="sku.qtyLabel"
+                    :qty-text="$lwLanguage.get('', '拣选量')"
+                  />
+                  <lw-title-value-cell
+                    v-for="(lot,lotK) in sku.lotDisplayList"
+                    :key="'lot'+lotK"
+                    :title="lot.title"
+                    :value="lot.value"
+                    :is-row="false"
+                  />
+                </div>
               </div>
             </div>
 
@@ -384,7 +411,7 @@ import {
   wmsProjectDeliveryHasNoPickCheck,
   projectDeliveryForceLoad,
   projectWmsOutboundPDADeliveryReportStock,
-  wmsProjectDeliveryForceCheck
+  wmsProjectDeliveryForceCheck, projectDeliveryAddLpns
 } from "../../../api/outbound/orderDeliveryShip";
 
 import pickBlockPopup from "./../components/pickBlockPopup.vue";
@@ -441,31 +468,67 @@ export default {
     this.init()
   },
   methods: {
-    init() {
+
+    // 拦截处理
+    blockDispose() {
+
+      this.$router.push({
+        path: '/outbound/blockV2/action',
+        query: {
+          deliveryId: this.orderInfo.deliveryId,
+          includeDeliveryPlan: 'true'
+        }
+      })
+
+    },
+    async init() {
+
+      // 检查是否有拣选容器号
+      const container = this.$route.query.container
+      if (container) {
+        const deliveryData = await projectDeliveryAddLpns({
+          deliveryId: this.$route.query.deliveryId,
+          lpnList: container.split(',')
+        })
+        const routeQuery = this.$route.query
+        delete routeQuery.container
+        this.$router.replace({
+          path: '/outbound/orderDeliveryShip/lwAction',
+          query: {
+            ...routeQuery,
+            _t: Date.now()
+          }
+        })
+        this.lpn.data = {
+          lpnList: deliveryData || []
+        }
+      }
+
       this.deliveryLpnList.datas = []
       this.deliveryLpnList.pageNum = 1
       this.skuList.datas = []
       this.skuList.pageNum = 1
-      wmsProjectDeliveryPickQueryDetail({
+      const res = await wmsProjectDeliveryPickQueryDetail({
         deliveryId: this.$route.query.deliveryId,
         action: 'load'
-      }).then(res => {
-        this.orderInfo = res || {}
+      })
 
-        // 检查链接状态
-        this.orderInfo.blockStatus === '300' ? this.allBlock() : this.$refs.pickBackPopup.getBlockData()
+      this.orderInfo = res || {}
 
+      // 检查链接状态
+      // this.orderInfo.blockStatus === '300' ? this.allBlock() : await this.$refs.pickBackPopup.getBlockData()
 
-        this.$nextTick(() => {
-          if (this.orderInfo.canCancelLoad) {
-            this.tabActive = 'delivery'
-            this.lpn.focus = true
-            return
-          }
-          this.tabActive = 'deliveryLpnList'
-          this.deliveryLpnListLpnSearch()
 
-        })
+      // tab选中
+      this.$nextTick(() => {
+        if (this.orderInfo.canCancelLoad) {
+          this.tabActive = 'delivery'
+          this.lpn.focus = true
+          return
+        }
+        this.tabActive = 'deliveryLpnList'
+        this.deliveryLpnListLpnSearch()
+
       })
     },
 
@@ -685,21 +748,67 @@ export default {
         lpn,
         deliveryId: this.$route.query.deliveryId
       }).then(res => {
-
         if (this.lpnScanType === 'need') {
           const lpnData = res?.result[0] || {}
           this.lpn.data = {
-            pickContainerNo: lpnData.pickContainerNo || '',
-            skuList: lpnData.skuList || [],
             status: res.status,
-            statusLabel: res.statusLabel
+            statusLabel: res.statusLabel,
+            lpnList: [{
+              pickContainerNo: lpnData.pickContainerNo || '',
+              skuList: lpnData.skuList || [],
+            }]
           }
+        } else if (this.lpnScanType === 'delivery') {
+          if (res.pickList?.length) {
+
+            this.$lwDialog.confirm({
+              type: 'warning',
+              title: this.$lwLanguage.get('', '拣货提示'),
+              message: this.$lwLanguage.get('', '当前运单扫描的托盘未拣货，是否拣货？'),
+              confirmButtonText: this.$lwLanguage.get('', '去拣货')
+            }).then(() => {
+
+              const backPageInfo = JSON.stringify({
+                path: '/outbound/orderDeliveryShip/lwAction',
+                query: this.$route.query
+              })
+
+              if (res.pickList.length > 1) {
+                this.$router.replace({
+                  path: '/outbound/pick/selectPickTask',
+                  query: {
+                    lpn,
+                    deliveryId: this.$route.query.deliveryId,
+                    backPageInfo
+                  }
+                })
+                return
+              }
+
+              const item = res.pickList[0]
+              this.$router.replace({
+                path: '/outbound/pick/lwNotAloneAction',
+                query: {
+                  pickId: item.pickId,
+                  lwPickId: item.pickId,
+                  deliveryId: this.$route.query.deliveryId,
+                  pickLpn: lpn,
+                  backPageInfo
+                }
+              })
+
+            }).catch(() => {
+            })
+            return
+          }
+
+          this.lpn.data = {lpnList: res.loadList || []}
         } else {
-          this.lpn.data = res[0] || {}
+          this.lpn.data = {lpnList: res || []}
         }
+
         this.deliveryLpnList.datas = []
         this.skuList.datas = []
-
         this.init()
       })
     },

package/src/views/wms/page/outbound/orderPickDelivery/taskList.vue

@@ -121,6 +121,27 @@
         {{ orderInfo.blockInfo }}
       </div>
 
+      <!-- 拦截信息 -->
+      <div
+        v-if="orderInfo.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>
+
       <lw-tab-box style="margin-top: 10px">
 
         <van-tabs
@@ -521,11 +542,24 @@ export default {
     }
   },
   mounted() {
+
     this.init()
     this.checkLpnPrint()
     this.checkSkuPrint()
   },
   methods: {
+    // 拦截处理
+    blockDispose() {
+
+      this.$router.push({
+        path: '/outbound/blockV2/action',
+        query: {
+          deliveryId: this.orderInfo.deliveryId,
+          includeDeliveryPlan: 'true'
+        }
+      })
+
+    },
     // 容器打印机校验
     checkLpnPrint(needCheck) {
 

package/src/views/wms/page/outbound/orderPickOutbound/content.vue

@@ -5,7 +5,17 @@
 -->
 <template>
   <div>
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickOutbound.content.vniqrcyl', '按单拣选出库')"/>
+    <lw-nav-bar
+      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickOutbound.content.vniqrcyl', '按单拣选出库')"
+    >
+      <template #right>
+        <van-icon
+          name="replay"
+          size="16px"
+          @click="init"
+        />
+      </template>
+    </lw-nav-bar>
 
     <lw-page-body-module>
 
@@ -15,6 +25,27 @@
         show-model-style
       />
 
+      <!-- 拦截信息 -->
+      <div
+        v-if="soData.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>
+
       <lw-tab-box style="margin-top: 10px">
 
         <van-tabs
@@ -185,6 +216,17 @@ export default {
     this.init()
   },
   methods: {
+    // 拦截处理
+    blockDispose() {
+
+      this.$router.push({
+        path: '/outbound/blockV2/action',
+        query: {
+          soId: this.soData.soId,
+        }
+      })
+
+    },
     async init() {
       try {
         await this.getSoDataSoData()

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

@@ -15,6 +15,11 @@
     :get-data="getData"
     @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 id="tab-top"></div>
     <lw-tab-box>
@@ -207,6 +212,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'
@@ -225,6 +231,7 @@ export default {
     skuLocationInfo,
     splitPutDown,
     waitPickCollapseItem,
+    pickPathSearch,
   },
   mixins: [all, aloneAndNotAlone],
   data() {
@@ -234,7 +241,12 @@ export default {
     this.getData()
   },
   methods: {
-
+    // 拣选任务行排序完成
+    pickTaskLineSorted(sortedList) {
+      if (this.pickData.pendingPickLineList) {
+        this.pickData.pendingPickLineList = sortedList
+      }
+    },
     // 获取数据
     getData() {
       projectQueryAlonePickData(this.apiCommonParam).then(res => {

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

@@ -16,7 +16,11 @@
     :get-data="getData"
     @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 id="tab-top"></div>
     <lw-tab-box>
@@ -194,6 +198,7 @@
 </template>
 
 <script>
+import pickPathSearch from '../components/pickPathSearch.vue'
 import dataLookAndChange from './../components/dataLookAndChange/index.vue'
 import {
   projectQueryPickByCaseData,
@@ -207,7 +212,8 @@ import {projectWmsPickTaskByTaskId} from "./../../../../api/outbound/pick";
 export default {
   name: "lwOutboundPickBoxActionPage",
   components: {
-    dataLookAndChange
+    dataLookAndChange,
+    pickPathSearch
   },
   mixins: [all],
   computed: {
@@ -230,6 +236,12 @@ export default {
     this.getData()
   },
   methods: {
+    // 拣选任务行排序完成
+    pickTaskLineSorted(sortedList) {
+      if (this.pickData.pendingPickLineList) {
+        this.pickData.pendingPickLineList = sortedList
+      }
+    },
     // 处理掉不能整托盘拣选的数据
     formatWholeLpn() {
       this.waitPick = this.pickData.pendingPickCaseList.filter(item => item.canWholePick)

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

@@ -6,14 +6,22 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="showTitle"/>
+    <lw-nav-bar
+      :title="showTitle"
+      :click-left="navBackFn"
+    />
 
     <!-- 页主体 -->
     <div class="lw-global-page-box">
 
       <!-- 头部数据看板 -->
       <task-info :item="pickData">
-        <div class="lw-global-row-end">
+        <template v-slot:task-header>
+          <slot name="task-header"></slot>
+        </template>
+
+        <template v-slot:default>
+          <div class="lw-global-row-end">
           <lw-tag
             v-if="pickData.allocationOrder"
             type="danger"
@@ -30,6 +38,7 @@
           >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.jzgvyidm','多件一票') }}</lw-tag>
         </div>
         <slot name="look-bottom"></slot>
+        </template>
       </task-info>
 
       <!-- 业务自定义 -->
@@ -374,15 +383,21 @@ export default {
     pickContainer: String,
 
     // 获取数据
-    getData:{
+    getData: {
       type: Function,
       required: true
     },
 
     // 是否显示底部操作按钮
-    showBottomBar:{
+    showBottomBar: {
       type: Boolean,
       default: true
+    },
+
+    // 返回按钮执行的方法
+    navBackFn: {
+      type: Function,
+      default: () => history.go(-1)
     }
   },
   computed: {