From 6aa16c719a9a3a0db7fda0cf9436173c271b4498 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 22 Sep 2025 18:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8E=A8=E5=90=AF=E6=BA=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncQMSRule.java | 3 ++- .../nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncQMSRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncQMSRule.java index a2729063..9e0581bb 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncQMSRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncQMSRule.java @@ -89,7 +89,8 @@ public class AfterApproveSyncQMSRule implements IRule { itemObj.put("htqdxh", item.getVfirstrowno()); itemObj.put("wlbh", mrlmap.get("code")); itemObj.put("wlmc", mrlmap.get("name")); - itemObj.put("wlxhgg", mrlmap.get("materialspec") + (String) mrlmap.get("materialtype")); + String wlxhgg = MyHelper.skipNull(mrlmap.get("materialspec")) + MyHelper.skipNull(mrlmap.get("materialtype")); + itemObj.put("wlxhgg", wlxhgg); itemObj.put("jhsl", item.getNastnum().toString()); UFDateTime tplanendtime = item.getTplanendtime(); String tplanendtimeStr = ""; diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java index 1376b83e..b1e300d3 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java @@ -161,8 +161,8 @@ public class AfterPmoSyncJmQMSRule implements IRule { logger.error("QMS-PMO-JM-res = " + result); if (!"true".equals(resultObj.getString("success"))) { - // throw new BusinessException("QMS-PMO-JM-error:" + resultObj.getString("msg")); logger.error("QMS-PMO-JM-error,result[" + resultObj.toJSONString() + "]"); + throw new BusinessException("QMS-PMO-JM-error:" + resultObj.getString("msg")); } }