diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java index 4ddde3c..b7deb21 100644 --- a/lc123/cloud/app/plugin/trd/FWImpl.java +++ b/lc123/cloud/app/plugin/trd/FWImpl.java @@ -39,6 +39,7 @@ public class FWImpl { String enable = dataEntity.getString("enable");//使用状态:可用-1,禁用-0 DynamicObject creator = dataEntity.getDynamicObject("creator");//创建人 DynamicObject tqq9_dept = dataEntity.getDynamicObject("tqq9_dept");//部门 + DynamicObject createorg = dataEntity.getDynamicObject("createorg"); String bmbm = ""; String fwuserid = null; String deptNumber = null; @@ -57,7 +58,7 @@ public class FWImpl { String cjsj = sdf.format(ceatetime); JSONObject mainTable = new JSONObject(); - mainTable.put("ckbm", number+"<>"+deptNumber); + mainTable.put("ckbm", number+"<>"+createorg.getString("number")); mainTable.put("ckmc", name);//仓库编码上凭借部门编码推送泛微 mainTable.put("cjsj", cjsj); mainTable.put("zt", Integer.valueOf(enable)); @@ -914,7 +915,7 @@ public class FWImpl { recordsArr1.add(recordObj); DynamicObject warehouse = billentry.getDynamicObject("warehouse"); - shck = warehouse.getString("number")+"<>"+deptNumber;//shck + shck = warehouse.getString("number")+"<>"+org.getString("number");//shck } detail1.put("tableDBName", "formtable_main_97_dt1"); detail1.put("workflowRequestTableRecords", recordsArr1); @@ -1699,21 +1700,9 @@ public class FWImpl { JSONObject m26 = new JSONObject(); m26.put("fieldName", "ckck"); m26.put("fieldValue", ckck); - JSONObject m30 = new JSONObject(); - DynamicObject tqq9_sscg = bill.getDynamicObject("tqq9_sscg"); - String szcg = null; - if(tqq9_sscg != null){ - tqq9_sscg = BusinessDataServiceHelper.loadSingle(tqq9_sscg.getPkValue(), "bd_operator"); - DynamicObject user = tqq9_sscg.getDynamicObject("operatorid"); - if(user != null){ - szcg = FWUtils.getFwUserIdByKdUserNumber(user.getString("number"), deptNumber); - } - } - m30.put("fieldName", "szcg"); - m30.put("fieldValue", szcg); List mlist = new ArrayList<>(Arrays.asList(m1,m2,m3,m4, - m5,m6,m7,m8,m9,m12,m13,m14,m15,m16,m17,m18,m19,m20,m21,m22,m23,m24,m25,m26,m30)); + m5,m6,m7,m8,m9,m12,m13,m14,m15,m16,m17,m18,m19,m20,m21,m22,m23,m24,m25,m26)); if (ywlxck == 2){ int dblx = 0; String tqq9_dblx = bill.getString("tqq9_dblx"); @@ -2371,7 +2360,7 @@ public class FWImpl { recordsArr1.add(recordObj); DynamicObject warehouse = billentry.getDynamicObject("warehouse"); - shck = warehouse.getString("number")+"<>"+deptNumber;//shck + shck = warehouse.getString("number")+"<>"+orgnumber;//shck } detail1.put("tableDBName", "formtable_main_98_dt1"); detail1.put("workflowRequestTableRecords", recordsArr1); @@ -4189,7 +4178,7 @@ public class FWImpl { String ck = null; DynamicObject warehouse = entry.getDynamicObject("warehouse");//仓库 if (null != warehouse) { - ck = warehouse.getString("number")+"<>"+deptNumber; + ck = warehouse.getString("number")+"<>"+orgNumber; } JSONObject e1 = new JSONObject(); @@ -5811,7 +5800,7 @@ public class FWImpl { String shck_sh = null; DynamicObject tqq9_rewares_sh = bill.getDynamicObject("tqq9_rewares_sh"); if (tqq9_rewares_sh != null) { - shck_sh = tqq9_rewares_sh.getString("number")+"<>"+deptNumber; + shck_sh = tqq9_rewares_sh.getString("number")+"<>"+orgnumber; } String fktj_sh = null; DynamicObject tqq9_paycondition_sh = bill.getDynamicObject("tqq9_paycondition_sh"); @@ -5905,7 +5894,7 @@ public class FWImpl { String shck_bj = null; DynamicObject tqq9_rewares_bj = bill.getDynamicObject("tqq9_rewares_bj"); if (tqq9_rewares_bj != null) { - shck_bj = tqq9_rewares_bj.getString("number")+"<>"+deptNumber; + shck_bj = tqq9_rewares_bj.getString("number")+"<>"+orgnumber; } String fktj_bj = null; DynamicObject tqq9_paycondition_bj = bill.getDynamicObject("tqq9_paycondition_bj"); @@ -5999,7 +5988,7 @@ public class FWImpl { String shck_gz = null; DynamicObject tqq9_rewares_gz = bill.getDynamicObject("tqq9_rewares_gz"); if (tqq9_rewares_gz != null) { - shck_gz = tqq9_rewares_gz.getString("number")+"<>"+deptNumber; + shck_gz = tqq9_rewares_gz.getString("number")+"<>"+orgnumber; } String fktj_gz = null; DynamicObject tqq9_paycondition_gz = bill.getDynamicObject("tqq9_paycondition_gz"); @@ -6121,7 +6110,7 @@ public class FWImpl { String shck = null; DynamicObject warehouse = billentry.getDynamicObject("warehouse"); if (warehouse != null) { - shck = warehouse.getString("number")+"<>"+deptNumber; + shck = warehouse.getString("number")+"<>"+orgnumber; } String gys = null; DynamicObject supplier = billentry.getDynamicObject("supplier");