aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: TMS系统 - 运单录入/运单修改/网点费用申请 - 线路为海运的产品 界面功能调整；

Browse Source
This commit is contained in:
aike 2026-04-21 09:40:05 +08:00
parent b9f8fe83f3
commit 029e97d5f3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -6343,7 +6343,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 当前批次所有销售联系人，批量查询分享关系 // 当前批次所有销售联系人，批量查询分享关系
Set<String> batchSalesmenSet = new LinkedHashSet<>(); Set<String> batchSalesmenSet = new LinkedHashSet<>();
for (EmisWaybill waybill : waybillList) { for (EmisWaybill waybill : waybillList) {
if (waybill != null && !StringUtils.isEmpty(waybill.getSalesmen())) { if (waybill != null && !StringUtils.isBlank(waybill.getSalesmen())) {
batchSalesmenSet.add(waybill.getSalesmen()); batchSalesmenSet.add(waybill.getSalesmen());
} }
} }
@ -6354,7 +6354,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
.selectValidRelBySalesmenList(new ArrayList<>(batchSalesmenSet)); .selectValidRelBySalesmenList(new ArrayList<>(batchSalesmenSet));
if (!CollectionUtils.isEmpty(relAllList)) { if (!CollectionUtils.isEmpty(relAllList)) {
for (EmisSalesmenRel rel : relAllList) { for (EmisSalesmenRel rel : relAllList) {
if (rel == null || StringUtils.isEmpty(rel.getSalesmen())) { if (rel == null || StringUtils.isBlank(rel.getSalesmen())) {
continue; continue;
} }
salesRelMap.computeIfAbsent(rel.getSalesmen(), k -> new ArrayList<>()).add(rel); salesRelMap.computeIfAbsent(rel.getSalesmen(), k -> new ArrayList<>()).add(rel);
@ -6363,7 +6363,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
for (EmisWaybill waybill : waybillList) { for (EmisWaybill waybill : waybillList) {
if (waybill == null || StringUtils.isEmpty(waybill.getBillCode())) { if (waybill == null || StringUtils.isBlank(waybill.getBillCode())) {
continue; continue;
} }
@ -6372,7 +6372,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
Set<String> notifyEmpNames = new LinkedHashSet<>(); Set<String> notifyEmpNames = new LinkedHashSet<>();
// 销售联系人 // 销售联系人
if (!StringUtils.isEmpty(waybill.getSalesmen())) { if (!StringUtils.isBlank(waybill.getSalesmen())) {
String salesmen = waybill.getSalesmen(); String salesmen = waybill.getSalesmen();
notifyEmpNames.add(salesmen); notifyEmpNames.add(salesmen);
@ -6380,7 +6380,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
List<EmisSalesmenRel> relList = salesRelMap.get(salesmen); List<EmisSalesmenRel> relList = salesRelMap.get(salesmen);
if (!CollectionUtils.isEmpty(relList)) { if (!CollectionUtils.isEmpty(relList)) {
for (EmisSalesmenRel rel : relList) { for (EmisSalesmenRel rel : relList) {
if (rel == null || StringUtils.isEmpty(rel.getSalesAss())) { if (rel == null || StringUtils.isBlank(rel.getSalesAss())) {
continue; continue;
} }
notifyEmpNames.add(rel.getSalesAss()); notifyEmpNames.add(rel.getSalesAss());
@ -6390,10 +6390,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 销售支持 // 销售支持
EmisWaybillOther waybillOther = waybill.getWaybillOther(); EmisWaybillOther waybillOther = waybill.getWaybillOther();
if (waybillOther != null && !StringUtils.isEmpty(waybillOther.getSalesSupport())) { if (waybillOther != null && !StringUtils.isBlank(waybillOther.getSalesSupport())) {
String[] supports = waybillOther.getSalesSupport().split("[,，]"); String[] supports = waybillOther.getSalesSupport().split("[,，]");
for (String support : supports) { for (String support : supports) {
if (!StringUtils.isEmpty(support)) { if (!StringUtils.isBlank(support)) {
notifyEmpNames.add(support.trim()); notifyEmpNames.add(support.trim());
} }
} }
@ -6412,7 +6412,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
List<SysUser> users = sysUserMapper.selectUserList(cond); List<SysUser> users = sysUserMapper.selectUserList(cond);
if (!CollectionUtils.isEmpty(users)) { if (!CollectionUtils.isEmpty(users)) {
for (SysUser u : users) { for (SysUser u : users) {
if (u != null && !StringUtils.isEmpty(u.getEmpCode())) { if (u != null && !StringUtils.isBlank(u.getEmpCode())) {
notifyEmpCodes.add(u.getEmpCode()); notifyEmpCodes.add(u.getEmpCode());
} }
} }