|
@@ -109,10 +109,12 @@ public class IncidentTicketController {
|
|
|
IPage<IncidentTicket> pageList = incidentTicketService.page(page, queryWrapper);
|
|
|
|
|
|
for (IncidentTicket o:pageList.getRecords()) {
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ if(o.getState().equals("4") || o.getState().equals("5")){
|
|
|
+ List<IncidentTicketChildren> list = incidentTicketChildrenService.selectByMainId(o.getId());
|
|
|
+ String result = list.stream().map(IncidentTicketChildren::getU8Invoice).collect(Collectors.joining(","));
|
|
|
+ o.setU8Invoices(result);
|
|
|
+ }
|
|
|
|
|
|
if(StringUtils.isNotBlank(o.getResponsibilityPerson1())){
|
|
|
LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson1());
|
|
@@ -317,10 +319,10 @@ public class IncidentTicketController {
|
|
|
if(!businessType.trim().equals("普通采购") && !businessType.trim().equals("委外加工")){
|
|
|
return Result.error("业务类型有误,请联系管理员");
|
|
|
}
|
|
|
- String moneyType = incidentTicket.getMoneyType();
|
|
|
- if(StringUtils.isBlank(moneyType)){
|
|
|
- return Result.error("币种为空无法同步");
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
String factory = incidentTicket.getFactory();
|
|
|
if(StringUtils.isBlank(factory)){
|
|
|
return Result.error("工厂为空无法同步");
|
|
@@ -342,6 +344,7 @@ public class IncidentTicketController {
|
|
|
String practicalSum = o.getPracticalSum();
|
|
|
String zhanghaoId = o.getZhanghaoId();
|
|
|
String accidentType = o.getAccidentType();
|
|
|
+ String moneyType = o.getMoneyType();
|
|
|
if(StringUtils.isNotBlank(u8Invoice)){
|
|
|
continue;
|
|
|
}
|
|
@@ -363,6 +366,9 @@ public class IncidentTicketController {
|
|
|
if(StringUtils.isBlank(accidentType)){
|
|
|
return Result.error("事故类型为空");
|
|
|
}
|
|
|
+ if(StringUtils.isBlank(moneyType)){
|
|
|
+ return Result.error("币种为空");
|
|
|
+ }
|
|
|
res = false;
|
|
|
Map<String,Object> cCode = new HashMap<>();
|
|
|
if(zhanghaoId.equals("101")){
|