代码优化

src/main/java/fi/fa/opplugin/AssetMidBillOpPlugin.java

@@ -275,21 +275,15 @@ public class AssetMidBillOpPlugin extends AbstractOperationServicePlugIn {
         DynamicObject[] orgControl = BusinessDataServiceHelper.load("nckd_base_org_ext","id",new QFilter[] {orgFilter});
         if (orgControl.length > 0) {
             DynamicObject orgControlInfo = BusinessDataServiceHelper.loadSingle(orgControl[0].getPkValue(), orgControl[0].getDynamicObjectType().getName());
-            Long orgId = Long.parseLong(orgControlInfo.getString("nckd_org_number"));
-            return orgId;
-        }//组织对照表查询不到，查询组织表
-        else {
-            if (StringUtils.isEmpty(eOrgId)) {
-                return null;
-            }
-            QFilter filter = new QFilter("id", QCP.equals,Long.parseLong(eOrgId));
+            String number = orgControlInfo.getString("nckd_org_number");
+            QFilter filter = new QFilter("number", QCP.equals,number);
             DynamicObject[] org = BusinessDataServiceHelper.load("bos_org","id",new QFilter[] {filter});
             if (org.length > 0) {
                 DynamicObject orgInfo = BusinessDataServiceHelper.loadSingle(org[0].getPkValue(), org[0].getDynamicObjectType().getName());
                 return orgInfo.getLong("id");
             }
-            return null;
         }
+        return null;
     }
 
     /**

src/main/java/fi/fa/opplugin/FaDispatchBillOpPlugin.java

@@ -29,7 +29,9 @@ public class FaDispatchBillOpPlugin extends AbstractOperationServicePlugIn {
                         DynamicObject cardInfo = BusinessDataServiceHelper.loadSingle(cardObjects[j].getPkValue(), cardObjects[j].getDynamicObjectType().getName());
                         //回写e管家实物清单字段
                         cardInfo.set("nckd_orgfield", info.getDynamicObject("inassetunit").getLong("id"));//归属组织
-                        cardInfo.set("nckd_dept", dispatchentry.getDynamicObject("inusedept").getLong("id"));//归属部门
+                        if (dispatchentry.getDynamicObject("inusedept") != null) {
+                            cardInfo.set("nckd_dept", dispatchentry.getDynamicObject("inusedept").getLong("id"));//归属部门
+                        }
                         SaveServiceHelper.save(new DynamicObject[]{cardInfo});
                     }
                 }

src/main/java/fi/fa/webService/ApisaveDemoPlugin.java

@@ -57,14 +57,30 @@ public class ApisaveDemoPlugin implements ApiSavePlugin {
 
         if (orgId.equals(deptId)) {
             // 如果组织 ID 和部门 ID 相同，则都设置为组织编号
-            org.put("id", Long.valueOf(orgNumber));
-            dept.put("id", Long.valueOf(orgNumber));
+            org.put("id", getOrg(orgNumber));
+            dept.put("id", getOrg(orgNumber));
         } else if (orgControlInfo.getString("nckd_e_org").equals(orgId)) {
             // 如果当前控制信息的组织 ID 等于 orgId，更新组织 ID
-            org.put("id", Long.valueOf(orgNumber));
+            org.put("id", getOrg(orgNumber));
         } else {
             // 否则更新部门 ID
-            dept.put("id", Long.valueOf(orgNumber));
+            dept.put("id", getOrg(orgNumber));
         }
     }
+
+    /**
+     * @description 查询组织对照表获取组织id
+     * @param number
+     * @return Long
+     */
+    private Long getOrg(String number) {
+
+        QFilter filter = new QFilter("number", QCP.equals,number);
+        DynamicObject[] org = BusinessDataServiceHelper.load("bos_org","id",new QFilter[] {filter});
+        if (org.length > 0) {
+            DynamicObject orgInfo = BusinessDataServiceHelper.loadSingle(org[0].getPkValue(), org[0].getDynamicObjectType().getName());
+            return orgInfo.getLong("id");
+        }
+        return null;
+    }
 }

src/main/java/fi/fa/webService/DispatchMidController.java

@@ -212,8 +212,7 @@ public class DispatchMidController implements Serializable {
         if ("0".equals(dispatchType)) {
             DynamicObject dispatch = BusinessDataServiceHelper.newDynamicObject("fa_dispatch");
             String nckd_card_real_code = jsonObject.getString("nckd_card_real_code");
-            nckd_card_real_code = "A00100101900240600002";
-
+//            nckd_card_real_code = "A00100101900240600008";
             //单据头
             dispatch.set("dispatchdate", jsonObject.getDate("sendDate"));//调出日期
             dispatch.set("assetunit", map.get("outOrgId"));//调出组织
@@ -276,7 +275,7 @@ public class DispatchMidController implements Serializable {
         else if ("1".equals(dispatchType)) {
             DynamicObject changeDept = BusinessDataServiceHelper.newDynamicObject("fa_change_dept");
             String nckd_card_real_code = jsonObject.getString("nckd_card_real_code");
-            nckd_card_real_code = "A00100101900240600007";
+//            nckd_card_real_code = "A00100101900240600007";
             DynamicObject orgInfo = queryOrg(map.get("orgId"));
             //单据头
             changeDept.set("org", orgInfo);//核算组织
@@ -371,7 +370,7 @@ public class DispatchMidController implements Serializable {
         else if ("2".equals(dispatchType)) {
             DynamicObject busProcess = BusinessDataServiceHelper.newDynamicObject("nckd_ywcld");
             String nckd_card_real_code = jsonObject.getString("nckd_card_real_code");
-            nckd_card_real_code = "A00100101900240700007";
+//            nckd_card_real_code = "A00100101900240700007";
             DynamicObject orgInfo = queryOrg(map.get("orgId"));
             busProcess.set("nckd_bizdate", jsonObject.getDate("sendDate"));//业务日期
             busProcess.set("nckd_detailtype", "D");//业务类型 D:报废
@@ -423,21 +422,15 @@ public class DispatchMidController implements Serializable {
         DynamicObject[] orgControl = BusinessDataServiceHelper.load("nckd_base_org_ext","id",new QFilter[] {orgFilter});
         if (orgControl.length > 0) {
             DynamicObject orgControlInfo = BusinessDataServiceHelper.loadSingle(orgControl[0].getPkValue(), orgControl[0].getDynamicObjectType().getName());
-            Long orgId = Long.parseLong(orgControlInfo.getString("nckd_org_number"));
-            return orgId;
-        }//组织对照表查询不到，查询组织表
-        else {
-            if (StringUtils.isEmpty(eOrgId)) {
-                return null;
-            }
-            QFilter filter = new QFilter("id", QCP.equals,Long.parseLong(eOrgId));
+            String number = orgControlInfo.getString("nckd_org_number");
+            QFilter filter = new QFilter("number", QCP.equals,number);
             DynamicObject[] org = BusinessDataServiceHelper.load("bos_org","id",new QFilter[] {filter});
             if (org.length > 0) {
                 DynamicObject orgInfo = BusinessDataServiceHelper.loadSingle(org[0].getPkValue(), org[0].getDynamicObjectType().getName());
                 return orgInfo.getLong("id");
             }
-            return null;
         }
+        return null;
     }
 
     /**