<feat>：修改

1、修改供应商同步

code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/task/SynSupplierFromSAPTask.java

@@ -209,6 +209,23 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask {
         //供应商名称
         String supplierName = jsonData.getString("name");
         //供应商类型：法人企业1，非法人企业2，非企业单位3，个人4，个体户5
+
+        if(StringUtils.isEmpty(supplierNumber)){
+            returnMap.put("code", "500");
+            returnMap.put("msg", "供应商编码为空！");
+
+            return returnMap;
+        }
+
+        if(StringUtils.isEmpty(supplierName)){
+//            supplierName = supplierNumber;
+
+            returnMap.put("code", "500");
+            returnMap.put("msg", "供应商名称为空！");
+
+            return returnMap;
+        }
+
         String type = "1";
         if(supplierName.length() < 4){
             type = "4";

code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/webapi/SynSupplierApiPlugin.java

@@ -157,6 +157,23 @@ public class SynSupplierApiPlugin implements Serializable {
             dataSource = "mdm";
         }
 
+
+        if(StringUtils.isEmpty(supplierNumber)){
+            returnMap.put("code", "500");
+            returnMap.put("msg", "供应商编码为空！");
+
+            return returnMap;
+        }
+
+        if(StringUtils.isEmpty(supplierName)){
+//            supplierName = supplierNumber;
+
+            returnMap.put("code", "500");
+            returnMap.put("msg", "供应商名称为空！");
+
+            return returnMap;
+        }
+
         //供应商类型：法人企业1，非法人企业2，非企业单位3，个人4，个体户5
         String type = "1";
         //社会信用识别码societycreditcode
@@ -203,8 +220,6 @@ public class SynSupplierApiPlugin implements Serializable {
         supplier.set("createorg", defaultOrg);
         supplier.set("org", defaultOrg);
 
-
-
         supplier.set("group", supplierGroup);
 
         //子分录--默认分类（支持多分类）
@@ -307,46 +322,55 @@ public class SynSupplierApiPlugin implements Serializable {
             supplier.set("entry_bank",bankEntry);
         }
 
-        //判断是否更新与新增，通过不同方法处理，保存操作会变更状态为保存
-        if(isUpdate) {
-//            SaveServiceHelper.update(new DynamicObject[]{customer});
-            OperationResult resultSave = SaveServiceHelper.saveOperate(ENTITY_SUPPLIER, new DynamicObject[]{supplier}, OperateOption.create());
+        try {
+            //判断是否更新与新增，通过不同方法处理，保存操作会变更状态为保存
+            if(isUpdate) {
+    //            SaveServiceHelper.update(new DynamicObject[]{customer});
+                OperationResult resultSave = SaveServiceHelper.saveOperate(ENTITY_SUPPLIER, new DynamicObject[]{supplier}, OperateOption.create());
+
+                StringBuilder err = new StringBuilder();
+                if (resultSave.getSuccessPkIds().size() <= 0) {
+                    for (int i = 0; i < resultSave.getAllErrorOrValidateInfo().size(); i++) {
+                        String message = resultSave.getAllErrorOrValidateInfo().get(i).getMessage();
+                        err.append("/").append(message);
+                    }
 
-            StringBuilder err = new StringBuilder();
-            if (resultSave.getSuccessPkIds().size() <= 0) {
-                for (int i = 0; i < resultSave.getAllErrorOrValidateInfo().size(); i++) {
-                    String message = resultSave.getAllErrorOrValidateInfo().get(i).getMessage();
-                    err.append("/").append(message);
+                    returnMap.put("code", "500");
+                    returnMap.put("msg", err.toString());
+
+                    return returnMap;
                 }
+                supplierId = supplier.getLong("id");
+            } else {
+                //新增保存供应商对象
+                OperationResult resultSave = SaveServiceHelper.saveOperate(ENTITY_SUPPLIER, new DynamicObject[]{supplier}, OperateOption.create());
+
+                StringBuilder err = new StringBuilder();
+                if (resultSave.getSuccessPkIds().size() <= 0) {
+                    for (int i = 0; i < resultSave.getAllErrorOrValidateInfo().size(); i++) {
+                        String message = resultSave.getAllErrorOrValidateInfo().get(i).getMessage();
+                        err.append("/").append(message);
+                    }
 
-                returnMap.put("code", "500");
-                returnMap.put("msg", err.toString());
+                    returnMap.put("code", "500");
+                    returnMap.put("msg", err.toString());
 
-                return returnMap;
-            }
-            supplierId = supplier.getLong("id");
-        }else {
-            //新增保存供应商对象
-            OperationResult resultSave = SaveServiceHelper.saveOperate(ENTITY_SUPPLIER, new DynamicObject[]{supplier}, OperateOption.create());
-
-            StringBuilder err = new StringBuilder();
-            if (resultSave.getSuccessPkIds().size() <= 0) {
-                for (int i = 0; i < resultSave.getAllErrorOrValidateInfo().size(); i++) {
-                    String message = resultSave.getAllErrorOrValidateInfo().get(i).getMessage();
-                    err.append("/").append(message);
+                    return returnMap;
+                } else {
+                    supplierId = (Long) resultSave.getSuccessPkIds().get(0);
                 }
 
-                returnMap.put("code", "500");
-                returnMap.put("msg", err.toString());
+                DynamicObject customerObj = BusinessDataServiceHelper.loadSingle(supplierId, "bd_supplier");
 
-                return returnMap;
-            } else {
-                supplierId = (Long) resultSave.getSuccessPkIds().get(0);
+                OperationServiceHelper.executeOperate("submit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create());
+                OperationServiceHelper.executeOperate("audit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create());
             }
-            DynamicObject customerObj = BusinessDataServiceHelper.loadSingle(supplierId, "bd_supplier");
 
-            OperationServiceHelper.executeOperate("submit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create());
-            OperationServiceHelper.executeOperate("audit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create());
+        } catch(Exception e){
+            returnMap.put("code", "500");
+            returnMap.put("msg", e.getMessage());
+
+            return returnMap;
         }
 
         List<Long> assignOrgIds = new ArrayList<>();