From 873243f846c57e23211ec02ebddb219acc3fc830 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 21 Jul 2022 13:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/scmapplyinbound/ScmApplyInbound.java  | 31 ++++++++++++++-----
 .../scmapplyinbound/ScmApplyInboundDto.java   | 30 +++++++++++++-----
 .../scmapplyinbound/ScmApplyInboundVo.java    | 30 +++++++++++++-----
 .../ScmApplyInboundService.java               | 15 +++++----
 4 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
index 3facf4da4c..866a402176 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
@@ -66,14 +66,29 @@ public class ScmApplyInbound extends BaseEntity {
     private BigDecimal onceFreight;
     @ApiModelProperty("二次运费")
     private BigDecimal secondaryFreight;
-    @ApiModelProperty("下浮比例")
-    private String lowerProportion;
-    @ApiModelProperty("下浮金额")
-    private BigDecimal lowerMoney;
-    @ApiModelProperty("下浮合计")
-    private BigDecimal lowerTotal;
-    @ApiModelProperty("下浮备注")
-    private String lowerRemarks;
+
+    @ApiModelProperty("政策1")
+    private String policyOne;
+    @ApiModelProperty("可享受金额1")
+    private BigDecimal eligibleAmountOne;
+    @ApiModelProperty("政策2")
+    private String policyTwo;
+    @ApiModelProperty("可享受比例2")
+    private String eligibleProportionTwo;
+    @ApiModelProperty("对应金额2")
+    private BigDecimal corrMoneyTwo;
+    @ApiModelProperty("政策3")
+    private String policyThree;
+    @ApiModelProperty("可享受比例3")
+    private String eligibleProportionThree;
+    @ApiModelProperty("对应金额3")
+    private BigDecimal corrMoneyThree;
+    @ApiModelProperty("金额合计")
+    private BigDecimal moneyCount;
+    @ApiModelProperty("政策备注")
+    private String policyRemarks;
+
+
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice;
     @ApiModelProperty("内部编码")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
index 88d55dcb54..8c32a6e5b1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
@@ -85,14 +85,28 @@ public class ScmApplyInboundDto implements Dto {
     private BigDecimal onceFreight;
     @ApiModelProperty("二次运费")
     private BigDecimal secondaryFreight;
-    @ApiModelProperty("下浮比例")
-    private String lowerProportion;
-    @ApiModelProperty("下浮金额")
-    private BigDecimal lowerMoney;
-    @ApiModelProperty("下浮合计")
-    private BigDecimal lowerTotal;
-    @ApiModelProperty("下浮备注")
-    private String lowerRemarks;
+
+    @ApiModelProperty("政策1")
+    private String policyOne;
+    @ApiModelProperty("可享受金额1")
+    private BigDecimal eligibleAmountOne;
+    @ApiModelProperty("政策2")
+    private String policyTwo;
+    @ApiModelProperty("可享受比例2")
+    private String eligibleProportionTwo;
+    @ApiModelProperty("对应金额2")
+    private BigDecimal corrMoneyTwo;
+    @ApiModelProperty("政策3")
+    private String policyThree;
+    @ApiModelProperty("可享受比例3")
+    private String eligibleProportionThree;
+    @ApiModelProperty("对应金额3")
+    private BigDecimal corrMoneyThree;
+    @ApiModelProperty("金额合计")
+    private BigDecimal moneyCount;
+    @ApiModelProperty("政策备注")
+    private String policyRemarks;
+
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice;
     @ApiModelProperty("内部编码")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
index cd68e1ea62..d00a28c41a 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
@@ -68,14 +68,28 @@ public class ScmApplyInboundVo implements Vo {
     private BigDecimal onceFreight;
     @ApiModelProperty("二次运费")
     private BigDecimal secondaryFreight;
-    @ApiModelProperty("下浮比例")
-    private String lowerProportion;
-    @ApiModelProperty("下浮金额")
-    private BigDecimal lowerMoney;
-    @ApiModelProperty("下浮合计")
-    private BigDecimal lowerTotal;
-    @ApiModelProperty("下浮备注")
-    private String lowerRemarks;
+
+    @ApiModelProperty("政策1")
+    private String policyOne;
+    @ApiModelProperty("可享受金额1")
+    private BigDecimal eligibleAmountOne;
+    @ApiModelProperty("政策2")
+    private String policyTwo;
+    @ApiModelProperty("可享受比例2")
+    private String eligibleProportionTwo;
+    @ApiModelProperty("对应金额2")
+    private BigDecimal corrMoneyTwo;
+    @ApiModelProperty("政策3")
+    private String policyThree;
+    @ApiModelProperty("可享受比例3")
+    private String eligibleProportionThree;
+    @ApiModelProperty("对应金额3")
+    private BigDecimal corrMoneyThree;
+    @ApiModelProperty("金额合计")
+    private BigDecimal moneyCount;
+    @ApiModelProperty("政策备注")
+    private String policyRemarks;
+
     @ApiModelProperty("厂家结算价")
     private BigDecimal costPrice;
     @ApiModelProperty("内部编码")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index 945d1fc229..4b170b98c9 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.scm.biz.scmapplyinbound;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -387,7 +388,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 }
                 BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
                 baseVehicleDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
-                baseVehicleDto.setModelSid(scmApplyInboundVehicleDto.getModelSid());
+                baseVehicleDto.setModelSid(dto.getModelSid());
                 baseVehicleDto.setModelName(dto.getModelName());
                 String userSid = dto.getUserSid();
                 ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
@@ -396,17 +397,19 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 baseVehicleDto.setModelConfigSid(dto.getConfigSid());
                 baseVehicleDto.setConfigName(dto.getConfigName());
                 baseVehicleDto.setInsideCode(dto.getInsideCode());
+                baseVehicleDto.setOrderingNo(dto.getPurchaseOrderNo());
+                baseVehicleDto.setSettlementStatus("0");
                 baseVehicleDto.setLockedState("0");
                 baseVehicleDto.setLockedStateValue("未锁定");
                 baseVehicleDto.setVehicleState("0003");
                 baseVehicleDto.setVehicleStateValue("在途");
                 baseVehicleDto.setManPurOrderTypeKey("001");
                 baseVehicleDto.setManPurOrderTypeValue("排产订单");
-                //baseVehicleDto.setContractPrice(Integer.parseInt(dto.getContractPrice().toString()));
-                //baseVehicleDto.setFreight(Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()));
-                //baseVehicleDto.setCostPriced(Integer.parseInt(dto.getCostPrice().toString()));
-                //baseVehicleDto.setPriceDate(dto.getPriceDate());
-                //baseVehicleDto.setDepartureDate(dto.getDepartureDate());
+                baseVehicleDto.setContractPrice(0);//Integer.parseInt(dto.getContractPrice().toString())
+                baseVehicleDto.setFreight(0);//Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString())
+                baseVehicleDto.setCostPrice(0);//Integer.parseInt(dto.getCostPrice().toString())
+                baseVehicleDto.setPriceDate(DateUtil.today());//dto.getPriceDate()
+                baseVehicleDto.setDepartureDate(DateUtil.today());//dto.getDepartureDate()
                 baseVehicleDtos.add(baseVehicleDto);
             }
             baseVehicleFeign.saveAll(baseVehicleDtos);