diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java index dc27789..d02be65 100644 --- a/lc123/cloud/app/plugin/trd/FWImpl.java +++ b/lc123/cloud/app/plugin/trd/FWImpl.java @@ -41,8 +41,9 @@ public class FWImpl { DynamicObject tqq9_dept = dataEntity.getDynamicObject("tqq9_dept");//部门 String bmbm = ""; String fwuserid = null; + String deptNumber = null; if(tqq9_dept != null){ - String deptNumber = tqq9_dept.getString("number"); + deptNumber = tqq9_dept.getString("number"); String fwOrgNumber = FWUtils.getFwOrgNumberByKdOrgNumber(deptNumber); if(StringUtils.isNotBlank(fwOrgNumber)){ bmbm = fwOrgNumber; @@ -51,20 +52,23 @@ public class FWImpl { fwuserid = FWUtils.getFwUserIdByKdUserNumber(creator.getString("number"), tqq9_dept.getString("number")); } } + if(StringUtils.isNotBlank(deptNumber)){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String cjsj = sdf.format(ceatetime); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String cjsj = sdf.format(ceatetime); + JSONObject mainTable = new JSONObject(); + mainTable.put("ckbm", number+"<>"+deptNumber); + mainTable.put("ckmc", name);//仓库编码上凭借部门编码推送泛微 + mainTable.put("cjsj", cjsj); + mainTable.put("zt", Integer.valueOf(enable)); + mainTable.put("cclx", Integer.valueOf(group.getString("number"))); + mainTable.put("bmbm", bmbm); - JSONObject mainTable = new JSONObject(); - mainTable.put("ckbm", number); - mainTable.put("ckmc", name); - mainTable.put("cjsj", cjsj); - mainTable.put("zt", Integer.valueOf(enable)); - mainTable.put("cclx", Integer.valueOf(group.getString("number"))); - mainTable.put("bmbm", bmbm); + FWRestfulUtils fwRestfulUtils = new FWRestfulUtils(); + return fwRestfulUtils.pushData(mainTable, fwuserid, number, "bd_warehouse"); + } + return null; - FWRestfulUtils fwRestfulUtils = new FWRestfulUtils(); - return fwRestfulUtils.pushData(mainTable, fwuserid, number, "bd_warehouse"); } @@ -910,7 +914,7 @@ public class FWImpl { recordsArr1.add(recordObj); DynamicObject warehouse = billentry.getDynamicObject("warehouse"); - shck = warehouse.getString("number");//shck + shck = warehouse.getString("number")+"<>"+deptNumber;//shck } detail1.put("tableDBName", "formtable_main_97_dt1"); detail1.put("workflowRequestTableRecords", recordsArr1); @@ -1274,7 +1278,7 @@ public class FWImpl { //入库仓库 DynamicObject warehouse = billentry.getDynamicObject("warehouse"); if(warehouse != null){ - rkck = warehouse.getString("number"); + rkck = warehouse.getString("number")+"<>"+deptNumber; } } detail1.put("tableDBName", "formtable_main_110_dt2"); @@ -1611,7 +1615,7 @@ public class FWImpl { //出库仓库 DynamicObject warehouse = billentry.getDynamicObject("warehouse"); if(warehouse != null){ - ckck = warehouse.getString("number"); + ckck = warehouse.getString("number")+"<>"+deptNumber; } } detail1.put("tableDBName", "formtable_main_110_dt1"); @@ -2116,8 +2120,9 @@ public class FWImpl { String cjr = null; String cjbm = null; DynamicObject tqq9_dept = bill.getDynamicObject("tqq9_dept"); + String deptNumber = null; if(tqq9_dept != null){ - String deptNumber = tqq9_dept.getString("number"); + deptNumber = tqq9_dept.getString("number"); cjbm = FWUtils.getFwOrgNumberByKdOrgNumber(deptNumber); if(creator != null){ cjr = FWUtils.getFwUserIdByKdUserNumber(creator.getString("number"), deptNumber); @@ -2354,7 +2359,7 @@ public class FWImpl { recordsArr1.add(recordObj); DynamicObject warehouse = billentry.getDynamicObject("warehouse"); - shck = warehouse.getString("number");//shck + shck = warehouse.getString("number")+"<>"+deptNumber;//shck } detail1.put("tableDBName", "formtable_main_98_dt1"); detail1.put("workflowRequestTableRecords", recordsArr1); @@ -4172,7 +4177,7 @@ public class FWImpl { String ck = null; DynamicObject warehouse = entry.getDynamicObject("warehouse");//仓库 if (null != warehouse) { - ck = warehouse.getString("number"); + ck = warehouse.getString("number")+"<>"+deptNumber; } JSONObject e1 = new JSONObject(); @@ -5794,7 +5799,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"); + shck_sh = tqq9_rewares_sh.getString("number")+"<>"+deptNumber; } String fktj_sh = null; DynamicObject tqq9_paycondition_sh = bill.getDynamicObject("tqq9_paycondition_sh"); @@ -5888,7 +5893,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"); + shck_bj = tqq9_rewares_bj.getString("number")+"<>"+deptNumber; } String fktj_bj = null; DynamicObject tqq9_paycondition_bj = bill.getDynamicObject("tqq9_paycondition_bj"); @@ -5982,7 +5987,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"); + shck_gz = tqq9_rewares_gz.getString("number")+"<>"+deptNumber; } String fktj_gz = null; DynamicObject tqq9_paycondition_gz = bill.getDynamicObject("tqq9_paycondition_gz"); @@ -6104,7 +6109,7 @@ public class FWImpl { String shck = null; DynamicObject warehouse = billentry.getDynamicObject("warehouse"); if (warehouse != null) { - shck = warehouse.getString("number"); + shck = warehouse.getString("number")+"<>"+deptNumber; } String gys = null; DynamicObject supplier = billentry.getDynamicObject("supplier");