From abef199c485e3d118014b980bd7d05dcee5966a8 Mon Sep 17 00:00:00 2001 From: "tanfengling@x-ri.com" <123456> Date: Tue, 28 Oct 2025 17:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B3=9B=E5=BE=AE=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=8E=A5=E5=8F=A3=E3=80=91=E5=A2=9E=E5=8A=A0=E6=B3=9B?= =?UTF-8?q?=E5=BE=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FWBillStateUpdController.java | 3 +++ lc123/cloud/app/plugin/trd/FWImpl.java | 20 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lc123/cloud/app/api/controller/FWBillStateUpdController.java b/lc123/cloud/app/api/controller/FWBillStateUpdController.java index f85093d..17fbd9a 100644 --- a/lc123/cloud/app/api/controller/FWBillStateUpdController.java +++ b/lc123/cloud/app/api/controller/FWBillStateUpdController.java @@ -73,7 +73,10 @@ public class FWBillStateUpdController { DynamicObject bill = BusinessDataServiceHelper.loadSingle(billArr[0].getPkValue(), enetityNumber); if(state == 0){ bill.set("tqq9_issuccess", true); + bill.set("tqq9_fwstate", "C"); approveLog.set("tqq9_issuccess", true); + }else{ + bill.set("tqq9_fwstate", "D"); } SaveServiceHelper.save(new DynamicObject[]{bill}); diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java index 0cbc61b..f1351ca 100644 --- a/lc123/cloud/app/plugin/trd/FWImpl.java +++ b/lc123/cloud/app/plugin/trd/FWImpl.java @@ -2202,8 +2202,8 @@ public class FWImpl { String dhlxrdh = null; DynamicObject providerlinkman = bill.getDynamicObject("providerlinkman"); if(providerlinkman != null){ - providerlinkman = BusinessDataServiceHelper.loadSingle(providerlinkman.getPkValue(), providerlinkman.getDynamicObjectType().getName()); - dhlxr = providerlinkman.getString("name"); + providerlinkman = BusinessDataServiceHelper.loadSingle(providerlinkman.getPkValue(), providerlinkman.getDynamicObjectType().getName(), "contactperson,id,phone,mobile"); + dhlxr = providerlinkman.getString("contactperson"); dhlxrdh = providerlinkman.getString("phone"); } String dhlxdz = bill.getString("provideraddress"); @@ -4609,7 +4609,6 @@ public class FWImpl { */ public static String pushFwMaterial(DynamicObject bill){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid"); DynamicObject creator = bill.getDynamicObject("creator"); creator = BusinessDataServiceHelper.loadSingle(creator.getPkValue(), "bos_user", "tqq9_fwuserid,id,number"); String sqr = creator.getString("tqq9_fwuserid"); @@ -4887,7 +4886,6 @@ public class FWImpl { gd = height.toString(); } - //单头赋值 JSONObject m1 = new JSONObject(); m1.put("fieldName", "KDBillType"); @@ -5031,13 +5029,23 @@ public class FWImpl { m51.put("fieldName", "gd"); m51.put("fieldValue", gd); + //区分新建审核与修改审批 + String requestName = "新增物料流程"; + String wfID = ConfigUtils.getThirdConfigByNumber("FW_WFID_XZWL"); + String requestid = bill.getString("tqq9_fwrequestid"); + boolean tqq9_issuccess = bill.getBoolean("tqq9_issuccess"); + if(tqq9_issuccess){ + requestName = "变更物料流程"; + wfID = ConfigUtils.getThirdConfigByNumber("FW_WFID_WLBG"); + requestid = bill.getString("tqq9_fwupdid"); + } + List mlist = Arrays.asList(m1,m2,m3,m4,m5,m6,m7,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18,m19,m21, m22,m23,m24,m25,m26,m27,m28,m29,m31,m32,m33,m34,m35,m36,m37,m38,m39,m41,m42,m43,m44,m45,m46,m47,m48,m49,m51); JSONArray mainArr = new JSONArray(); mainArr.addAll(mlist); - String fw_wfid_xzcgdd = ConfigUtils.getThirdConfigByNumber("FW_WFID_XZWL"); FWRestfulUtils fwRestfulUtils = new FWRestfulUtils(); //如果单据上纯在泛微流程id，重新提交调用泛微提交接口，如果没有泛微流程id，就调用新增接口 - return fwRestfulUtils.doBillAction(mainArr, null, "物料新增流程", fw_wfid_xzcgdd, lcbh, tqq9_fwrequestid); + return fwRestfulUtils.doBillAction(mainArr, null, requestName, wfID, lcbh, requestid); } }