Merge remote-tracking branch 'origin/master'

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<BaseManuf
         //查询相关车架号
         List<BaseManufacturerRetwareVehDetailsVo> vehVos = baseManufacturerRetwareVehService.fetchByMainSid(cgtkdSid);
         vehVos.removeAll(Collections.singleton(null));
-        List<String> vinNoList = new ArrayList<>();
+        Map<String,BigDecimal> 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<BaseManuf
         BigDecimal tPrice = new BigDecimal(0);
         String cgrkdSid = "";
         List<BaseApplyInboundVehQueryMaterial> baseApplyInboundVehQueryMaterials = new ArrayList<>();
-        for (String vinNo : vinNoList) {
+
+        for (Map.Entry <String, BigDecimal>  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<BaseManuf
                 baseApplyInboundVehQueryMaterial.setVehicleType(data.getVehicleTypeValue());
                 baseApplyInboundVehQueryMaterial.setIunit("辆");
                 baseApplyInboundVehQueryMaterial.setNum("1");
-                baseApplyInboundVehQueryMaterial.setSettleMoney(data.getSettleMoney());
+                baseApplyInboundVehQueryMaterial.setSettleMoney(settleMoney.toString());
                 baseApplyInboundVehQueryMaterial.setLocalName(data.getLocalName());
                 baseApplyInboundVehQueryMaterials.add(baseApplyInboundVehQueryMaterial);
             }