From 30fd8fd808b1d8beb9241f4736f0bcc2b344fb76 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Mon, 5 Sep 2022 18:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehicle/VinByWarehouseQuery.java  |  5 ++
 .../base/biz/basevehicle/BaseVehicleRest.java |  2 +-
 .../biz/basevehicle/BaseVehicleService.java   |  3 +
 .../AppScmVehicleCarTransferSiteImageDto.java |  2 +-
 .../AppScmVehicleGressionDto.java             |  8 +--
 .../ScmVehicleGressionMapper.java             |  2 +-
 .../ScmVehicleGressionMapper.xml              |  2 +-
 .../ScmVehicleGressionService.java            | 63 +++++++++----------
 .../ScmVehicleGressionVehMapper.java          |  3 +
 .../ScmVehicleGressionVehService.java         |  9 +++
 .../AppCarTransferSiteImageDto.java           |  2 +-
 11 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java
index 0f7dbd954f..d1b87aa205 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java
@@ -4,6 +4,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class VinByWarehouseQuery implements Query {
     private static final long serialVersionUID = -4205300860994909841L;
@@ -19,4 +21,7 @@ public class VinByWarehouseQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vin;
+
+    @ApiModelProperty("已选择车架号")
+    private List<String> vins;
 }
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 cdedc53c31..61eafe9551 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
@@ -94,7 +94,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
                 DateTime currentDate = DateUtil.parse(today);
                 int i = priceDate.compareTo(currentDate);
                 long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
-                record.setLibraryAge(betweenDay*i*-1);
+                record.setLibraryAge(betweenDay * i * -1);
             }
         }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
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 ee8e1b4cef..7101fefe6a 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
@@ -1773,6 +1773,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(params.getUseOrgSid())) {
             qw.eq("bv.createOrgSid", params.getUseOrgSid());
         }
+        if (params.getVins().size() > 0) {
+            qw.notIn("bv.vinNo", params.getVins());
+        }
         qw.eq("bv.isDelete", 0);
         //库存或调入或采购退库中
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java
index 7813300e80..dcfd84d347 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java
@@ -19,7 +19,7 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto {
     private List<String> images;
 
     @ApiModelProperty("保单照片")
-    private String policyImages;
+    private List<String> policyImages;
 
     @ApiModelProperty("临牌")
     private String proCard;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
index 180752b972..fee108b20c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
@@ -63,10 +63,10 @@ public class AppScmVehicleGressionDto implements Dto {
     private List<String> vins;
     @ApiModelProperty("申请编号")
     private String applicantNo;
-    @ApiModelProperty("申请人")
-    private String applicantName;
-    @ApiModelProperty("申请日期")
-    private String applicantDate;
+//    @ApiModelProperty("申请人")
+//    private String applicantName;
+//    @ApiModelProperty("申请日期")
+//    private String applicantDate;
     @ApiModelProperty("现存地点")
     private String location;
     @ApiModelProperty("现存放地点")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
index 3aab47a37e..4ec3779d4d 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
@@ -114,7 +114,7 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
 
     String selectNum(String bill);
 
-    List<ScmVehicleGressionVo> getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid);
+    List<ScmVehicleGressionVo> getlastTimeEqual(@Param("sid") String sid, @Param("targetLocationSid") String targetLocationSid);
 
     @Select("SELECT count(*) FROM scm_vehicle_gression  WHERE useOrgSid = #{useOrgSid} and createBySid = #{userSid} and handleState = '1' ")
     int getToDoNum(@Param("useOrgSid") String useOrgSid, @Param("userSid") String userSid);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
index f6637c2b94..419906c8b4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
@@ -110,7 +110,7 @@
     <select id="getlastTimeEqual" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
         select *
         from scm_vehicle_gression
-        where vinNo = #{vinNo}
+        where sid = #{sid}
           and targetLocationSid = #{targetLocationSid}
           and LENGTH(nodeState) > 0
         order by id desc limit 1
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index a3bd631325..0880ba28c7 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmvehiclegression;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -397,26 +398,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 return rb.setMsg("该数据不存在");
             }
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
-//            if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
-//                List<String> factoryImage = dto.getPolicyImage();
-//                if (factoryImage.size() <= 0) {
-//                    return rb.setMsg("保单照片不能为空");
-//                }
-//                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
-//                for (String s : factoryImage) {
-//                    if (s.contains(fileUploadComponent.getUrlPrefix())) {
-//                        s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
-//                    }
-//                    ScmFile scmFile = new ScmFile();
-//                    scmFile.setAttachType(type);
-//                    scmFile.setFileName("保单照片");
-//                    scmFile.setFilePath(s1);
-//                    scmFile.setLinkSid(scmVehicleGression.getSid());
-//                    scmFileService.save(scmFile);
-//                }
-//            } else if ("0".equals(dto.getInsuranceStateKey())) {
-//                scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
-//            }
             updateById(scmVehicleGression);
             scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid());
             List<String> vins = dto.getVins();
@@ -493,6 +474,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(sid);
         String vin = StringUtils.join(vins, StringUtils.LF);
         vo.setVinNo(vin);
+        vo.setVins(vins);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
         if (scmFiles1.size() > 0) {
             for (ScmFile scmFile : scmFiles1) {
@@ -551,16 +533,21 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String s2 = "";
         String type1 = "04";
         String type2 = "05";
-        if (StringUtils.isNotBlank(dto.getPolicyImages())) {
-            scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
-            String policyImages = dto.getPolicyImages();
-            s1 = policyImages.replace(fileUploadComponent.getUrlPrefix(), "");
-            ScmFile scmFile = new ScmFile();
-            scmFile.setAttachType(type1);
-            scmFile.setFileName("保单照片");
-            scmFile.setFilePath(s1);
-            scmFile.setLinkSid(dto.getSid());
-            scmFileService.save(scmFile);
+
+        scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
+        List<String> policyImages = dto.getPolicyImages();
+        if (policyImages.size() > 0) {
+            for (String policyImage : policyImages) {
+                if (policyImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    s1 = policyImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile = new ScmFile();
+                scmFile.setAttachType(type1);
+                scmFile.setFileName("保单照片");
+                scmFile.setFilePath(s1);
+                scmFile.setLinkSid(dto.getSid());
+                scmFileService.save(scmFile);
+            }
         }
         scmFileService.deleteByLinkSidAndType(dto.getSid(), type2);
         List<String> images = dto.getImages();
@@ -679,11 +666,17 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
-        List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(dto.getVinNo(), dto.getTargetLocationSid());
-        if (scmVehicleGressionVos.size() > 0) {
-            if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
-                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
-                    return rb.setMsg("该申请已存在，请勿重复提交！");
+        List<String> vins = dto.getVins();
+        for (String vin : vins) {
+            List<String> sids = scmVehicleGressionVehService.fetchVoByVins(vin);
+            for (String sid : sids) {
+                List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid());
+                if (scmVehicleGressionVos.size() > 0) {
+                    if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
+                        if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                            return rb.setMsg("该申请中" + vin + "已存在，请勿重复提交！");
+                        }
+                    }
                 }
             }
         }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java
index a98f555755..a70106eb7e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java
@@ -72,4 +72,7 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper<ScmVehicleGressi
 
     @Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}")
     void deleteByMainSid(@Param("sid") String sid);
+
+    @Select("select * from scm_vehicle_gression_veh where vehVin =#{vin} ")
+    List<ScmVehicleGressionVehDetailsVo> fetchVoByVins(@Param("vin") String vin);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java
index bc84d11204..a42af723ec 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java
@@ -117,4 +117,13 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }
+
+    public List<String> fetchVoByVins(String vin) {
+        List<String> list = new ArrayList<>();
+        List<ScmVehicleGressionVehDetailsVo> vos = baseMapper.fetchVoByVins(vin);
+        for (ScmVehicleGressionVehDetailsVo vo : vos) {
+            list.add(vo.getMainSid());
+        }
+        return list;
+    }
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java
index 0d5ec6ac1b..3726bb2838 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java
@@ -19,7 +19,7 @@ public class AppCarTransferSiteImageDto implements Dto {
     private List<String> images;
 
     @ApiModelProperty("保单照片")
-    private String policyImages;
+    private List<String> policyImages;
 
     @ApiModelProperty("临牌")
     private String proCard;