From 111828326db386c5e839d62699cb5a8129e6a08e Mon Sep 17 00:00:00 2001 From: mzr Date: Sun, 5 Oct 2025 18:03:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(so):=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=90=AF=E6=BA=90mes=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approve/AfterApprovingSynchronizeRuleQMS.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleQMS.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleQMS.java index 0f18fa0a..688dce5c 100644 --- a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleQMS.java +++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleQMS.java @@ -115,14 +115,19 @@ public class AfterApprovingSynchronizeRuleQMS implements IRule { itemObj.put("wlbh", mrlmap.get("code")); itemObj.put("wlmc", mrlmap.get("name")); - itemObj.put("wlxhgg", ((String) mrlmap.get("materialspec") != null ? mrlmap.get("materialspec").toString() : "") + ((String) mrlmap.get("materialtype") != null ? mrlmap.get("materialtype").toString() : "")); + String wlxhgg = (mrlmap.get("materialspec") != null ? mrlmap.get("materialspec").toString() : "") + (mrlmap.get("materialtype") != null ? mrlmap.get("materialtype").toString() : ""); + itemObj.put("wlxhgg", wlxhgg); itemObj.put("dhsl", item.getNastnum().doubleValue()); itemObj.put("xsj", item.getNqtorigtaxprice().doubleValue()); itemObj.put("bxzje", item.getNqtorigtaxprice().doubleValue()); - itemObj.put("jhrq", item.getDsenddate().toString().substring(0, 10)); + if (item.getDsenddate() != null) { + itemObj.put("jhrq", item.getDsenddate().toString().substring(0, 10)); + } else { + itemObj.put("jhrq", ""); + } itemObj.put("bz", item.getVrownote()); - Object pk_project = hybo.findColValue("bd_project", "project_name", " pk_project = '" + item.getCprojectid() + "' "); - itemObj.put("xmmc", pk_project); + Object project_name = hybo.findColValue("bd_project", "project_name", " project_name = '" + item.getCprojectid() + "' "); + itemObj.put("xmmc", project_name); contentArray.add(itemObj); }