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

Merge pull request 'demand: TMS系统 - 客户管理 - 现金客户额度 - 超期已用额度 与运单明细单号运费不一致；' (#65) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/65
This commit is contained in:
heyu 2025-06-23 21:33:06 +08:00
commit 6ff77cea3c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4833,15 +4833,14 @@ public class EmisBaseService {
EmisWaybill masterWaybill = checkVirtualParam(emisWaybillSave, emisWaybillOld); EmisWaybill masterWaybill = checkVirtualParam(emisWaybillSave, emisWaybillOld);
String virtualRemark = masterWaybill.getVirtualRemark(); String virtualRemark = masterWaybill.getVirtualRemark();
String virtualBillCode = emisWaybillSave.getBillCode(); String virtualBillCode = emisWaybillSave.getBillCode();
String virtualBillCodeLastSix = virtualBillCode.substring(virtualBillCode.length() - 6);
if (StringUtil.isNotBlank(virtualRemark)) { if (StringUtil.isNotBlank(virtualRemark)) {
Set<String> virtualBillSet = new LinkedHashSet<>(); Set<String> virtualBillSet = new LinkedHashSet<>();
String[] codes = virtualRemark.split(","); String[] codes = virtualRemark.split(",");
virtualBillSet.addAll(Arrays.asList(codes)); virtualBillSet.addAll(Arrays.asList(codes));
virtualBillSet.add(virtualBillCodeLastSix); virtualBillSet.add(virtualBillCode);
virtualRemark = String.join(",", virtualBillSet); virtualRemark = String.join(",", virtualBillSet);
} else { } else {
virtualRemark = virtualBillCodeLastSix; virtualRemark = virtualBillCode;
} }
EmisWaybill emisWaybill = new EmisWaybill(); EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setVirtualRemark(virtualRemark); emisWaybill.setVirtualRemark(virtualRemark);
@ -4904,12 +4903,11 @@ public class EmisBaseService {
} else { } else {
String masterBillCode = emisWaybillOld.getMasterBillCode(); String masterBillCode = emisWaybillOld.getMasterBillCode();
if (StringUtil.isNotBlank(masterBillCode)) { if (StringUtil.isNotBlank(masterBillCode)) {
String virtualBillCodeLastSix = emisWaybillSave.getBillCode() String virtualBillCode = emisWaybillSave.getBillCode();
.substring(emisWaybillSave.getBillCode().length() - 6);
EmisWaybill masterWaybill = emisWaybillMapper EmisWaybill masterWaybill = emisWaybillMapper
.selectEmisWaybillByBillCode(masterBillCode); .selectEmisWaybillByBillCode(masterBillCode);
List<String> filterVirtualRemark = Arrays.stream(masterWaybill.getVirtualRemark().split(",")) List<String> filterVirtualRemark = Arrays.stream(masterWaybill.getVirtualRemark().split(","))
.filter(i -> !i.equals(virtualBillCodeLastSix)).collect(Collectors.toList()); .filter(i -> !i.equals(virtualBillCode)).collect(Collectors.toList());
String virtualRemark = String.join(",", filterVirtualRemark); String virtualRemark = String.join(",", filterVirtualRemark);
masterWaybill.setVirtualRemark(virtualRemark); masterWaybill.setVirtualRemark(virtualRemark);
emisWaybillMapper.updateEmisWaybill(masterWaybill); emisWaybillMapper.updateEmisWaybill(masterWaybill);