From b2fed22caa98fededf3ed1f03793bee17aafa590 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 29 Aug 2026 23:25:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=89=AB=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=85=88=E5=A4=96=E9=83=A8WMS=EF=BC=8C?= =?UTF-8?q?=E5=85=9C=E5=BA=95=E8=80=81=E7=B3=BB=E7=BB=9F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - scan 查单顺序改为:优先 newWms.queryOrder,未命中再兜底老系统 getOrderInfo - 外部WMS命中走 _packWmsOrder 回传,老系统命中走 _packOrder 本地打包 - 更新日志文案以区分订单来源 --- app/service/gzt.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/service/gzt.js b/app/service/gzt.js index 5aaad43..f60c14c 100644 --- a/app/service/gzt.js +++ b/app/service/gzt.js @@ -193,21 +193,22 @@ class Gzt extends Service { } } else { ctx.logger.info(`[scan] 非包材,查询订单 | barcode=${barcode} | WAREHOUSEID=${gzt.WAREHOUSEID}`); - // 尝试本地订单 → 外部WMS → 无记录 - let order = await this.getOrderInfo(barcode.replace(/-1-1-/g, ''), gzt.WAREHOUSEID); + // 优先查询外部WMS → 兜底老系统方法 → 无记录 + let order = null; let isWmsOrder = false; - if (!order) { - ctx.logger.info(`[scan] 本地订单未找到,查询外部WMS | barcode=${barcode}`); - const wmsResult = await this.ctx.service.newWms.queryOrder(barcode, gzt.WAREHOUSEID); - if (wmsResult && wmsResult.success) { - ctx.logger.info(`[scan] 外部WMS订单命中 | barcode=${barcode}`); - order = wmsResult.data; - isWmsOrder = true; - } else { - ctx.logger.info(`[scan] 外部WMS也未找到 | barcode=${barcode}`); - } + const wmsResult = await this.ctx.service.newWms.queryOrder(barcode, gzt.WAREHOUSEID); + if (wmsResult && wmsResult.success) { + ctx.logger.info(`[scan] 外部WMS订单命中 | barcode=${barcode}`); + order = wmsResult.data; + isWmsOrder = true; } else { - ctx.logger.info(`[scan] 本地订单命中 | barcode=${barcode} | PLSENDFLAG=${order.PLSENDFLAG}`); + ctx.logger.info(`[scan] 外部WMS未命中,查询老系统 | barcode=${barcode}`); + order = await this.getOrderInfo(barcode.replace(/-1-1-/g, ''), gzt.WAREHOUSEID); + if (order) { + ctx.logger.info(`[scan] 老系统订单命中 | barcode=${barcode} | PLSENDFLAG=${order.PLSENDFLAG}`); + } else { + ctx.logger.info(`[scan] 老系统也未找到 | barcode=${barcode}`); + } } if (order) {