diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index b39f011a9..3a59bcda7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -4833,15 +4833,14 @@ public class EmisBaseService { EmisWaybill masterWaybill = checkVirtualParam(emisWaybillSave, emisWaybillOld); String virtualRemark = masterWaybill.getVirtualRemark(); String virtualBillCode = emisWaybillSave.getBillCode(); - String virtualBillCodeLastSix = virtualBillCode.substring(virtualBillCode.length() - 6); if (StringUtil.isNotBlank(virtualRemark)) { Set virtualBillSet = new LinkedHashSet<>(); String[] codes = virtualRemark.split(","); virtualBillSet.addAll(Arrays.asList(codes)); - virtualBillSet.add(virtualBillCodeLastSix); + virtualBillSet.add(virtualBillCode); virtualRemark = String.join(",", virtualBillSet); } else { - virtualRemark = virtualBillCodeLastSix; + virtualRemark = virtualBillCode; } EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setVirtualRemark(virtualRemark); @@ -4904,12 +4903,11 @@ public class EmisBaseService { } else { String masterBillCode = emisWaybillOld.getMasterBillCode(); if (StringUtil.isNotBlank(masterBillCode)) { - String virtualBillCodeLastSix = emisWaybillSave.getBillCode() - .substring(emisWaybillSave.getBillCode().length() - 6); + String virtualBillCode = emisWaybillSave.getBillCode(); EmisWaybill masterWaybill = emisWaybillMapper .selectEmisWaybillByBillCode(masterBillCode); List 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); masterWaybill.setVirtualRemark(virtualRemark); emisWaybillMapper.updateEmisWaybill(masterWaybill);