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")); } }