SRM接口

1、费用承担组织改成用u8Org参数匹配
2、项目未匹配上增加组织的描述

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/webapi/SRMSynPayApiPlugin.java

@@ -207,10 +207,14 @@ public class SRMSynPayApiPlugin implements Serializable {
             returnMessage = ("".equals(returnMessage) ? "" : ",") + "制单人 不能为空";
         }
 
-        if( StringUtils.isEmpty(applier)){
+        if(StringUtils.isEmpty(applier)){
             returnMessage = ("".equals(returnMessage) ? "" : ",") + "经办人 不能为空";
         }
 
+        if(StringUtils.isEmpty(u8Org)){
+            returnMessage = ("".equals(returnMessage) ? "" : ",") + "u8组织 不能为空";
+        }
+
         if("XM".equals(billType)){
             if(StringUtils.isEmpty(project)){
                 returnMessage = ("".equals(returnMessage) ? "" : ",") + "项目类付款 项目编码 不能为空";
@@ -265,13 +269,20 @@ public class SRMSynPayApiPlugin implements Serializable {
         DynamicObject adminCompany = CommonHelperUtils.getAdminCompany(dept);
 
         QFilter qFilter = new QFilter("toorg", QCP.equals, dept.getPkValue());
-        DynamicObject relation = BusinessDataServiceHelper.loadSingle("bos_org_orgrelation_dept", qFilter.toArray());
-        if(relation == null){
-            returnMessage = "行政组织(" + dept.getString("number") + ", " + dept.getString("name") + ")在星瀚系统未维护委托业务单元！";
+//        DynamicObject relation = BusinessDataServiceHelper.loadSingle("bos_org_orgrelation_dept", qFilter.toArray());
+//        if(relation == null){
+//            returnMessage = "行政组织(" + dept.getString("number") + ", " + dept.getString("name") + ")在星瀚系统未维护委托业务单元！";
+//            return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
+//        }
+        //费用承担公司 改成取u8组织
+//        DynamicObject costCompany = relation.getDynamicObject("fromorg");
+
+        DynamicObject costCompany = CommonHelperUtils.queryBaseDynamicObject("bos_org", "name", u8Org);
+        if(costCompany == null){
+            returnMessage = "u8组织(" + u8Org + ")在星瀚系统中未匹配到数据！";
             return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
         }
-        //费用承担公司
-        DynamicObject costCompany = relation.getDynamicObject("fromorg");
+
         //汇率表Id
         Long exchangeTableId = CommonHelperUtils.getExchageTableId(costCompany.getLong("id"));
 
@@ -417,7 +428,7 @@ public class SRMSynPayApiPlugin implements Serializable {
 
                     projectInfo = BusinessDataServiceHelper.loadSingle("bd_project", projectFilter.toArray());
                     if (projectInfo == null) {
-                        returnMessage = "项目(" + xsproject + ")在星瀚系统中未匹配到数据！";
+                        returnMessage = "组织(" + costCompany.getString("name") + ")下的项目(" + xsproject + ")在星瀚系统中未匹配到数据！";
                         return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
                     }
 
@@ -1070,6 +1081,10 @@ public class SRMSynPayApiPlugin implements Serializable {
             returnMessage = ("".equals(returnMessage) ? "" : ",") + "经办人 不能为空";
         }
 
+        if(StringUtils.isEmpty(u8Org)){
+            returnMessage = ("".equals(returnMessage) ? "" : ",") + "u8组织 不能为空";
+        }
+
         if(!StringUtils.isEmpty(returnMessage)){
             return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
         }
@@ -1110,13 +1125,20 @@ public class SRMSynPayApiPlugin implements Serializable {
         DynamicObject adminCompany = CommonHelperUtils.getAdminCompany(dept);
 
         QFilter qFilter = new QFilter("toorg", QCP.equals, dept.getPkValue());
-        DynamicObject relation = BusinessDataServiceHelper.loadSingle("bos_org_orgrelation_dept", qFilter.toArray());
-        if(relation == null){
-            returnMessage = "行政组织(" + dept.getString("number") + ", " + dept.getString("name") + ")在星瀚系统未维护委托业务单元！";
+//        DynamicObject relation = BusinessDataServiceHelper.loadSingle("bos_org_orgrelation_dept", qFilter.toArray());
+//        if(relation == null){
+//            returnMessage = "行政组织(" + dept.getString("number") + ", " + dept.getString("name") + ")在星瀚系统未维护委托业务单元！";
+//            return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
+//        }
+        //费用承担公司
+//        DynamicObject costCompany = relation.getDynamicObject("fromorg");
+
+        DynamicObject costCompany = CommonHelperUtils.queryBaseDynamicObject("bos_org", "name", u8Org);
+        if(costCompany == null){
+            returnMessage = "u8组织(" + u8Org + ")在星瀚系统中未匹配到数据！";
             return buildReturnData(code, srmBillNo, returnMessage, null, null, null);
         }
-        //费用承担公司
-        DynamicObject costCompany = relation.getDynamicObject("fromorg");
+
         //汇率表Id
         Long exchangeTableId = CommonHelperUtils.getExchageTableId(costCompany.getLong("id"));