|
@@ -25,6 +25,7 @@ import kd.bos.util.StringUtils;
|
|
|
import nckd.jimin.jyyy.bd.common.CommonHelperUtils;
|
|
|
import java.io.IOException;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 调度任务类
|
|
@@ -152,7 +153,8 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- for(int i = 0; i < rItemArray.size(); ++i) {
|
|
|
+// for(int i = 0; i < rItemArray.size(); ++i) {
|
|
|
+ for(int i = 0; i < 100; ++i) {
|
|
|
JSONObject item = rItemArray.getJSONObject(i);
|
|
|
String number = item.getString("LIFNR");
|
|
|
|
|
@@ -305,6 +307,7 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask {
|
|
|
if(jsonData.get("orgList") != null){
|
|
|
List<Long> assignOrgIds = new ArrayList<>();
|
|
|
List<String> orgCodeList = (List<String>)jsonData.get("orgList");
|
|
|
+ List<String> orgCodeKdList = new ArrayList<>();
|
|
|
|
|
|
QFilter orgFilter = new QFilter("number", QCP.in, orgCodeList);
|
|
|
orgFilter.and(new QFilter("enable", QCP.equals, "1"));
|
|
@@ -314,6 +317,7 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask {
|
|
|
|
|
|
for(DynamicObject org : orgList){
|
|
|
assignOrgIds.add(org.getLong("id"));
|
|
|
+ orgCodeKdList.add(org.getString("number"));
|
|
|
}
|
|
|
|
|
|
if(assignOrgIds.size() > 0) {
|
|
@@ -324,6 +328,15 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask {
|
|
|
} else {
|
|
|
logger.info("同步成功、分配失败");
|
|
|
}
|
|
|
+
|
|
|
+ if(orgCodeKdList.size() != orgCodeList.size()){
|
|
|
+ List<String> differenceList = orgCodeKdList.stream().filter(item -> !orgCodeKdList.contains(item)).collect(Collectors.toList());
|
|
|
+ if(differenceList.size() > 0){
|
|
|
+ String unAssignOrgString = String.join(",", differenceList);
|
|
|
+
|
|
|
+ logger.info("同步成功、部分组织分配失败:" + unAssignOrgString + ", 这些组织在星瀚中为匹配到!");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|