diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java index e86d7b3..8c58618 100644 --- a/lc123/cloud/app/plugin/trd/FWImpl.java +++ b/lc123/cloud/app/plugin/trd/FWImpl.java @@ -1930,7 +1930,8 @@ public class FWImpl { String fyxm = null; DynamicObject e_expenseitem = entry.getDynamicObject("e_expenseitem"); if (e_expenseitem != null) { - e_expenseitem = BusinessDataServiceHelper.loadSingle(e_expenseitem.getPkValue(), "er_expenseitemedit", "id,name,number"); + e_expenseitem = BusinessDataServiceHelper.loadSingle(e_expenseitem.getPkValue(), + "er_expenseitemedit", "id,name,number"); fyxm = e_expenseitem.getString("name"); } BigDecimal bcsjzfje_e = entry.getBigDecimal("e_applyamount"); @@ -2110,7 +2111,8 @@ public class FWImpl { m17, m18, m19, m20, m21, m22, m23, m24, m25, m26, m27, m28, m29, m30)); // 附件 List fjList = new ArrayList<>(); - List> attachments = AttachmentServiceHelper.getAttachments("ap_payapply", bill.getPkValue(), "attachmentpanel"); + List> attachments = AttachmentServiceHelper.getAttachments("ap_payapply", + bill.getPkValue(), "attachmentpanel"); for (Map attachment : attachments) { String filePath = (String) attachment.get("url"); String fileName = (String) attachment.get("name"); @@ -2871,7 +2873,8 @@ public class FWImpl { String dhlxrdh = null; DynamicObject providerlinkman = bill.getDynamicObject("providerlinkman"); if (providerlinkman != null) { - providerlinkman = BusinessDataServiceHelper.loadSingle(providerlinkman.getPkValue(), providerlinkman.getDynamicObjectType().getName(), "contactperson,id,phone,mobile"); + providerlinkman = BusinessDataServiceHelper.loadSingle(providerlinkman.getPkValue(), + providerlinkman.getDynamicObjectType().getName(), "contactperson,id,phone,mobile"); dhlxr = providerlinkman.getString("contactperson"); dhlxrdh = providerlinkman.getString("phone"); } @@ -4964,6 +4967,24 @@ public class FWImpl { } else if ("F".equals(tqq9_combofield31)) { qylx = "5"; } + String gysqyzzbg = ""; + String tqq9_gysqyzzbg = bill.getString("tqq9_gysqyzzbg"); + if(StringUtils.isNotBlank(tqq9_gysqyzzbg)){ + if (StringUtils.isNotBlank(tqq9_gysqyzzbg)) { + if (tqq9_gysqyzzbg.contains("A")) { + gysqyzzbg = gysqyzzbg + "," + "0"; + } + if (tqq9_gysqyzzbg.contains("B")) { + gysqyzzbg = gysqyzzbg + "," + "1"; + } + if (tqq9_gysqyzzbg.contains("C")) { + gysqyzzbg = gysqyzzbg + "," + "2"; + } + if (StringUtils.isNotBlank(gysqyzzbg)) { + gysqyzzbg = gysqyzzbg.substring(1); + } + } + } //联系人明细 JSONObject detail1 = new JSONObject(); @@ -5334,14 +5355,15 @@ public class FWImpl { m105.put("fieldName", "qylx"); m105.put("fieldValue", qylx); - List mlist = new ArrayList<>(Arrays.asList(m1, m2, m3, m4, m5, m7, m8, m9, m10, m11, m12, m13, m14, m15, m16, - m17, m18, m19, m20, m21, m22, m23, m24, m25, m27, m29, m30, m40, m41, m42, m43, m44, m45, m46, m47, m48, m49, m50, m51, m52, - m53, m54, m55, m56, m57, m58, m59, m60, m61, m62, m63, m64, m65, m66, m67, m68, m69, m70, m71, m72, m73, m74, m75, m76, m77, - m78, m79, m80, m81, m82, m83, m84, m85, m89, m90, + List mlist = new ArrayList<>(Arrays.asList(m1, m2, m3, m4, m5, m7, m8, m9, m10, m11, m12, m13, m14, + m15, m16, m17, m18, m19, m20, m21, m22, m23, m24, m25, m27, m29, m30, m40, m41, m42, m43, m44, m45, m46, + m47, m48, m49, m50, m51, m52, m53, m54, m55, m56, m57, m58, m59, m60, m61, m62, m63, m64, m65, m66, m67, + m68, m69, m70, m71, m72, m73, m74, m75, m76, m77, m78, m79, m80, m81, m82, m83, m84, m85, m89, m90, m91, m92, m93, m94, m95, m96, m97, m98, m99, m100, m101, m102, m103, m104, m105)); // 附件 List fjList = new ArrayList<>(); - List> attachments = AttachmentServiceHelper.getAttachments("bd_supplier", bill.getPkValue(), "tqq9_attachmentpanelap"); + List> attachments = AttachmentServiceHelper.getAttachments("bd_supplier", bill.getPkValue(), + "tqq9_attachmentpanelap"); for (Map attachment : attachments) { String filePath = (String) attachment.get("url"); String fileName = (String) attachment.get("name"); @@ -5359,8 +5381,6 @@ public class FWImpl { fjObj.put("fieldValue", fjList); mlist.add(fjObj); } - JSONArray mainArr = new JSONArray(); - mainArr.addAll(mlist); //区分新建审核与修改审批 String requestName = "新增供应商流程"; @@ -5375,7 +5395,17 @@ public class FWImpl { tableName_2 = "formtable_main_105_dt2"; wfID = ConfigUtils.getThirdConfigByNumber("FW_WFID_GYSBG"); requestid = bill.getString("tqq9_fwupdid"); + + //修改供应商时,有可能修改供应商区域资质字段 + if(StringUtils.isNotBlank(gysqyzzbg)){ + JSONObject m186 = new JSONObject(); + m186.put("fieldName", "gysqyzzbg"); + m186.put("fieldValue", gysqyzzbg); + mlist.add(m186); + } } + JSONArray mainArr = new JSONArray(); + mainArr.addAll(mlist); // 组装明细数据 detail1.put("tableDBName", tableName_1);