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

demand: 打印备注修改，始发网点为空时设置默认值

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-06-24 13:38:00 +08:00
parent c80db35415
commit 22f371e439
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -2851,7 +2851,7 @@ public class EmisBaseService {
.filter(s -> s != null && s.length() >= 6) .filter(s -> s != null && s.length() >= 6)
.map(s -> s.substring(s.length() - 6)) .map(s -> s.substring(s.length() - 6))
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
remark = remark + " " + "该运单为主单，对应虚拟单为" + shortCodes; remark = remark + " " + "该运单为主单，对应虚拟单为" + shortCodes + "，";
} }
// if (StringUtil.isNotBlank(waybill.getMasterBillCode())) { // if (StringUtil.isNotBlank(waybill.getMasterBillCode())) {
// remark = remark + " " + "该运单为虚拟单，对应主单为" + waybill.getMasterBillCode(); // remark = remark + " " + "该运单为虚拟单，对应主单为" + waybill.getMasterBillCode();

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

@ -2286,6 +2286,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setOrderSn(orderSn); emisWaybillSave.setOrderSn(orderSn);
} }
if(StringUtil.isBlank(emisWaybillSave.getStartSiteCode())){
emisWaybillSave.setStartSiteCode(emisWaybillSave.getSendSiteCode());
}
if( StringUtils.isAnyEmpty( if( StringUtils.isAnyEmpty(
emisWaybillSave.getTransLineType(), emisWaybillSave.getTransLineType(),