From 10f596d1945a1a60190aeaccb92c27ea1aca5f6f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 4 Nov 2022 17:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=95=B0=E9=87=8F=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmVehiclePatrolinspectionsheetDto.java     |  1 +
 .../ScmVehicleInventoryService.java             |  8 ++++++--
 .../ScmVehiclePatrolinspectionMapper.java       |  2 +-
 .../ScmVehiclePatrolinspectionService.java      |  2 +-
 .../ScmVehiclePatrolinspectionsheetService.java | 17 ++++++++++++++---
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
index 9e961e7b80..36064f6fce 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java
@@ -103,4 +103,5 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
 
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
index 58ab59259a..fd15725899 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
@@ -26,7 +26,6 @@
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@@ -37,7 +36,10 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.InventoryRecordsQuery;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService;
@@ -468,6 +470,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
                 if (StringUtils.isNotBlank(dto.getOrgPath())) {
                     patrolinspectionsheetDto.setOrgPath(dto.getOrgPath());
                 }
+                patrolinspectionsheetDto.setNewAdd(newAdd);
                 scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
             }
             return rb.success().setMsg("保存成功");
@@ -534,6 +537,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             if (StringUtils.isNotBlank(dto.getOrgPath())) {
                 patrolinspectionsheetDto.setOrgPath(dto.getOrgPath());
             }
+            patrolinspectionsheetDto.setNewAdd(newAdd);
             scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
         }
         return rb.success().setMsg("保存成功");
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
index 365068e2b5..fe0a4625b3 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
@@ -104,7 +104,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
 
     //    @Delete("delete from scm_vehicle_patrolinspection where vinNo = #{vinNo} and id = #{id}")
-    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where vinNo = #{vinNo} and id = #{id} ")
+    @Update("update scm_vehicle_patrolinspection set isDelete = 1,state=0  where vinNo = #{vinNo} and id = #{id} ")
     void deleteByVinNo(@Param("vinNo") String vinNo, @Param("id") String id);
 
     List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
index f6d709f636..35bba19c05 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
@@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
@@ -295,6 +294,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             }
             if ("000".equals(pagerQuery.getParams().getState())) {
                 qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
+                qw.eq("svp.isDelete",0);
             }
             if ("001".equals(pagerQuery.getParams().getState())) {
                 qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
index 0637e5faf3..9eb38152e8 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
@@ -270,7 +270,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             if (list.size() > 0) {
                 String id = list.get(0).getId();
                 String mainSid = list.get(0).getSid();
-                if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())) {
+                /*if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())) {
+                    scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
+                    int count = baseMapper.selectByMainSidNum(mainSid);
+                    if (count > 0) {
+                        baseMapper.deleteByMainSid(mainSid);
+                    }
+                }*/
+                if ("000".equals(list.get(0).getStateKey())) {
                     scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
                     int count = baseMapper.selectByMainSidNum(mainSid);
                     if (count > 0) {
@@ -288,7 +295,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
             scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
             scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
-            scmVehiclePatrolinspection.setState(0);
+//            scmVehiclePatrolinspection.setState(0);
+            scmVehiclePatrolinspection.setState(1);
             scmVehiclePatrolinspection.setUseOrgSid(orgPath);
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
@@ -461,7 +469,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
         scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
         scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
-        scmVehiclePatrolinspection.setState(0);
+        Boolean newAdd = dto.getNewAdd();
+        if(newAdd){
+            scmVehiclePatrolinspection.setState(0);
+        }
         scmVehiclePatrolinspection.setPushState(dto.getPushState());
         scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);