diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index a9a6a439af..954f239a6a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java @@ -340,11 +340,12 @@ public class BaseManufacturerRetwareService extends MybatisBaseService vehVos = baseManufacturerRetwareVehService.fetchByMainSid(cgtkdSid); vehVos.removeAll(Collections.singleton(null)); - List vinNoList = new ArrayList<>(); + Map vinNoMap = new HashMap<>(); if (!vehVos.isEmpty()) { for (BaseManufacturerRetwareVehDetailsVo vehVo : vehVos) { String vinNo = vehVo.getVinNo(); - vinNoList.add(vinNo); + String refundMoney = vehVo.getRefundMoney(); + vinNoMap.put(vinNo,new BigDecimal(refundMoney)); } } //初始化总数量为1 @@ -353,15 +354,17 @@ public class BaseManufacturerRetwareService extends MybatisBaseService baseApplyInboundVehQueryMaterials = new ArrayList<>(); - for (String vinNo : vinNoList) { + + for (Map.Entry entry : vinNoMap.entrySet()) { + String vinNo = entry.getKey(); + BigDecimal settleMoney = entry.getValue(); + tPrice = tPrice.add(settleMoney); ScmApplyInboundVehQueryDetailsVo data = scmApplyInboundVehQueryFeign.fetchDetailsByVinNo(vinNo).getData(); if (null != data) { cgrkdSid = data.getMainSid(); BaseApplyInboundVehQueryMaterial baseApplyInboundVehQueryMaterial = new BaseApplyInboundVehQueryMaterial(); num = num + 1; id = id + 1; - BigDecimal settleMoney = new BigDecimal(data.getSettleMoney()); - tPrice = tPrice.add(settleMoney); //主车物料编码 baseApplyInboundVehQueryMaterial.setVinNo(data.getVinNo().substring(data.getVinNo().length() - 8)); baseApplyInboundVehQueryMaterial.setId(String.valueOf(id)); @@ -369,7 +372,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService