@logwire/logwire-wms-pda-ui 3.5.5-wat.1 → 3.5.5-wat.2

package/src/utils/Axios.js

@@ -87,6 +87,41 @@ lwAxios.updateToken = token => {
 // 是否有用户Token
 lwAxios.hasToken = () => !!lwAxios.defaults.headers.common['token']
 
+// 只能串行的请求
+const serialRequestPaths = new Set()
+export const setSerialRequestPaths = (paths) => {
+  serialRequestPaths.clear()
+  paths.forEach(it => serialRequestPaths.add(it))
+}
+// 存储正在进行的请求
+const pendingRequests = new Set()
+// 生成请求唯一标识（fingerprint）
+const getRequestKey = (config) => {
+  const { url, data } = config
+  const body = typeof data === 'object' ? JSON.stringify(data) : data
+  return `${url}|${body}`
+}
+// 添加请求到缓存中
+const putPendingRequest = (config) => {
+  if (!serialRequestPaths.has(config.url)) return true; // 只处理配置的请求
+
+  const requestKey = getRequestKey(config)
+  if (pendingRequests.has(requestKey)) {
+    config.cancelToken = new axios.CancelToken(cancel => {
+      cancel(`重复请求，执行取消`)
+    })
+    return false
+  }
+  pendingRequests.add(requestKey)
+  return true
+}
+// 移除请求
+const removePendingRequest = (config) => {
+  if (!config || !serialRequestPaths.has(config.url)) return; // 只处理配置的请求
+
+  const requestKey = getRequestKey(config)
+  pendingRequests.delete(requestKey)
+}
 
 /**
  * 调用平台接口的方法
@@ -111,10 +146,15 @@ lwAxios.action = ({url, data, config, method = 'post'}) => {
   })
 }
 
+export const actionRequest = (action) => (data = null) => lwAxios.action({ url: action, data })
 
 // 请求拦截
 lwAxios.interceptors.request.use(
   config => {
+    if (!putPendingRequest(config)) {
+      return config
+    }
+
     let csrf = /XSRF-TOKEN=([\w-]+)/.test(document.cookie) && RegExp.$1
     if (csrf) {
       config.headers['X-XSRF-TOKEN'] = csrf
@@ -131,6 +171,7 @@ lwAxios.interceptors.request.use(
     return config
   },
   error => {
+    removePendingRequest(error?.config)
     lwLoading.close()
     console.error('请求异常: ', error)
     return Promise.reject(error)
@@ -157,9 +198,19 @@ lwAxios.interceptors.response.use(
       return response.config['map'](result.data)
     }
 
+    removePendingRequest(response.config)
+
     return result.data
   },
   error => {
+    removePendingRequest(error?.config)
+    if (axios.isCancel(error)) {
+      lwToast.toast({
+        message: '重复请求',
+        duration: 500,
+      })
+      return Promise.reject()
+    }
 
     lwLoading.close()
     console.error('接口返回异常: ', error)

package/src/views/wms/api/outbound/orderPickDelivery.js

@@ -6,6 +6,14 @@
 import lwAxios from '../../../../utils/Axios'
 
 
+// 获取拣选规则列表
+export function listRulePickOrders(data) {
+  return lwAxios.action({
+    url: 'listRulePickOrders',
+    data
+  })
+}
+
 // 获取运单列表
 export function wmsProjectDeliveryPickQueryPage(data) {
   return lwAxios.action({

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

@@ -770,71 +770,93 @@ export default {
         lpn,
         deliveryId: this.$route.query.deliveryId
       }).then(res => {
-        if (this.lpnScanType === 'need') {
-          const lpnData = res?.result[0] || {}
-          this.lpn.data = {
-            status: res.status,
-            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.break) {
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('', '提示'),
+            message: res.message,
+          }).then(() => {
+            api({
+              lpn,
+              deliveryId: this.$route.query.deliveryId,
+              force: true,
+            }).then(d => this.deliveryLpnConfirmApiBack(lpn, d))
+          }).catch(() => {})
+        } else {
+          this.deliveryLpnConfirmApiBack(lpn, res)
+        }
+      })
+    },
 
-              if (res.pickList.length > 1) {
-                this.$router.replace({
-                  path: '/outbound/pick/selectPickTask',
-                  query: {
-                    lpn,
-                    deliveryId: this.$route.query.deliveryId,
-                    backPageInfo
-                  }
-                })
-                return
-              }
+    deliveryLpnConfirmApiBack(lpn, res) {
+      if (Array.isArray(res.extra?.messages)) {
+        this.$lwDialog.alert({
+          title: this.$lwLanguage.get('', '提示'),
+          message: res.extra.messages.join('\n'),
+        })
+      }
+      if (this.lpnScanType === 'need') {
+        const lpnData = res?.result[0] || {}
+        this.lpn.data = {
+          status: res.status,
+          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
+            })
 
-              const item = res.pickList[0]
+            if (res.pickList.length > 1) {
               this.$router.replace({
-                path: '/outbound/pick/lwNotAloneAction',
+                path: '/outbound/pick/selectPickTask',
                 query: {
-                  pickId: item.pickId,
-                  lwPickId: item.pickId,
+                  lpn,
                   deliveryId: this.$route.query.deliveryId,
-                  pickLpn: lpn,
                   backPageInfo
                 }
               })
+              return
+            }
 
-            }).catch(() => {
+            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
+              }
             })
-            return
-          }
 
-          this.lpn.data = {lpnList: res.loadList || []}
-        } else {
-          this.lpn.data = {lpnList: res || []}
+          }).catch(() => {
+          })
+          return
         }
 
-        this.deliveryLpnList.datas = []
-        this.skuList.datas = []
-        this.init()
-      })
-    },
+        this.lpn.data = {lpnList: res.loadList || []}
+      } else {
+        this.lpn.data = {lpnList: res || []}
+      }
 
+      this.deliveryLpnList.datas = []
+      this.skuList.datas = []
+      this.init()
+    },
 
     // 已装载托盘 - 搜索
     deliveryLpnListLpnSearch() {

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

@@ -61,7 +61,7 @@
             v-if="orderInfo.canReleasePickTask"
             small
             type="last"
-            @click="grantClick"
+            @click="showReleasePickTask"
           >
             {{
               $lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.rygjpcgp', '发放拣选任务')
@@ -349,6 +349,24 @@
 
     </lw-page-body-module>
 
+    <lw-popup
+      :title="$lwLanguage.get('', '发放拣选任务')"
+      v-model="pickRelease.show">
+      <div class="lw-global-model-box">
+        <div style="padding: 10px 0 20px;">{{ $lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.pzvtksek', '确认发放拣选任务？') }}</div>
+        <lw-cell-popup-radio
+          v-model="pickRelease.value.id"
+          :title="$lwLanguage.get('', '拣选单规则')"
+          :columns="pickRelease.rulePickOrders"
+          value-key="id"
+          label-key="label"
+        />
+      </div>
+      <template #button>
+        <lw-button @click="doReleasePickTask">{{ $lwLanguage.get('','确定') }}</lw-button>
+      </template>
+    </lw-popup>
+
     <!-- 拦截弹框 -->
     <pick-block-popup
       ref="pickBackPopup"
@@ -441,8 +459,8 @@ import {
   projectWmsOutboundPDADeliveryListNotAllocate,
   projectWmsOutboundPDADeliveryReportStock,
   wmsProjectDeliveryForceCheck,
-  projectWmsOutboundPickPrint
-} from "../../../api/outbound/orderPickDelivery";
+  projectWmsOutboundPickPrint, listRulePickOrders
+} from '../../../api/outbound/orderPickDelivery'
 import {taskMixin} from "../../../../common/mixin/taskMixin";
 import pickBlockPopup from "./../components/pickBlockPopup.vue";
 import pickDeliveryPopup from "./../components/pickDeliveryPopup.vue";
@@ -517,6 +535,18 @@ export default {
         msgLV: [],
       },
 
+      // 发放拣选任务弹框
+      pickRelease: {
+        show: false,
+        rulePickOrders: [],
+        value: {
+          id: null,
+          code: '',
+          name: '',
+          label: '',
+        },
+      },
+
       // 托盘标签的打印机数据
       printLpnData: {},
       // 商品标签的打印机数据
@@ -568,6 +598,11 @@ export default {
       this.lpnList.datas = []
       this.lpnList.pageNum = 1
 
+      listRulePickOrders().then(res => {
+        res.forEach(item => item.label = item.code + '-' + item.name)
+        this.pickRelease.rulePickOrders = res
+      })
+
       await this.getDeliveryData()
 
       if (this.showTaskTab) {
@@ -729,23 +764,22 @@ export default {
         }
       })
     },
-    // 发放拣选任务点击
-    grantClick() {
-      this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.ekzgwsby', '提示'),
-        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.pzvtksek', '确认发放拣选任务？'),
-      }).then(() => {
-        wmsProjectDeliveryPickReleaseTask({
-          deliveryId: this.$route.query.deliveryId
-        }).then(res => {
-          if(res){
-            this.$lwToast.toast(res.msg)
-            if(res.releaseTaskCount){
-              this.init()
-            }
-          }
-        })
-      }).catch(() => {
+    // 弹出发放拣选任务
+    showReleasePickTask() {
+      this.pickRelease.value = { id: null, label: '' }
+      this.pickRelease.show = true;
+    },
+    // 发放拣选任务
+    doReleasePickTask() {
+      wmsProjectDeliveryPickReleaseTask({
+        deliveryId: this.$route.query.deliveryId,
+        pickOrderRuleId: this.pickRelease.value.id,
+      }).then(res => {
+        this.pickRelease.show = false
+        this.$lwToast.toast(res.msg)
+        if(res.releaseTaskCount){
+          this.init()
+        }
       })
     },
     // 跳转到任务详情