diff --git a/env.js b/env.js index c33f58a..b87b72a 100644 --- a/env.js +++ b/env.js @@ -1,4 +1,4 @@ -// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 -export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 +export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 +// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 export const API_URL = `${BASE_URL}/system` //后台接口域名 export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue index e5497ed..8da2b1d 100644 --- a/pages/work/order/order-review.vue +++ b/pages/work/order/order-review.vue @@ -503,6 +503,9 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; autoSelectFirst: false, scanKeyword: '', dprefixedBarcodeVerified: false, + // D前缀波次单品单件自动复核防重入标志:同一订单的 allScanned 只处理第一次, + // 避免 finishDprefixedAutoReview 显式调用与 goodsList watcher 的 allScanned 重复触发导致重复打印面单 + dprefixedAllScannedHandled: false, packageBindingCancelled: false, skipPackagePopupOnAllScanned: false, showDetailView: false, @@ -2679,6 +2682,9 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; }, // 标记所有商品为已扫并触发复核发货 finishDprefixedAutoReview() { + if (!this.detailGoodsList.length) return; + // 已在自动复核发货流程中(handleDetailAllScanned 已处理),忽略重复进入,避免重复打印面单 + if (this.dprefixedAllScannedHandled) return; this.detailGoodsList = this.detailGoodsList.map(g => ({ ...g, scannedQty: g.planQty @@ -2691,6 +2697,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; this.showDetailView = false; this.detailGoodsList = []; this.dprefixedBarcodeVerified = false; + this.dprefixedAllScannedHandled = false; // 从详情返回后刷新列表 // D波次:keyword 是商品条码,scanOrder 不支持,依赖本地已更新的 orderList if (this.keyword && !this.isDprefixedWave) { @@ -2861,6 +2868,13 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; if (this.packageBindingCancelled) { return; } + // D前缀波次单品单件自动复核防重入: + // finishDprefixedAutoReview 的 $nextTick 显式调用与 ReviewDetail goodsList watcher 的 + // allScanned 会对同一订单重复触发,导致同一面单重复打印。仅处理第一次,重复触发直接忽略。 + if (this.isDprefixedWave && this.dprefixedAllScannedHandled) { + return; + } + this.dprefixedAllScannedHandled = true; // 散单模式不走包材流程 if (this.listType !== 'single' && this.enablePackageBinding) { this.packageInputCode = '';