|
@@ -156,8 +156,6 @@ public class ChangeDataUtils {
|
|
List<String> uploadNumberList = new ArrayList<>();
|
|
List<String> uploadNumberList = new ArrayList<>();
|
|
//经费系统实物卡片关联的e管家实物卡片编码
|
|
//经费系统实物卡片关联的e管家实物卡片编码
|
|
List<String> eCardNumberList = new ArrayList<>();
|
|
List<String> eCardNumberList = new ArrayList<>();
|
|
- //numberList 中有而 eCardNumberList 中没有的元素
|
|
|
|
- List<String> missingInECard = new ArrayList<>();
|
|
|
|
String e_orgId = Arrays.stream(asset).map(item -> item.split(":")[1]).collect(Collectors.toList()).get(0);
|
|
String e_orgId = Arrays.stream(asset).map(item -> item.split(":")[1]).collect(Collectors.toList()).get(0);
|
|
//根据中间表关联的资产信息查询e管家实物卡片清单
|
|
//根据中间表关联的资产信息查询e管家实物卡片清单
|
|
QFilter filter = new QFilter("number", QCP.in,numberList);
|
|
QFilter filter = new QFilter("number", QCP.in,numberList);
|
|
@@ -178,14 +176,17 @@ public class ChangeDataUtils {
|
|
numberList.remove(number);
|
|
numberList.remove(number);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- //再查经费系统实物卡片关联的e管家实物卡片-已经生成实物卡片的e管家实物卡片清单
|
|
|
|
- QFilter filter1 = new QFilter("nckd_card_real_code", QCP.in,cardNumberList);
|
|
|
|
- DynamicObject[] edynamicObjects = BusinessDataServiceHelper.load("nckd_fa_card_real_list","id",new QFilter[] {filter1});
|
|
|
|
- //获取e管家实物卡片编码
|
|
|
|
- for (DynamicObject eCard : edynamicObjects) {
|
|
|
|
- String number = eCard.getString("number");
|
|
|
|
- eCardNumberList.add(number);
|
|
|
|
|
|
+ if (cardNumberList.size() > 0) {
|
|
|
|
+ //再查经费系统实物卡片关联的e管家实物卡片-已经生成实物卡片的e管家实物卡片清单
|
|
|
|
+ QFilter filter1 = new QFilter("nckd_card_real_code", QCP.in,cardNumberList);
|
|
|
|
+ DynamicObject[] edynamicObjects = BusinessDataServiceHelper.load("nckd_fa_card_real_list","id",new QFilter[] {filter1});
|
|
|
|
+ //获取e管家实物卡片编码
|
|
|
|
+ for (DynamicObject eCard : edynamicObjects) {
|
|
|
|
+ String number = eCard.getString("number");
|
|
|
|
+ eCardNumberList.add(number);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
//对比中间表关联的e管家实物卡片和查询到的e管家实物卡片
|
|
//对比中间表关联的e管家实物卡片和查询到的e管家实物卡片
|
|
if (eCardNumberList.size() > numberList.size()) {
|
|
if (eCardNumberList.size() > numberList.size()) {
|
|
return "单据"+billno+"绑定的资产有未同步至星瀚的数据,生成调拨单失败";
|
|
return "单据"+billno+"绑定的资产有未同步至星瀚的数据,生成调拨单失败";
|