|
|
@ -356,8 +356,11 @@ public class PageController { |
|
|
if (minRecord != null) { |
|
|
if (minRecord != null) { |
|
|
// 获取子订单键值
|
|
|
// 获取子订单键值
|
|
|
String[] split = minRecord.replace("[", "").replace("]", "").split(","); |
|
|
String[] split = minRecord.replace("[", "").replace("]", "").split(","); |
|
|
for (int i = 0; i < split.length; i++) { |
|
|
for (String s : split) { |
|
|
Integer minRecordId = ObjectFormatUtil.toInteger(split[i].split(":")[1]); |
|
|
if("".equals(s)){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1]); |
|
|
ApplicationOutRecordMin applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); |
|
|
ApplicationOutRecordMin applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); |
|
|
ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); |
|
|
ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); |
|
|
UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken); |
|
|
UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken); |
|
|
@ -1335,6 +1338,9 @@ public class PageController { |
|
|
String[] split = departmentheads.split(","); |
|
|
String[] split = departmentheads.split(","); |
|
|
StringBuilder departmentHeadName = new StringBuilder(); |
|
|
StringBuilder departmentHeadName = new StringBuilder(); |
|
|
for (String value : split) { |
|
|
for (String value : split) { |
|
|
|
|
|
if("".equals(value)){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userToken); |
|
|
UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userToken); |
|
|
departmentHeadName.append(departmenthead.getName()).append(","); |
|
|
departmentHeadName.append(departmenthead.getName()).append(","); |
|
|
} |
|
|
} |
|
|
@ -1348,6 +1354,9 @@ public class PageController { |
|
|
List<UserByPort> depositoryManager = new ArrayList<>(); |
|
|
List<UserByPort> depositoryManager = new ArrayList<>(); |
|
|
StringBuilder depositoryManagerNames = new StringBuilder(); |
|
|
StringBuilder depositoryManagerNames = new StringBuilder(); |
|
|
for (String s : depositoryManagerId) { |
|
|
for (String s : depositoryManagerId) { |
|
|
|
|
|
if("".equals(s)){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
Integer managerid = ObjectFormatUtil.toInteger(s); |
|
|
Integer managerid = ObjectFormatUtil.toInteger(s); |
|
|
UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userToken); |
|
|
UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userToken); |
|
|
depositoryManager.add(user); |
|
|
depositoryManager.add(user); |
|
|
@ -1555,8 +1564,11 @@ public class PageController { |
|
|
split = new String[0]; |
|
|
split = new String[0]; |
|
|
} |
|
|
} |
|
|
StringBuilder departmentHeadName = new StringBuilder(); |
|
|
StringBuilder departmentHeadName = new StringBuilder(); |
|
|
for (int i = 0; i < split.length; i++) { |
|
|
for (String value : split) { |
|
|
UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(split[i]), userToken); |
|
|
if("".equals(value)){ |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userToken); |
|
|
departmentHeadName.append(departmenthead.getName()).append(","); |
|
|
departmentHeadName.append(departmenthead.getName()).append(","); |
|
|
} |
|
|
} |
|
|
// 仓储中心负责人
|
|
|
// 仓储中心负责人
|
|
|
@ -1567,8 +1579,11 @@ public class PageController { |
|
|
} |
|
|
} |
|
|
List<UserByPort> depositoryManager = new ArrayList<>(); |
|
|
List<UserByPort> depositoryManager = new ArrayList<>(); |
|
|
StringBuilder depositoryManagerNames = new StringBuilder(); |
|
|
StringBuilder depositoryManagerNames = new StringBuilder(); |
|
|
for (int i = 0; i < depositoryManagerId.length; i++) { |
|
|
for (String s : depositoryManagerId) { |
|
|
Integer managerid = ObjectFormatUtil.toInteger(depositoryManagerId[i]); |
|
|
if ("".equals(s)) { |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
Integer managerid = ObjectFormatUtil.toInteger(s); |
|
|
UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userToken); |
|
|
UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userToken); |
|
|
depositoryManager.add(user); |
|
|
depositoryManager.add(user); |
|
|
depositoryManagerNames.append(user.getName()); |
|
|
depositoryManagerNames.append(user.getName()); |
|
|
|