From b66d677ed6972b043c1a8bff13c05e78927333d5 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 3 Nov 2022 10:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scmapplyinbound/ScmApplyInboundService.java  | 16 +++-------------
 .../ScmApplyInboundVehicleMapper.java            |  2 +-
 .../ScmApplyInboundVehicleMapper.xml             |  3 ---
 .../ScmApplyInboundVehicleService.java           |  4 ++--
 4 files changed, 6 insertions(+), 19 deletions(-)

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 a4dbc73f93..dc91e469b9 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
@@ -180,9 +180,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         ResultBean rb = ResultBean.fireFail();
         List<ScmFileDto> scmFiles = dto.getScmFiles();
         // 验证车架号：不能为空、不能重复
-        List<ScmApplyInboundVehicleDto> vehicleList1 = dto.getVehicleList();
+        /*List<ScmApplyInboundVehicleDto> vehicleList1 = dto.getVehicleList();
         List<String> vinNoList1 = vehicleList1.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
-        /*if (vehicleList.size() != vinNoList.size()) {
+        if (vehicleList.size() != vinNoList.size()) {
             return new ResultBean().fail().setMsg("车架号不能为空");
         }*/
         // 去重
@@ -190,16 +190,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (vinNoList1.size() != disCount) {
             return new ResultBean().fail().setMsg("车架号不能重复");
         }*/
-        for (String s : vinNoList1) {
-            ScmApplyInboundVehicleQuery scmApplyInboundVehicleQuery = new ScmApplyInboundVehicleQuery();
-            scmApplyInboundVehicleQuery.setVinNo(s);
-            List<ScmApplyInboundVehicle> scmApplyInboundVehicles = scmApplyInboundVehicleService.listAll(scmApplyInboundVehicleQuery);
-            if (scmApplyInboundVehicles.size() > 0){
-                return rb.setMsg("车架号" + s + "已存在入库申请中，请重新填写");
-            }
-        }
-
-
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             // 验证数据库是否重复
            /* for (int i = 0; i < vinNoList.size(); i++) {
@@ -263,7 +253,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             // 验证数据库是否重复
             for (int i = 0; i < vinNoList.size(); i++) {
-                int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i), dto.getSid());
+                int count = scmApplyInboundVehicleService.checkVinNo(vinNoList.get(i));
                 BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNoList.get(i), dto.getUseOrgSid()).getData();
                 if (count != 0) {
                     return new ResultBean().setMsg("车架号已经存在");
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java
index e9ad858c7b..ac31ccc1f4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.java
@@ -34,7 +34,7 @@ public interface ScmApplyInboundVehicleMapper extends BaseMapper<ScmApplyInbound
 	
 	IPage<ScmApplyInboundVehicleVo> selectPageVo(IPage<ScmApplyInboundVehicle> page, @Param(Constants.WRAPPER) Wrapper<ScmApplyInboundVehicle> qw);
 	
-	int checkVinNo(@Param("vinNo") String vinNo, @Param("applySid") String applySid);
+	int checkVinNo(@Param("vinNo") String vinNo);
 
 	List<ScmApplyInboundVehicleVo> selectListByAppSid(@Param("applySid") String applySid);
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml
index d1a4f45c52..64c3394345 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml
@@ -9,9 +9,6 @@
 
 	<select id="checkVinNo" resultType="int">
 		SELECT count(1) FROM scm_apply_inbound_vehicle WHERE vinNo=#{vinNo}
-		<if test="applySid != null and applySid !='' ">
-			AND applySid != #{applySid}
-		</if>
 	</select>
 
 	<select id="selectListByAppSid" resultType="com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo">
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java
index 95fedcca15..8bfdcef23e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleService.java
@@ -75,8 +75,8 @@ public class ScmApplyInboundVehicleService extends MybatisBaseService<ScmApplyIn
 	 * 验证车架号是否重复
 	 * @return
 	 */
-	public int checkVinNo(String vinNo, String applySid) {
-		return baseMapper.checkVinNo(vinNo, applySid);
+	public int checkVinNo(String vinNo) {
+		return baseMapper.checkVinNo(vinNo);
 	}
 
 	/**