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

demand: TMS系统 - 运单管理 - 运单签收图片上传 - 界面调整 TMS系统 - 运单管理 - 运单批量录入 - 缅甸虚拟单 逻辑优化 TMS/APP系统 - 接单/运单录入/运单修改 / 网点费用申请/批量录入 - 支付方式：到付/现金/其他 判断回款联系人/销售联系人/销售支持 逻辑调整

Browse Source
This commit is contained in:
aike 2026-04-10 13:00:15 +08:00
parent 601b81b140
commit ea77d405ce
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1269,55 +1269,41 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
String payee = wb.getPayee();
if (StringUtils.isNotBlank(payee)) {
String payeeName = payee.trim();
SysUser payeeUser = getEmisStaffByEmpName(payeeName);
if (payeeUser == null) {
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人" + payeeName + "不存在");
}
if (!"1".equals(payeeUser.getBlPayeeRemark())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "回款联系人" + payeeName + "无回款权限");
}
if (!"1".equals(payeeUser.getBlOpen())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "回款联系人" + payeeName + "未启用");
SysUser payeeCond = new SysUser();
payeeCond.setEmpName(payeeName);
payeeCond.setBlPayeeRemark("1");
payeeCond.setBlOpen("1");
List<SysUser> payeeUsers = sysUserMapper.selectUserList(payeeCond);
if (CollectionUtil.isEmpty(payeeUsers)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "当前回款联系人" + payeeName + "已失效，请更换客户对应的回款联系人");
}
}
String salesmen = wb.getSalesmen();
if (StringUtils.isNotBlank(salesmen)) {
String salesmenName = salesmen.trim();
SysUser salesUser = getEmisStaffByEmpName(salesmenName);
if (salesUser == null) {
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人" + salesmenName + "不存在");
}
if (!"1".equals(salesUser.getBlPayeeRemark())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "销售联系人" + salesmenName + "无回款权限");
}
if (!"1".equals(salesUser.getBlOpen())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "销售联系人" + salesmenName + "未启用");
SysUser salesCond = new SysUser();
salesCond.setEmpName(salesmenName);
salesCond.setBlPayeeRemark("1");
salesCond.setBlOpen("1");
List<SysUser> salesUsers = sysUserMapper.selectUserList(salesCond);
if (CollectionUtil.isEmpty(salesUsers)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "当前销售联系人" + salesmenName + "已失效，请更换客户对应的销售联系人");
}
}
String salesSupportRaw = null;
if (wb.getWaybillOther() != null) {
salesSupportRaw = wb.getWaybillOther().getSalesSupport();
if(wb.getWaybillOther()==null){
return;
}
if (StringUtils.isBlank(salesSupportRaw)) {
salesSupportRaw = wb.getSalesSupport();
}
String salesSupportToCheck = StringUtils.trimToEmpty(salesSupportRaw);
if (StringUtils.isNotBlank(salesSupportToCheck)) {
String[] supports = salesSupportToCheck.split("[,，]");
for (String support : supports) {
if (StringUtils.isBlank(support)) {
continue;
}
String supportName = support.trim();
SysUser supportUser = getEmisStaffByEmpName(supportName);
if (supportUser == null) {
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售支持" + supportName + "不存在");
}
if (!"1".equals(supportUser.getBlOpen())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "销售支持" + supportName + "未启用");
}
String support = wb.getWaybillOther().getSalesSupport().trim();
if (StringUtils.isNotBlank(support)) {
SysUser supportCond = new SysUser();
supportCond.setEmpName(support);
supportCond.setBlOpen("1");
List<SysUser> supportUsers = sysUserMapper.selectUserList(supportCond);
if (CollectionUtil.isEmpty(supportUsers)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "当前销售支持" + support + "已失效，请更换客户对应的销售支持");
}
}
}