From eb5ea0bba7a98218e57fe18151e1739190f5c69d Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Tue, 10 Mar 2026 09:58:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E8=A7=A3=E5=86=B3=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=B5=81=E7=A8=8B=E5=8F=98=E9=87=8F=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一使用同一个变量Map，避免variables为空时多次getVariables()产生临时Map导致变量丢失 - 移除到货确认节点抄送人员非空验证，解决流程启动时的异常问题 - 保留tManagerId变量设置逻辑，确保流程中抄送功能正常工作 --- .../wms/service/impl/WmsShippingBillServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java index f2de0b7d..d35d4406 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java @@ -310,18 +310,18 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService { } else { this.updateByBo(bo); } - // Why：统一使用同一个变量Map，避免 variables 为空时多次 getVariables() 产生临时Map导致变量丢失 + // 统一使用同一个变量Map，避免 variables 为空时多次 getVariables() 产生临时Map导致变量丢失 Map variables = bo.getVariables(); // 流程变量：shippingType 用于互斥网关分支条件，applicantId 兼容已有流程变量使用 variables.put("shippingType", StringUtils.defaultIfBlank(shippingType, "1")); variables.put("shippingCode", bo.getShippingCode()); variables.put("applicantId", String.valueOf(LoginHelper.getUserId())); - // Why：到货确认节点配置了 ${tManagerId} 抄送表达式，发起流程时必须保证变量有效 + // 到货确认节点配置了 ${tManagerId} 抄送表达式，发起流程时必须保证变量有效 if (needConfirm) { String tManagerId = StringUtils.trim(Convert.toStr(variables.get("tManagerId"))); - if (StringUtils.isBlank(tManagerId) || "null".equalsIgnoreCase(tManagerId)) { - throw new ServiceException("到货确认节点抄送人员不能为空"); - } +// if (StringUtils.isBlank(tManagerId) || "null".equalsIgnoreCase(tManagerId)) { +// throw new ServiceException("到货确认节点抄送人员不能为空"); +// } variables.put("tManagerId", tManagerId); } // 后端发起需要忽略权限