diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
index d710445e2d..a49d26d9dd 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
@@ -85,4 +85,9 @@ public interface SysMappingFeign {
     @PostMapping("/selectMappingInfo")
     @ResponseBody
     public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
+
+    @ApiOperation("回显映射")
+    @GetMapping("/selectMappingListInfo/{dictSid}")
+    @ResponseBody
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(@PathVariable("dictSid") String dictSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
index 1aa609b3c8..69b4ad0a12 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
@@ -79,4 +79,9 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
index 0020c83dea..0f8c0efd34 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -67,4 +68,9 @@ public interface SysMappingMapper extends BaseMapper<SysMapping> {
     List<SysMappingVo> selectListVo();
 
     SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper<SysMappingInfoVo> qw);
+
+    List<SysMappingInfoVo> selectMappingListInfo(@Param("dictSid") String dictSid);
+
+    @Delete("delete from sys_mapping where dictSid = #{dictSid}")
+    void deleteByDictSid(@Param("dictSid") String dictSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
index 91f7ceda36..71dff95347 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
@@ -44,5 +44,16 @@
         LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode
         <where>${ew.sqlSegment}</where>
     </select>
+    <select id="selectMappingListInfo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo">
+        SELECT sm.dictSid,
+               sm.map_sourceKey,
+               sm.map_sourceValue,
+               sm.map_object,
+               sm.map_item,
+               sm.map_itemKey,
+               sm.map_itemValue
+        FROM sys_mapping sm
+        WHERE sm.dictSid = #{dictSid}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
index 19db2ebc09..b71b59ae62 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
@@ -110,4 +110,11 @@ public class SysMappingRest implements SysMappingFeign {
         SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+        ResultBean<List<SysMappingInfoVo>> rb = ResultBean.fireFail();
+        List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(dictSid);
+        return rb.success().setData(vo);
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
index 1475ffac0a..a2735afab6 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
@@ -135,11 +135,14 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     }
 
     public void saveMappingList(List<SysMappingDto> dto) {
-        for (SysMappingDto sysMappingDto : dto) {
-            SysMapping entity = new SysMapping();
-            BeanUtil.copyProperties(sysMappingDto, entity);
-            entity.setCreateBySid(sysMappingDto.getUserSid());
-            save(entity);
+        if (dto.size() > 0) {
+            baseMapper.deleteByDictSid(dto.get(0).getDictSid());
+            for (SysMappingDto sysMappingDto : dto) {
+                SysMapping entity = new SysMapping();
+                BeanUtil.copyProperties(sysMappingDto, entity);
+                entity.setCreateBySid(sysMappingDto.getUserSid());
+                save(entity);
+            }
         }
     }
 
@@ -163,4 +166,8 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
         SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw);
         return vo;
     }
+
+    public List<SysMappingInfoVo> selectMappingListInfo(String dictSid) {
+        return baseMapper.selectMappingListInfo(dictSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
index 8e42b5956e..af960ebebb 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
@@ -58,4 +58,9 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo {
     @ApiModelProperty("用户sid")
     private String userName;
 
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
index 14b81f7793..a1e03cf5be 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
@@ -118,11 +118,11 @@
     <select id="getMonthByMainSid"
             resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo">
         SELECT count(*),
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey != '001' and svi.mainSid = #{mainSid}) AS totalNumber,
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '004' and svi.mainSid = #{mainSid}) AS normalNumber ,
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '003' and svi.mainSid = #{mainSid}) AS lossNumber,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey != '003' and svi.mainSid = #{mainSid}) AS totalNumber,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '001' and svi.mainSid = #{mainSid}) AS normalNumber ,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '004' and svi.mainSid = #{mainSid}) AS lossNumber,
              (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '002' and svi.mainSid = #{mainSid}) AS damageNumber,
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '001' and svi.mainSid = #{mainSid}) AS profitNumber,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '003' and svi.mainSid = #{mainSid}) AS profitNumber,
              (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryState = '无' and svi.mainSid = #{mainSid}) AS surplusNumber
         FROM scm_vehicle_inventory svi
         WHERE svi.mainSid = #{mainSid}
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 81e7b9800a..1066a8c42c 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
@@ -99,7 +99,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     List<AppVinAndRemarksVo> getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey);
 
-    @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ")
+    @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid}")
     void updatePatrolInspectionState(@Param("sid") String sid);
 
     @Select("select * from scm_vehicle_patrolinspection where isDelete = 0 and mainSid = #{sid} and vinNo = #{vin}")
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 a6fa701df0..da3ea775ff 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
@@ -134,7 +134,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             String id = record.getId();
             String createOrgSid = record.getCreateOrgSid();
             List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(vinNo, id, createOrgSid);
-            if (scmVehicleStayPatrolinspectionVos.size() > 0){
+            if (scmVehicleStayPatrolinspectionVos.size() > 0) {
                 ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0);
                 record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
                 record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
@@ -147,7 +147,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             record.setLiableName(scmWarehouse.getLibTubeName());
             String sid1 = record.getSid();
             AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(sid1);
-            if (appScmVehiclePatrolinspectionsheetInfoVo != null){
+            if (appScmVehiclePatrolinspectionsheetInfoVo != null) {
                 record.setSituationExplain(appScmVehiclePatrolinspectionsheetInfoVo.getExplain());
                 record.setProblems(appScmVehiclePatrolinspectionsheetInfoVo.getProblems());
                 String sid = appScmVehiclePatrolinspectionsheetInfoVo.getSid();
@@ -209,6 +209,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
+        qw.and(wrapper -> wrapper.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001"));
         qw.eq("svp.isDelete", 0);
         if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
             qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
@@ -216,7 +217,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
             qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
         }
-        qw.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001");
         AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
         List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
@@ -328,15 +328,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.getMonthRemarksByMainSid(sid, stateKey);
     }
 
-    public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid,String vin) {
-        return baseMapper.selectByMandSid(sid,vin);
+    public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid, String vin) {
+        return baseMapper.selectByMandSid(sid, vin);
     }
 
     public void deleteByVinNo(String vinNo, String id) {
-        baseMapper.deleteByVinNo(vinNo,id);
+        baseMapper.deleteByVinNo(vinNo, id);
     }
 
-    public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo,String useOrgSid) {
-        return baseMapper.selectByVinNo(vinNo,useOrgSid);
+    public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo, String useOrgSid) {
+        return baseMapper.selectByVinNo(vinNo, useOrgSid);
     }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
index 38b2b47502..ebc5c259d5 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
@@ -21,21 +21,21 @@
 
     <select id="getInspection"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo">
-        SELECT sid,
-               mainSid          as recordSid,
-               vinNo            as vin,
-               model,
-               modelSid,
-               situationExplain as `explain`,
-               problems,
-               results,
-               dutyName         as liableName,
-               dutySid          as liableSid,
-               location,
-               address,
-               createBySid      as userSid
-        FROM scm_vehicle_patrolinspectionsheet
-        WHERE mainSid = #{recordSid}
+        SELECT svps.sid,
+               svps.mainSid          as recordSid,
+               svps.vinNo            as vin,
+               svps.model,
+               svps.modelSid,
+               svps.situationExplain as `explain`,
+               svps.problems,
+               svps.results,
+               svps.dutyName         as liableName,
+               svps.dutySid          as liableSid,
+               svps.location,
+               svps.address,
+               svps.createBySid      as userSid
+        FROM scm_vehicle_patrolinspectionsheet svps
+        WHERE svps.mainSid = #{recordSid}
     </select>
 
     <select id="getPCInspection"
@@ -76,7 +76,7 @@
                svp.patrolInspectionDate,
                svp.patrolInspectionName
         from scm_vehicle_patrolinspection svp
-                     left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
+                 left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
         where svp.sid = #{recordSid}
     </select>
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
index 28e5e82023..7220f29fe0 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
@@ -317,9 +317,9 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         //本次应盘数量
         vo.setTotalNumber(String.valueOf(appScmVehInventorymonthVo.getTotalNumber()));
 
-        String inventoryStateKey1 = "001";
-        String inventoryStateKey2 = "002";
-        String inventoryStateKey3 = "003";
+        String inventoryStateKey1 = "003";
+        String inventoryStateKey2 = "004";
+        String inventoryStateKey3 = "002";
         List<AppVinAndRemarksVo> profitRemarks = scmVehicleInventoryService.getMonthRemarksByMainSid(sid, inventoryStateKey1);
         String profitRemark = "";
         for (AppVinAndRemarksVo remark : profitRemarks) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
index 21023e0a7f..3004e8eb51 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
@@ -29,21 +29,28 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
+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.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
+import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -88,7 +95,13 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     @Autowired
     ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService;
     @Autowired
+    ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
+    @Autowired
     ScmVehPatrolinspectionreportService scmVehPatrolinspectionreportService;
+    @Autowired
+    FileUploadComponent fileUploadComponent;
+    @Autowired
+    ScmFileService scmFileService;
 
     private QueryWrapper<ScmVehPatrolinspectionmonth> createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -175,6 +188,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
         List<String> vinNoList = new ArrayList<>();
+        List<String> mainList = new ArrayList<>();
         List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
         List<AppScmInventoryRecordsVo> list = new ArrayList<>();
         if (patrolinspectionVos.size() > 0) {
@@ -186,7 +200,9 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 }
                 if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
                     String vinNo = patrolinspectionVo.getVinNo();
+                    String sid = patrolinspectionVo.getSid();
                     vinNoList.add(vinNo);
+                    mainList.add(sid);
                 }
                 if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
                     scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
@@ -221,6 +237,52 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
                 scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
             }
+            if (mainList.size() > 0) {
+                for (String sid : mainList) {
+                    AppScmVehiclePatrolinspectionsheetInfoVo inspection = scmVehiclePatrolinspectionsheetService.getInspection(sid);
+                    ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+                    scmVehiclePatrolinspection.setVinNo(inspection.getVin());
+                    scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
+                    BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), useOrgSid).getData();
+                    scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
+                    scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
+                    scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");
+                    scmVehiclePatrolinspection.setPatrolInspectionStateKey("001");
+                    scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+                    ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
+                    scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());
+                    scmVehiclePatrolinspectionsheet.setVinNo(inspection.getVin());
+                    scmVehiclePatrolinspectionsheet.setDutySid(inspection.getLiableSid());
+                    scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setCreateBySid(inspection.getUserSid());
+                    scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
+                    scmVehiclePatrolinspectionsheet.setModel(inspection.getModel());
+                    scmVehiclePatrolinspectionsheet.setModelSid(inspection.getModelSid());
+                    scmVehiclePatrolinspectionsheet.setLocation(inspection.getLocation());
+                    scmVehiclePatrolinspectionsheet.setAddress(inspection.getAddress());
+                    scmVehiclePatrolinspectionsheet.setProblems(inspection.getProblems());
+                    scmVehiclePatrolinspectionsheet.setSituationExplain(inspection.getExplain());
+                    scmVehiclePatrolinspectionsheet.setResults(inspection.getResults());
+                    scmVehiclePatrolinspectionsheetService.save(scmVehiclePatrolinspectionsheet);
+                    String s1 = "";
+                    String type = "06"; //巡检相关照片
+                    List<String> images = inspection.getImages();
+                    for (String s : images) {
+                        if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                            s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                        }
+                        ScmFile scmFile1 = new ScmFile();
+                        scmFile1.setAttachType(type);
+                        scmFile1.setFileName("巡检相关照片");
+                        scmFile1.setFilePath(s1);
+                        scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid());
+                        scmFileService.save(scmFile1);
+                    }
+                }
+            }
         } else {
             return rb.setMsg("暂无需要巡检记录");
         }