From a3d62aa721b062ae22ce0d86821524aacb0f5560 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 10 Jan 2024 17:48:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basevehicleout/BaseVehicleOutService.java | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 5f22cfa0c4..6e44d91c2c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -1493,6 +1493,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         for (BaseVehicleZSOutDto zcDto : zcDtos) {
             String price = zcDto.getPrice();
             totalDealPrice = totalDealPrice.add(new BigDecimal(price));
+            //查询出库的车辆是否满足出库条件
+            int count = baseMapper.selectCountByVinSid(zcDto.getVinSid());
+            if (count > 0) {
+                return rb.setMsg(zcDto.getVinNo() + "车辆不满足出库条件");
+            }
+            //查询是否已出库
+            int counts = baseMapper.selectCountBySidVin(zcDto.getVinSid());
+            if (counts > 0) {
+                return rb.setMsg("该车辆已出库，不允许重复出库");
+            }
         }
         baseVehicleOutApply.setTotalDealPrice(totalDealPrice.toString());
         //保存车辆出库单主表
@@ -1527,6 +1537,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         for (BaseVehicleZSOutDto dto : zcDtos) {
             String vinSid = dto.getVinSid();
             BaseVehicle baseVehicle1 = baseVehicleService.fetchBySid(vinSid);
+            //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
+            //String remarks = baseVehicleZSOutApplyDto.getContractNo() + baseVehicleZSOutApplyDto.getSaleTypeValue();
+            //baseVehicle1.setRemarks(remarks);
+            baseVehicle1.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
+            baseVehicle1.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
+            baseVehicle1.setSalesDate(new Date());
+            if (StringUtils.isNotBlank(dto.getPrice())) {
+                baseVehicle1.setSalePrice(Integer.valueOf(dto.getPrice()));
+            }
+            baseVehicleService.updateById(baseVehicle1);
             //获取主车sid
             List<BdCustomer> bdCustomers = new ArrayList<>();
             BdCustomer bdCustomer = new BdCustomer();
@@ -1552,16 +1572,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     finKingDeeFeign.saveBdCustomers(bdCustomers);
                 }
             }
-            //查询出库的车辆是否满足出库条件
-            int count = baseMapper.selectCountByVinSid(dto.getVinSid());
-            if (count > 0) {
-                return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件");
-            }
-            //查询是否已出库
-            int counts = baseMapper.selectCountBySidVin(dto.getVinSid());
-            if (counts > 0) {
-                return rb.setMsg("该车辆已出库，不允许重复出库");
-            }
             //查询主车对应的挂车或上装
             List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(dto.getVinSid());
             if (baseTrailerVos.size() > 0) {
@@ -1651,16 +1661,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //baseVehicleOut.setBillNo(billNo);
             //保存车辆出库单子表
             baseMapper.insert(baseVehicleOut);
-            //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
-            //String remarks = baseVehicleZSOutApplyDto.getContractNo() + baseVehicleZSOutApplyDto.getSaleTypeValue();
-            //baseVehicle1.setRemarks(remarks);
-            baseVehicle1.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
-            baseVehicle1.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
-            baseVehicle1.setSalesDate(new Date());
-            if (StringUtils.isNotBlank(dto.getPrice())) {
-                baseVehicle1.setSalePrice(Integer.valueOf(dto.getPrice()));
-            }
-            baseVehicleService.updateById(baseVehicle1);
+
             if (!"001".equals(payTypeKey)) {//贷款
                 try {
                     String temporaryNumZc = String.format("%02d", j);

From 5cbe53c91e9f625cc916cc99befc0daf6d781d7e Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 10 Jan 2024 17:59:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=AD=98=E9=94=80=E6=AF=94=E5=8F=96=E6=95=B4=EF=BC=9A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/dailyreport/DailyReportService.java   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
index 4f93630a56..a88e59ca6d 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
@@ -352,7 +352,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 if ("0".equals(saleAllToThree)) {
                     saleOfStockRatio = stock_total + ":1";
                 } else {
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
                 }
             }
             return saleOfStockRatio;
@@ -363,7 +363,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         if (saleAllToThreeAll == 0) {
             saleOfStockRatioString = stock_totalAll + ":1";
         } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);
@@ -616,7 +616,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                     if ("0".equals(dailyReportListVo.getSaleAllToThree())) {
                         ratio = dailyReportListVo.getStock_subtotal() + ":1";
                     } else {
-                        ratio = new BigDecimal(dailyReportListVo.getStock_subtotal()).divide((new BigDecimal(dailyReportListVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                        ratio = new BigDecimal(dailyReportListVo.getStock_subtotal()).divide((new BigDecimal(dailyReportListVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
                     }
                 }
                 dailyReportListVo.setSaleOfStockRatio(ratio);
@@ -641,7 +641,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             if ("0".equals(reportVo.getSaleAllToThree())) {
                 ratio = reportVo.getStock_subtotal() + ":1";
             } else {
-                ratio = new BigDecimal(reportVo.getStock_subtotal()).divide((new BigDecimal(reportVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                ratio = new BigDecimal(reportVo.getStock_subtotal()).divide((new BigDecimal(reportVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
             }
         }
         reportVo.setSaleOfStockRatio(ratio);
@@ -692,7 +692,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 if ("0".equals(saleAllToThree)) {
                     saleOfStockRatio = stock_total + ":1";
                 } else {
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
                 }
             }
             return saleOfStockRatio;
@@ -703,7 +703,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         if (saleAllToThreeAll == 0) {
             saleOfStockRatioString = stock_totalAll + ":1";
         } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);
@@ -979,7 +979,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 if ("0".equals(saleAllToThree)) {
                     saleOfStockRatio = stock_total + ":1";
                 } else {
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
                 }
             }
             return saleOfStockRatio;
@@ -990,7 +990,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         if (saleAllToThreeAll == 0) {
             saleOfStockRatioString = stock_totalAll + ":1";
         } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);
@@ -1292,7 +1292,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 if ("0".equals(saleAllToThree)) {
                     saleOfStockRatio = stock_total + ":1";
                 } else {
-                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                    saleOfStockRatio = new BigDecimal(stock_total).divide((new BigDecimal(saleAllToThree).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
                 }
             }
             return saleOfStockRatio;
@@ -1303,7 +1303,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         if (saleAllToThreeAll == 0) {
             saleOfStockRatioString = stock_totalAll + ":1";
         } else {
-            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 2, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+            saleOfStockRatioString = new BigDecimal(stock_totalAll).divide((new BigDecimal(saleAllToThreeAll).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
         }
         row4.add(saleOfStockRatioString);
         dailyReportAppVo.setRow4(row4);