From 4ade0a7f377af6235d453feb1aead284c93f815d Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Tue, 4 Mar 2025 15:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8E=82=E5=AE=B6=E7=BB=93=E7=AE=97=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/basevehicle/BaseVehicle.java     |  3 +-
 .../base/api/basevehicle/BaseVehicleDto.java  |  4 ++-
 .../api/basevehicle/BaseVehicleFeign.java     |  9 ++++++
 .../basevehicle/BaseVehicleFeignFallback.java |  5 ++++
 .../base/api/basevehicle/BaseVehicleVo.java   |  5 +++-
 .../biz/basevehicle/BaseVehicleMapper.xml     |  1 +
 .../base/biz/basevehicle/BaseVehicleRest.java |  5 ++++
 .../biz/basevehicle/BaseVehicleService.java   | 28 +++++++++++++++++++
 .../ScmApplyInboundService.java               |  1 +
 .../ScmVehicleEnterlibraryService.java        |  1 +
 10 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
index 3cc3666574..4d2ea99bec 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -78,6 +77,8 @@ public class BaseVehicle extends BaseEntity {
 
     @ApiModelProperty(value = "指导价")
     private Integer salePrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer settlePrice;
 
     @ApiModelProperty("创建组织(陕汽必须的字段)")
     private String createOrgSid;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
index 3aa995fb35..824ee25c65 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
@@ -78,8 +78,10 @@ public class BaseVehicleDto implements Dto {
     private String location;
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
-    @ApiModelProperty(value = "厂家结算价")
+    @ApiModelProperty(value = "入库价")
     private Integer costPrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer settlePrice;
     @ApiModelProperty(value = "厂家合同价")
     private Integer contractPrice;
     @ApiModelProperty(value = "成交价")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
index 0df7e716c3..4e4edbe390 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
@@ -120,6 +120,15 @@ public interface BaseVehicleFeign {
     @PostMapping("/update/{sid}")
     public ResultBean update(@RequestBody BaseVehicleDto dto, @PathVariable("sid") String sid);
 
+    /**
+     * 修改厂家结算价
+     *
+     * @return
+     */
+    @ApiOperation("修改厂家结算价")
+    @PostMapping("/updateSettlePrice")
+    public ResultBean updateSettlePrice(@RequestParam("sid") String sid, @RequestParam("settlePrice") String settlePrice);
+
     /**
      * 详情及修改回显
      *
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
index ebfe53a2eb..b671ec0691 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
@@ -72,6 +72,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/update无法访问");
     }
 
+    @Override
+    public ResultBean updateSettlePrice(String sid, String settlePrice) {
+        return null;
+    }
+
     @Override
     public ResultBean<BaseVehicleSelectVo> details(String sid) {
         return null;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
index 3bd9c61c2e..422a42e5a2 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
@@ -54,8 +54,11 @@ public class BaseVehicleVo implements Vo {
     private String locationName;
     @ApiModelProperty(value = "厂家订单编号")
     private String orderingNo;
-    @ApiModelProperty(value = "厂家结算价")
+    @ApiModelProperty(value = "入库价")
     private Integer costPrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer settlePrice;
+
     @ApiModelProperty(value = "运费")
     private Integer freight;
     @ApiModelProperty(value = "厂家合同价")
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 6994a39462..65510e0f02 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -44,6 +44,7 @@
         bv.locationName,
         bv.orderingNo,
         bv.costPrice,
+        bv.settlePrice,
         bv.freight,
         bv.contractPrice,
         bv.priceDate,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index 3f1398bf8c..a4fac146fb 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -685,6 +685,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setMsg("修改成功");
     }
 
+    @Override
+    public ResultBean updateSettlePrice(String sid, String settlePrice) {
+        return baseVehicleService.updateSettlePrice(sid,settlePrice);
+    }
+
     @Override
     public ResultBean<BaseVehicleSelectVo> details(String sid) {
         ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 764f32305d..5f13d5a8a2 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -86,6 +86,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -4438,4 +4440,30 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         baseMapper.updateVehicleYmd(vehiSid, settlementStatus, settlementStatusValue);
         return rb.success();
     }
+
+    public ResultBean updateSettlePrice(String sid, String settlePrice) {
+    ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(settlePrice)) {
+            return rb.setMsg("厂家结算价不能为空！");
+        }
+        if (!isNumeric(settlePrice)) {
+            return rb.setMsg("请填写整数");
+        }
+        BaseVehicle baseVehicle = fetchBySid(sid);
+        Integer i = Integer.valueOf(settlePrice);
+        baseVehicle.setSettlePrice(i);
+        baseMapper.updateById(baseVehicle);
+        return rb.success();
+    }
+
+
+    public boolean isNumeric(String str) {
+        Pattern pattern = Pattern.compile("[0-9]*");
+        System.out.println(str);
+        Matcher isNum = pattern.matcher(str);
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
 }
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 84604fda31..ac64a7fa7c 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
@@ -757,6 +757,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             // baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
             //厂家结算价
             baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
+            baseVehicleDto.setSettlePrice(Integer.parseInt(booad.getCostPrice().toString()));
 
             baseVehicleDto.setPriceDate(booad.getPriceDate());
             baseVehicleDto.setDepartureDate(booad.getDepartureDate());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
index 0004fb3074..6ffd3ee03d 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
@@ -549,6 +549,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setInsideCode(baseVehicle.getInsideCode());
                     if (StringUtils.isNotBlank(vehicleDetailsVo.getWitPinMoney())) {
                         baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
+                        baseVehicleDto.setSettlePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                         baseVehicleDto.setSalePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                         baseVehicleDto.setContractPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     }