盘库代码巡检代码修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AdministratorsListVo.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdministratorsListVo implements Vo {
+    private static final long serialVersionUID = 7538930552934742063L;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -382,11 +383,20 @@ public interface BaseVehicleFeign {
     @PostMapping("/getPcVinByWarehouseSid")
     public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(@RequestBody PagerQuery<VinByWarehouseQuery> pagerQuery);
 
-    @ApiOperation("根据用户sid 获取库存车辆信息")
+    @ApiOperation("盘库根据用户sid 获取库存车辆信息")
     @GetMapping("/selectInventoryRecords/{userSid}")
     public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("巡检根据用户sid 获取库存车辆信息")
+    @GetMapping("/selectPatrolinspections")
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(@RequestParam(value = "userSid") String userSid, @RequestParam(value = "vinNoList") List<String> vinNoList);
+
     @ApiOperation("根据车架号和分公司sid查询车辆信息")
     @PostMapping("/selectByVinNoAndOrgSid")
     ResultBean<BaseVehicle> selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid);
+
+    @ApiOperation("巡检获取车价号")
+    @PostMapping("/getInspectionVinList")
+    @ResponseBody
+    public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(@RequestBody PagerQuery<InspectionVinQuery> pagerQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -296,9 +296,19 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
+        return null;
+    }
+
     @Override
     public ResultBean<BaseVehicle> selectByVinNoAndOrgSid(String vinNo, String createOrgSid) {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(PagerQuery<InspectionVinQuery> pagerQuery) {
+        return null;
+    }
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class InspectionVinQuery implements Query {
+    private static final long serialVersionUID = -2243140628415411304L;
+
+    @ApiModelProperty("车架号")
+    private String name;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InspectionVinVo implements Vo {
+    private static final long serialVersionUID = -4983969999493350392L;
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("存放地点")
+    private String address;
+    @ApiModelProperty("存放地点")
+    private String addressSid;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+    @ApiModelProperty("仓库管理员")
+    private String administratorsName;
+    @ApiModelProperty("仓库管理员Sid")
+    private String administratorsSid;
+    @ApiModelProperty("仓库管理员")
+    List<AdministratorsListVo> administratorsList;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -452,7 +453,9 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}")
     void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid);
 
-    IPage<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVehPageList(IPage<BaseSpecialRebateDisGetVehVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    IPage<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVehPageList(IPage<BaseSpecialRebateDisGetVehVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    IPage<InspectionVinVo> getInspectionVinList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<InspectionVinVo> qw);
 
     List<BaseSpecialRebateDisGetVehVo> getVehBySpecialRebateSid(String specialRebateSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1143,4 +1143,19 @@
                      LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         WHERE ssv.`specialRebateSid` = #{specialRebateSid}
     </select>
+
+    <select id="getInspectionVinList" resultType="com.yxt.anrui.base.api.basevehicle.InspectionVinVo">
+        select
+            sid as carSid,
+            vinNo as vin,
+            location as addressSid,
+            locationName as address,
+            modelName as  model,
+            modelSid
+        from
+            base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -866,6 +866,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.selectInventoryRecords(userSid);
     }
 
+    @Override
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
+        return baseVehicleService.selectPatrolinspections(userSid,vinNoList);
+    }
+
     @Override
     public ResultBean<BaseVehicle> selectByVinNoAndOrgSid(String vinNo, String createOrgSid) {
         ResultBean rb = ResultBean.fireFail();
@@ -873,5 +878,15 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(baseVehicle);
     }
 
+    @Override
+    public ResultBean<PagerVo<InspectionVinVo>> getInspectionVinList(PagerQuery<InspectionVinQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<InspectionVinVo> page = new PagerVo<>();
+        IPage<InspectionVinVo> iPage = baseVehicleService.getInspectionVinList(pagerQuery);
+        PagerVo<InspectionVinVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<InspectionVinVo>>().success().setData(pagerVo);
+    }
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -33,6 +33,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 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.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
@@ -96,6 +100,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private BaseVehmodelConfigService baseVehmodelConfigService;
     @Autowired
     private BaseVehicleTempstateService baseVehicleTempstateService;
+    @Autowired
+    private ScmWarehouseFeign scmWarehouseFeign;
 
     /**
      * 车辆信息分页列表
@@ -1685,6 +1691,17 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(list);
     }
 
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(String userSid, List<String> vinNoList) {
+        ResultBean rb = ResultBean.fireFail();
+        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        //条件：本分公司、非删除、库存或采购退库中或调入或调出中
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+        qw.notIn("bv.vinNo", vinNoList);
+        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid, qw);
+        return rb.success().setData(list);
+    }
+
     public ResultBean<List<BaseExistingCarListVo>> selExistingCar(String createOrgSid) {
         ResultBean rb = ResultBean.fireFail();
         List<String> stringList = baseVehinstallService.selectListVo(createOrgSid);
@@ -2420,7 +2437,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         qw.eq("bv.isDelete", 0);
         qw.eq("bv.createOrgSid", params.getCreateOrgSid());
         qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode());
-        if (params.getVehSids().size() > 0){
+        if (params.getVehSids().size() > 0) {
             qw.notIn("bv.sid", params.getVehSids());
         }
         return baseMapper.specialRebateDisGetVehPageList(page, qw);
@@ -2496,4 +2513,25 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         List<BaseSpecialRebateDisGetVehVo> baseSpecialRebateDisGetVehVos = baseMapper.getVehBySpecialRebateSid(specialRebateSid);
         return rb.success().setData(baseSpecialRebateDisGetVehVos);
     }
+
+    public IPage<InspectionVinVo> getInspectionVinList(PagerQuery<InspectionVinQuery> pagerQuery) {
+        IPage<AppScmVehiclePatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
+            qw.eq("bv.vinNo", pagerQuery.getParams().getName());
+        }
+        qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid());
+        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()));
+        IPage<InspectionVinVo> iPage = baseMapper.getInspectionVinList(page, qw);
+        for (InspectionVinVo record : iPage.getRecords()) {
+            String addressSid = record.getAddressSid();
+            ScmWarehouseVo data = scmWarehouseFeign.selectByAddressSid(addressSid).getData();
+            record.setAdministratorsSid(data.getLibTubeSid());
+            record.setAdministratorsName(data.getLibTubeName());
+        }
+        return iPage;
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageVo.java

@@ -13,6 +13,9 @@ public class AppScmVehicleCarInventoryListPageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("车架号")
+    private String mainSid;
+
     @ApiModelProperty("合格证状态")
     private String certificateState;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java

@@ -18,6 +18,12 @@ public class AppScmVehiclePatrolinspectionPageQuery implements Query {
     @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31")
     private String date;
 
+    @ApiModelProperty("巡检结果")
+    private String state;
+
+    @ApiModelProperty("月度巡检sid")
+    private String reportSid;
+
     @ApiModelProperty("盘库开始日期")
     @JsonProperty("patrolinspectionStartDate")
     private String patrolinspectionStartDate;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java

@@ -14,6 +14,12 @@ public class AppScmVehiclePatrolinspectionPageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("巡检结果")
+    private String state;
+
+    @ApiModelProperty("巡检结果")
+    private String stateKey;
+
     @ApiModelProperty("月度管理sid")
     private String mainSid;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -74,15 +76,14 @@ public interface ScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean<ScmVehiclePatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("手机端-获取待巡检列表")
+    @PostMapping("/getInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery);
+
     @ApiOperation("手机端-获取巡检记录列表")
     @PostMapping("/getCarInspectionList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery);
 
-    @ApiOperation("手机端-巡检详情")
-    @PostMapping("/getInspectionInfo/{recordSid}")
-    @ResponseBody
-    public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(@PathVariable("recordSid") String recordSid);
-
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -69,14 +71,12 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+	public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
+	public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
 		return null;
 	}
-
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java

@@ -51,14 +51,18 @@ public class ScmVehiclePatrolinspectionVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
-    private String mainSid; // 车架号
+    private String vinNo; // 车架号
-	@ApiModelProperty("存放地点")
+    @ApiModelProperty("月度巡检sid")
+    private String mainSid; // 月度巡检sid
+    @ApiModelProperty("存放地点")
     private String location; // 存放地点
-	@ApiModelProperty("巡检日期")
+    @ApiModelProperty("巡检日期")
     private String patrolInspectionDate; // 巡检日期
-	@ApiModelProperty("巡检人员")
+    @ApiModelProperty("巡检人员")
     private String patrolInspectionName; // 巡检人员
-	@ApiModelProperty("巡检状态（通过/不通过）")
+    @ApiModelProperty("巡检状态（通过/不通过）")
     private String patrolInspectionState; // 巡检状态（通过/不通过）
+    @ApiModelProperty("巡检状态（通过/不通过）")
+    private String patrolInspectionStateKey; // 巡检状态（通过/不通过）
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListDto.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLiableListDto implements Dto {
+    private static final long serialVersionUID = 6773133691586837274L;
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLiableListVo implements Vo {
+
+    private static final long serialVersionUID = -6937435770815613231L;
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppPatrolinspectionDto.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
+
+import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppPatrolinspectionDto implements Dto {
+    private static final long serialVersionUID = -6618342081512558213L;
+
+    @ApiModelProperty("巡检sid")
+    private String mainSid;
+
+    @ApiModelProperty("消息内容")
+    private String msgContent;
+
+    @ApiModelProperty("接收人sid")
+    private List<AppLiableListDto> list;
+
+    @ApiModelProperty("接收人id")
+    private List<String> receiveIdList;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatroVo.java

@@ -1,9 +1,10 @@
-package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -14,8 +15,11 @@ import java.util.List;
 @Data
 public class AppScmVehiclePatroVo implements Vo {
     private static final long serialVersionUID = 4433285895858153789L;
+
+    private String sid;
+
     @ApiModelProperty("车架号")
-    private String mainSid;
+    private String vinNo;
     @ApiModelProperty("车型")
     private String model;
     @ApiModelProperty("巡检日期")
@@ -26,14 +30,22 @@ public class AppScmVehiclePatroVo implements Vo {
     private String location;
     @ApiModelProperty("巡检情况说明")
     private String situationExplain;
-    @ApiModelProperty("存在的问题及处理结果")
+    @ApiModelProperty("存在问题")
-    private String problemsAndResults;
+    private String problems;
+    @ApiModelProperty("处理结果")
+    private String results;
     @ApiModelProperty("相关附件")
-    private List<String> images;
+    private List<String> images = new ArrayList<>();
-    @ApiModelProperty(value = "sid")
+    @ApiModelProperty("相关责任人")
-    private String sid;
+    private List<AppLiableListVo> liableList = new ArrayList<>();
+    @ApiModelProperty("相关责任人")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
     @ApiModelProperty(value = "定位地址")
     private String address;
     @ApiModelProperty(value = "经纬度")
     private String addressCode;
+    @ApiModelProperty("巡检结果")
+    private String state;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java

@@ -1,9 +1,11 @@
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -20,20 +22,29 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+
     @ApiModelProperty("巡检情况说明")
     private String explain;
 
-    @ApiModelProperty("存在的问题及处理结果")
+    @ApiModelProperty("存在问题")
-    private String result;
+    private String problems;
+
+    @ApiModelProperty("处理结果")
+    private String results;
 
     @ApiModelProperty("相关责任人")
-    private String liableName;
+    private List<AppLiableListVo> liableList = new ArrayList<>();
 
     @ApiModelProperty("相关责任人")
+    private String liableName;
+
+    @ApiModelProperty("相关责任人sid")
     private String liableSid;
 
     @ApiModelProperty("相关照片")
-    private List<String> images;
+    private List<String> images = new ArrayList<>();
 
     @ApiModelProperty("经纬度")
     private String location;
@@ -44,4 +55,7 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo {
     @ApiModelProperty("用户sid")
     private String userSid;
 
+    @ApiModelProperty("用户sid")
+    private String userName;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionsheet.java <br/>
+ * Class: anrui_scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet <br/>
+ * Description: 巡检单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "巡检单", description = "巡检单")
+@TableName("scm_vehicle_patrolinspectionsheet")
+public class AppScmVehiclePatrolinspectionsheetVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("巡检记录sid")
+    private String mainSid; // 巡检记录sid
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型")
+    private String model; // 车型
+    @ApiModelProperty("巡检情况说明")
+    private String situationExplain; // 巡检情况说明
+    @ApiModelProperty("存在问题及处理结果")
+    private String problemsAndResults; // 存在问题及处理结果
+    @ApiModelProperty("相关责任人")
+    private String dutyName;
+    @ApiModelProperty("相关责任人sid")
+    private String dutySid;
+    @ApiModelProperty("经纬度")
+    private String location;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("创建组织")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织")
+    private String useOrgSid;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java

@@ -59,8 +59,10 @@ public class ScmVehiclePatrolinspectionsheet extends BaseEntity {
     private String model; // 车型
     @ApiModelProperty("巡检情况说明")
     private String situationExplain; // 巡检情况说明
-    @ApiModelProperty("存在问题及处理结果")
+    @ApiModelProperty("存在问题")
-    private String problemsAndResults; // 存在问题及处理结果
+    private String problems;
+    @ApiModelProperty("处理结果")
+    private String results;
     @ApiModelProperty("相关责任人")
     private String dutyName;
     @ApiModelProperty("相关责任人sid")
@@ -72,6 +74,6 @@ public class ScmVehiclePatrolinspectionsheet extends BaseEntity {
     @ApiModelProperty("创建组织")
     private String createOrgSid;
     @ApiModelProperty("使用组织")
-    private String useOrgName;
+    private String useOrgSid;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
@@ -51,6 +52,7 @@ import java.util.List;
 @ApiModel(value = "巡检单 数据传输对象", description = "巡检单 数据传输对象")
 public class ScmVehiclePatrolinspectionsheetDto implements Dto {
 
+    private static final long serialVersionUID = -506609460264934786L;
     private String sid;
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
@@ -62,12 +64,12 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String model; // 车型
     @ApiModelProperty("巡检情况说明")
     private String situationExplain; // 巡检情况说明
-    @ApiModelProperty("存在问题及处理结果")
+    @ApiModelProperty("存在问题")
-    private String problemsAndResults; // 存在问题及处理结果
+    private String problems;
+    @ApiModelProperty("处理结果")
+    private String results;
     @ApiModelProperty("相关责任人")
-    private String dutyName;
+    private List<AppLiableListDto> liableList;
-    @ApiModelProperty("相关责任人sid")
-    private String dutySid;
     @ApiModelProperty("经纬度")
     private String location;
     @ApiModelProperty("详细地址")
@@ -82,8 +84,14 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String createOrgSid;
     @ApiModelProperty("使用组织")
     private String useOrgName;
-
+    @ApiModelProperty("车况")
-    @ApiModelProperty(value = "state")
+    private String carConditionValue;
-    private int state;
+    @ApiModelProperty("车况")
-
+    private String carConditionKey;
+    @ApiModelProperty("新增状态值")
+    private Boolean newAdd;
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+    @ApiModelProperty("存放地点")
+    private String warehouse;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet;
 
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -84,6 +85,11 @@ public interface ScmVehiclePatrolinspectionsheetFeign {
     @ResponseBody
     public ResultBean<AppScmVehiclePatrolinspectionsheetInfoVo> getInspection(@PathVariable("recordSid") String recordSid);
 
+    @ApiOperation("手机端-巡检详情")
+    @PostMapping("/getInspectionInfo/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(@PathVariable("recordSid") String recordSid);
+
     @ApiOperation("手机端-提交巡检操作")
     @PostMapping("/saveInspection")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeignFallback.java

@@ -78,6 +78,11 @@ public class ScmVehiclePatrolinspectionsheetFeignFallback implements ScmVehicleP
 		return null;
 	}
 
+	@Override
+	public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean saveInspection(ScmVehiclePatrolinspectionsheetDto dto) {
 		return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageVo.java

@@ -13,6 +13,9 @@ public class AppScmVehicleStayPatrolinspectionPageVo implements Vo {
     @ApiModelProperty("sid")
     private String sid;
 
+    @ApiModelProperty("月度巡检sid")
+    private String mainSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 
@@ -28,7 +31,10 @@ public class AppScmVehicleStayPatrolinspectionPageVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
-    @ApiModelProperty("暂存状态")
+    @ApiModelProperty("巡检结果")
-    private boolean state;
+    private String resultKey;
+
+    @ApiModelProperty("巡检结果")
+    private String resultValue;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java

@@ -75,11 +75,6 @@ public interface ScmVehicleStayPatrolinspectionFeign {
     public ResultBean<ScmVehicleStayPatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
 
-    @ApiOperation("手机端-获取巡检列表")
-    @PostMapping("/getInspectionList")
-    @ResponseBody
-    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery);
-
     @ApiOperation("手机端-查询本分公司下代办数量")
     @GetMapping("/getToDoNum/{userSid}")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java

@@ -70,10 +70,6 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt
 		return rb.setMsg("接口anrui_scm/scmvehiclestaypatrolinspection/fetchDetailsBySid无法访问");
 	}
 
-	@Override
-	public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
-		return null;
-	}
 
 	@Override
 	public ResultBean<String> getToDoNum(String userSid) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionVo.java

@@ -61,8 +61,4 @@ public class ScmVehicleStayPatrolinspectionVo implements Vo {
     private String patrolInspectionDate; // 上次巡检日期
 	@ApiModelProperty("上次巡检人员")
     private String patrolInspectionName; // 上次巡检人员
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-    @ApiModelProperty("车型名称")
-    private String modelName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonth.java

@@ -50,15 +50,17 @@ import lombok.Data;
 public class ScmVehInventorymonth extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("编号（yyyyMMdd）")
+    @ApiModelProperty("编号（yyyyMMdd）")
     private String billNo; // 编号（yyyyMMdd）
-	@ApiModelProperty("创建组织")
+    @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织")
+    @ApiModelProperty("使用组织")
     private String useOrgSid; // 使用组织
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
+    @ApiModelProperty("创建人")
+    private String createByName;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: aaa(aaa) <br/>
  * File: ScmVehInventorymonthVo.java <br/>
@@ -53,6 +55,8 @@ public class ScmVehInventorymonthVo implements Vo {
 
 	@ApiModelProperty("编号（yyyyMMdd）")
     private String billNo; // 编号（yyyyMMdd）
+    @ApiModelProperty("创建时间")
+    private Date createTime; // 使用组织名称
 	@ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
 	@ApiModelProperty("创建组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java

@@ -30,6 +30,10 @@ public class AppScmVehPatrolinspectionmonthVo implements Vo {
     private String notHandledNumber;
     @ApiModelProperty("实际巡检数量")
     private String actualNumber;
+    @ApiModelProperty("报告状态")
+    private int state;
+    @ApiModelProperty("是否显示生成报告按钮")
+    private Boolean showReportBtn;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java

@@ -50,15 +50,17 @@ import lombok.Data;
 public class ScmVehPatrolinspectionmonth extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("编号（yyyyMMdd）")
+    @ApiModelProperty("编号（yyyyMMdd）")
     private String billNo; // 编号（yyyyMMdd）
-	@ApiModelProperty("创建组织")
+    @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织")
+    @ApiModelProperty("使用组织")
     private String useOrgSid; // 使用组织
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
+    @ApiModelProperty("创建人")
+    private String createByName;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java

@@ -53,8 +53,8 @@ import java.util.List;
  */
 @Api(tags = "月度日常管理记录")
 @FeignClient(
-        contextId = "aaa-ScmVehPatrolinspectionmonth",
+        contextId = "anrui-scm-ScmVehPatrolinspectionmonth",
-        name = "aaa",
+        name = "anrui-scm",
         path = "v1/scmvehpatrolinspectionmonth",
         fallback = ScmVehPatrolinspectionmonthFeignFallback.class)
 public interface ScmVehPatrolinspectionmonthFeign {
@@ -85,7 +85,7 @@ public interface ScmVehPatrolinspectionmonthFeign {
     public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-获取巡检报告列表")
-    @PostMapping("/getCarInventoryReportList")
+    @PostMapping("/getCarInspectionReportList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehPatrolinspectionmonthVo>> getCarInspectionReportList(@RequestBody PagerQuery<AppScmVehPatrolinspectionmonthQuery> pagerQuery);
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java

@@ -51,15 +51,18 @@ public class ScmVehPatrolinspectionmonthVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("编号（yyyyMMdd）")
+    @ApiModelProperty("编号（yyyyMMdd）")
     private String billNo; // 编号（yyyyMMdd）
-	@ApiModelProperty("创建组织")
+    @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织")
+    @ApiModelProperty("使用组织")
     private String useOrgSid; // 使用组织
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("巡检报告生成状态")
+    private int state;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java

@@ -27,4 +27,6 @@ public class VehPatrolinspectionmonthVo implements Vo {
     private int notHandledNumber;
     @ApiModelProperty("实际巡检数量")
     private int actualNumber;
+    @ApiModelProperty("正常的数量")
+    private int normalNumber;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "日常管理报告")
 @FeignClient(
-        contextId = "aaa-ScmVehPatrolinspectionreport",
+        contextId = "anrui-scm-ScmVehPatrolinspectionreport",
-        name = "aaa",
+        name = "anrui-scm",
         path = "v1/scmvehpatrolinspectionreport",
         fallback = ScmVehPatrolinspectionreportFeignFallback.class)
 public interface ScmVehPatrolinspectionreportFeign {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java

@@ -67,4 +67,8 @@ public interface ScmWarehouseFeign {
     @ApiOperation("手机端-获取仓库")
     @GetMapping("/selectWarehouseByUserSid/{userSid}")
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("巡检获取仓库管理人")
+    @GetMapping("/selectByAddressSid/{addressSid}")
+    public ResultBean<ScmWarehouseVo> selectByAddressSid(@PathVariable("addressSid") String addressSid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java

@@ -73,4 +73,9 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
+        return null;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java

@@ -140,4 +140,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
     List<ScmVehicleStayInventoryVo> selectInventory(@Param("vin") String vin, @Param("id") String id, @Param("createOrgSid") String createOrgSid);
 
     List<String> selectByUseOrgSid(@Param("createOrgSid") String createOrgSid);
+
+
+    List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@@ -51,7 +51,7 @@
         <where>
             ${ew.sqlSegment}
             <if test="names != '' and names != null ">
-                and concat(svi.vinNo,svi.InventoryName) LIKE concat('%', #{names}, '%')
+                and concat(svi.vinNo) LIKE concat('%', #{names}, '%')
             </if>
         </where>
         ORDER BY id DESC
@@ -153,15 +153,23 @@
         order by id desc
     </select>
 
+    <select id="getInventoryAll"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo">
+        SELECT
+            sid,
+            mainSid,
+            vinNo AS vin,
+            InventoryState AS `state`,
+            inventorySid,
+            inventoryName,
+            remarks,
+            InventoryDate as newInventoryDate,
+            location as newWarehouse,
+            InventoryName as newInventoryName
+        FROM
+            scm_vehicle_inventory svi
+        where svi.useOrgSid = #{useOrgSid}
+        order by id desc
+    </select>
 
-    <!--    <select id="selInventory"-->
-    <!--            resultType="com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo">-->
-    <!--        select InventoryDate as lastDate,-->
-    <!--               InventoryName as lastName-->
-    <!--        from scm_vehicle_inventory svi-->
-    <!--        where svi.vinNo = #{vin}-->
-    <!--          and svi.id &lt; #{ids}-->
-    <!--          and svi.createOrgSid = #{createOrgSid}-->
-    <!--        ORDER BY svi.id DESC-->
-    <!--    </select>-->
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -28,17 +28,20 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.itextpdf.text.pdf.PRAcroForm;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 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.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
 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.biz.scmfile.ScmFileService;
+import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
@@ -49,6 +52,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -86,6 +90,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     ScmFileService scmFileService;
     @Autowired
     FileUploadComponent fileUploadComponent;
+    @Autowired
+    ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
 
     private QueryWrapper<ScmVehicleInventory> createQueryWrapper(ScmVehicleInventoryQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -433,6 +439,18 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             }
             updateById(scmVehicleInventory);
         }
+        if (!"001".equals(dto.getInventoryStateKey())) {
+            ScmVehiclePatrolinspectionsheetDto patrolinspectionsheetDto = new ScmVehiclePatrolinspectionsheetDto();
+            patrolinspectionsheetDto.setVinNo(dto.getVinNo());
+            patrolinspectionsheetDto.setProblems(dto.getRemarks());
+            patrolinspectionsheetDto.setWarehouse(dto.getLocation());
+            patrolinspectionsheetDto.setWarehouseSid(dto.getLocationSid());
+            patrolinspectionsheetDto.setUserSid(dto.getLoginSid());
+            patrolinspectionsheetDto.setUserName(dto.getLoginName());
+            patrolinspectionsheetDto.setLocation(dto.getAddressCode());
+            patrolinspectionsheetDto.setAddress(dto.getAddress());
+            scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
+        }
         return rb.success().setMsg("保存成功");
     }
 
@@ -541,4 +559,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     public List<AppVinAndRemarksVo> getMonthRemarksByMainSid(String sid, String inventoryStateKey) {
         return baseMapper.getMonthRemarksByMainSid(sid, inventoryStateKey);
     }
+
+    public List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid) {
+        return baseMapper.getInventoryAll(useOrgSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -31,10 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -61,8 +66,8 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
 
-    @Select("select * from scm_vehicle_patrolinspection")
+    @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} ")
-    List<ScmVehiclePatrolinspectionVo> selectListVo();
+    List<ScmVehiclePatrolinspectionVo> selectListVo(@Param("useOrgSid") String useOrgSid);
 
     /**
      * 手机端-获取巡检记录列表
@@ -74,10 +79,26 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
      */
     IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw, @Param("name") String name);
 
-    AppScmVehiclePatroVo getInspectionInfo(String recordSid);
-
-    @Select("select count(*) from scm_vehicle_patrolinspection svp where svp.useOrgSid = #{useOrgSid} and patrolInspectionStateKey = '000' ")
-    int getPatrolinspectionState(String useOrgSid);
 
     VehPatrolinspectionmonthVo getMonthByMainSid(@Param("mainSid") String mainSid);
+
+    /**
+     * 手机端-获取巡检列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
+
+    List<ScmVehicleStayPatrolinspectionVo> selPatrolinspection(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid);
+
+
+    int updateByMainSid(@Param("stateKey") String stateKey, @Param("stateValue") String stateValue, @Param("newDate") String newDate, @Param("newName") String newName, @Param("mainSid") String mainSid);
+
+    List<AppVinAndRemarksVo> getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey);
+
+    @Select("update scm_vehicle_patrolinspection set isDelete = 1 where sid = #{sid} ")
+    void updateBySid(@Param("sid") String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -27,6 +27,8 @@
         vinNo as vin,
         mainSid,
         location as warehouse,
+        patrolInspectionState as `state`,
+        patrolInspectionStateKey as stateKey,
         patrolInspectionDate as newInspectionDate,
         patrolInspectionName as newInspectionName
         FROM scm_vehicle_patrolinspection svp
@@ -40,31 +42,67 @@
         </where>
         ORDER BY id DESC
     </select>
-
-    <select id="getInspectionInfo" resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatroVo">
-        select svp.mainSid,
-               svp.patrolInspectionDate,
-               svp.patrolInspectionName,
-               svp.location,
-               svss.situationExplain,
-               svss.problemsAndResults,
-               svss.model,
-               svss.sid,
-               svss.address,
-               svss.location as addressCode
-        from scm_vehicle_patrolinspection svp
-                 left join scm_vehicle_patrolinspectionsheet svss on svss.patrolInspectionSid = svp.sid
-        where svp.sid = #{recordSid}
-    </select>
     <select id="getMonthByMainSid"
             resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo">
         SELECT count(*),
-            (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
-            (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svp.patrolInspectionStateKey = '001'  and svp.mainSid = #{mainSid}) AS unHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber,
-            (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svp.patrolInspectionStateKey = '002'  and svp.mainSid = #{mainSid}) AS processedNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
-            (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svp.patrolInspectionStateKey = '000'  and svp.mainSid = #{mainSid}) AS notHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber,
-            (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svp.patrolInspectionStateKey = '000' and svi.mainSid = #{mainSid})  AS surplusNumber
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber
         FROM scm_vehicle_patrolinspection svp
         WHERE svp.mainSid = #{mainSid}
     </select>
+    <select id="getInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo">
+        SELECT
+        svp.id,
+        svp.sid,
+        svp.vinNo AS vin,
+        svp.mainSid,
+        svp.location AS warehouse,
+        svp.patrolInspectionDate AS inspectionName,
+        svp.patrolInspectionName AS inspectionDate,
+        svp.patrolInspectionStateKey AS resultKey,
+        svp.patrolInspectionState AS resultValue
+        FROM
+        scm_vehicle_patrolinspection svp
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svp.vinNo) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
+    <select id="selPatrolinspection"
+            resultType="com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo">
+        select *
+        from scm_vehicle_patrolinspection svp
+        where svp.mainSid = #{vin}
+          and svp.id &lt; #{id}
+          and svp.createOrgSid = #{useOrgSid}
+        ORDER BY id DESC
+    </select>
+    <select id="getMonthRemarksByMainSid"
+            resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo">
+        select
+            svps.vinNo,
+            svps.problems as remarks
+        from scm_vehicle_patrolinspection svp
+            left join scm_vehicle_patrolinspectionsheet svps on svp.sid = svps.mainSid
+        where svp.mainSid = #{sid}
+          and svp.patrolInspectionStateKey = #{stateKey}
+    </select>
+
+    <update id="updateByMainSid">
+        update scm_vehicle_patrolinspection
+        set patrolInspectionStateKey = #{stateKey},
+            patrolInspectionState    =#{stateValue},
+            patrolInspectionDate     =#{newDate},
+            patrolInspectionName     =#{newName}
+        where sid = #{mainSid}
+    </update>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -95,6 +97,17 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmVehicleStayPatrolinspectionPageVo> page = new PagerVo<>();
+        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = scmVehiclePatrolinspectionService.getInspectionList(pagerQuery);
+        PagerVo<AppScmVehicleStayPatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>>().success().setData(pagerVo);
+    }
+
     @Override
     public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
         if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
@@ -105,9 +118,4 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
         PagerVo<AppScmVehiclePatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>>().success().setData(pagerVo);
     }
-
-    @Override
-    public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
-        return scmVehiclePatrolinspectionService.getInspectionInfo(recordSid);
-    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -31,6 +31,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -129,6 +133,51 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return vo;
     }
 
+    /**
+     * 手机端-获取巡检列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehicleStayPatrolinspectionPageVo> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
+        IPage<AppScmVehicleStayPatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
+            qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
+            qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
+        }
+        qw.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001");
+        qw.eq("svp.isDelete", 0);
+        AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
+        List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
+        for (AppScmVehicleStayPatrolinspectionPageVo record : records) {
+            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid);
+            if (scmVehicleStayPatrolinspectionVos.size() > 0) {
+                for (ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo : scmVehicleStayPatrolinspectionVos) {
+                    if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate() == null) {
+                        record.setInspectionDate("无");
+                    } else {
+                        record.setInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
+                    }
+                    if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionName() == null) {
+                        record.setInspectionName("无");
+                    } else {
+                        record.setInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
+                    }
+                }
+            } else {
+                record.setInspectionDate("无");
+                record.setInspectionName("无");
+            }
+        }
+        return iPage;
+    }
+
     /**
      * 手机端-获取巡检记录列表
      *
@@ -146,32 +195,46 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             paramsQuery.setPatrolinspectionStartDate(s[0]);
             paramsQuery.setPatrolinspectionEndDate(s[1]);
         }
-        QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
-        AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
-        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getName());
-        return iPage;
-    }
-
-    /**
-     * 手机端-获取巡检记录列表 查询条件
-     *
-     * @param query
-     * @return
-     */
-    private QueryWrapper<AppScmVehiclePatrolinspectionPageVo> appCarQueryWrapper(AppScmVehiclePatrolinspectionPageQuery query) {
         QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
-            qw.eq("svp.createOrgSid", query.getUseOrgSid());
+            qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
         }
-        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
-            qw.eq("svp.locationSid", query.getWarehouseSid());
+            qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
         }
-        String patrolinspectionStartDate = query.getPatrolinspectionStartDate();
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getReportSid())) {
-        String patrolinspectionEndDate = query.getPatrolinspectionEndDate();
+            qw.eq("svp.mainSid", pagerQuery.getParams().getReportSid());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) {
+            if ("01".equals(pagerQuery.getParams().getState())) {
+                qw.eq("svp.state", "1");
+            }
+            if ("02".equals(pagerQuery.getParams().getState())) {
+                qw.ne("svp.patrolInspectionStateKey", "000");
+            }
+            if ("000".equals(pagerQuery.getParams().getState())) {
+                qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
+            }
+            if ("001".equals(pagerQuery.getParams().getState())) {
+                qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
+            }
+            if ("002".equals(pagerQuery.getParams().getState())) {
+                qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
+            }
+            if ("003".equals(pagerQuery.getParams().getState())) {
+                qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
+            }
+        } else {
+            qw.eq("svp.patrolInspectionStateKey", "002").or().eq("svp.patrolInspectionStateKey", "003");
+        }
+        String patrolinspectionStartDate = pagerQuery.getParams().getPatrolinspectionStartDate();
+        String patrolinspectionEndDate = pagerQuery.getParams().getPatrolinspectionEndDate();
         qw.apply(StringUtils.isNotEmpty(patrolinspectionStartDate), "date_format (patrolInspectionDate,'%Y-%m-%d') >= date_format('" + patrolinspectionStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(patrolinspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolinspectionEndDate + "','%Y-%m-%d')"
                 );
-        return qw;
+        AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getName());
+        return iPage;
     }
 
     /**
@@ -181,38 +244,22 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
      * @return
      */
     public void updatePatrolInspectionState(String sid) {
-        ScmVehiclePatrolinspection scmVehiclePatrolinspection = fetchBySid(sid);
+        baseMapper.updateBySid(sid);
-        scmVehiclePatrolinspection.setPatrolInspectionState("通过");
-        updateById(scmVehiclePatrolinspection);
     }
 
-    public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
+    public List<ScmVehiclePatrolinspectionVo> selectListAll(String useOrgSid) {
-        ResultBean<AppScmVehiclePatroVo> rb = ResultBean.fireFail();
+        return baseMapper.selectListVo(useOrgSid);
-        AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid);
-        String type1 = "06"; // 巡检相关照片
-        List<String> images = new ArrayList<>();
-        List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
-        if (scmFiles1.size() > 0) {
-            for (ScmFile scmFile : scmFiles1) {
-                images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
-            }
-            vo.setImages(images);
-        } else {
-            vo.setImages(images);
-        }
-        return rb.success().setData(vo);
-    }
-
-    public boolean getPatrolinspectionState(String userSid) {
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getPatrolinspectionState(useOrgSid);
-        if (count == 0) {
-            return false;
-        }
-        return true;
     }
 
     public VehPatrolinspectionmonthVo getMonthByMainSid(String mainSid) {
         return baseMapper.getMonthByMainSid(mainSid);
     }
+
+    public void updateByMainSid(String stateKey, String stateValue, String newDate, String newName, String mainSid) {
+        baseMapper.updateByMainSid(stateKey, stateValue, newDate, newName, mainSid);
+    }
+
+    public List<AppVinAndRemarksVo> getMonthRemarksByMainSid(String sid, String stateKey) {
+        return baseMapper.getMonthRemarksByMainSid(sid, stateKey);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java

@@ -29,10 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -76,10 +74,14 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
     AppScmVehiclePatrolinspectionsheetInfoVo getInspection(@Param("recordSid") String recordSid);
 
     @Update("update scm_vehicle_patrolinspectionsheet set patrolInspectionSid = #{sid1} where sid = #{sid}")
-    void updatePatSid(@Param("sid") String sid,@Param("sid1") String sid1);
+    void updatePatSid(@Param("sid") String sid, @Param("sid1") String sid1);
 
     @Select("SELECT * FROM scm_vehicle_patrolinspectionsheet WHERE patrolInspectionSid = #{sid}")
     ScmVehiclePatrolinspectionsheetDetailsVo fetchSheetBySid(String sid);
 
     ScmVehiclePatrolinspectionsheetDetailsVo getPCInspection(String sid);
+
+    AppScmVehiclePatrolinspectionsheetVo selectByMainSid(@Param("mainSid") String mainSid);
+
+    AppScmVehiclePatroVo getInspectionInfo(String recordSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml

@@ -18,17 +18,20 @@
     <select id="getInspection"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo">
         SELECT sid,
-               patrolInspectionSid as recordSid,
+               mainSid          as recordSid,
-               mainSid             as vin,
+               vinNo            as vin,
                model,
-               situationExplain    as `explain`,
+               modelSid,
-               problemsAndResults  as `result`,
+               situationExplain as `explain`,
-               dutyName            as liableName,
+               problems,
-               dutySid             as liableSid,
+               results,
+               dutyName         as liableName,
+               dutySid          as liableSid,
                location,
-               address
+               address,
+               createBySid      as userSid
         FROM scm_vehicle_patrolinspectionsheet
-        WHERE patrolInspectionSid = #{recordSid}
+        WHERE mainSid = #{recordSid}
     </select>
 
     <select id="getPCInspection"
@@ -46,4 +49,30 @@
         FROM scm_vehicle_patrolinspectionsheet
         WHERE mainSid = #{sid}
     </select>
+    <select id="selectByMainSid"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetVo">
+        SELECT *
+        FROM scm_vehicle_patrolinspectionsheet
+        WHERE mainSid = #{mainSid}
+    </select>
+    <select id="getInspectionInfo"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo">
+        select svps.sid,
+               svps.vinNo,
+               svps.situationExplain,
+               svps.problems,
+               svps.results,
+               svps.model,
+               svps.address,
+               svps.location             as addressCode,
+               svps.dutyName             as liableName,
+               svps.dutySid              as liableSid,
+               svp.patrolInspectionState as state,
+               svp.location,
+               svp.patrolInspectionDate,
+               svp.patrolInspectionName
+        from scm_vehicle_patrolinspection svp
+                 left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
+        where svp.sid = #{recordSid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetRest.java

@@ -25,8 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet;
 
-import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -107,6 +111,13 @@ public class ScmVehiclePatrolinspectionsheetRest implements ScmVehiclePatrolinsp
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppScmVehiclePatroVo vo = scmVehiclePatrolinspectionsheetService.getInspectionInfo(recordSid);
+        return rb.success().setData(vo);
+    }
+
     @Override
     public ResultBean saveInspection(ScmVehiclePatrolinspectionsheetDto dto) {
         ResultBean rb = ResultBean.fireFail();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -26,19 +26,43 @@
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+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.AppScmVehiclePatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
-import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonth;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
 import com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionService;
+import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
+import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService;
+import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
 import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.JPushServer;
+import com.yxt.messagecenter.api.message.AppMessageDto;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MsgTargetUriEnum;
+import com.yxt.messagecenter.api.messagelist.MessageListDto;
+import com.yxt.messagecenter.api.messagelist.MessageListFeign;
+import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
+import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -52,9 +76,16 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -81,9 +112,29 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
     @Autowired
     ScmVehicleStayPatrolinspectionService scmVehicleStayPatrolinspectionService;
     @Autowired
+    ScmVehPatrolinspectionmonthService scmVehPatrolinspectionmonthService;
+    @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysUserFeign sysUserFeign;
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+
+    /**
+     * 消息类型:0002手机端
+     */
+    public static final String IDENTIFIER = "0002";
+    @Autowired
+    ScmVehInventorymonthService scmVehInventorymonthService;
+    @Autowired
+    private MessageFeign messageFeign;
+    @Autowired
+    private MessageTypeFeign messageTypeFeign;
+    @Autowired
+    private MessageListFeign messageListFeign;
+    @Autowired
+    ScmWarehouseService scmWarehouseService;
+
 
     private QueryWrapper<ScmVehiclePatrolinspectionsheet> createQueryWrapper(ScmVehiclePatrolinspectionsheetQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -144,12 +195,26 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         List<String> images = new ArrayList<>();
         AppScmVehiclePatrolinspectionsheetInfoVo vo = baseMapper.getInspection(recordSid);
         if (vo == null) {
-            AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = new AppScmVehiclePatrolinspectionsheetInfoVo();
+            AppScmVehiclePatrolinspectionsheetInfoVo patrolinspectionsheetInfoVo = new AppScmVehiclePatrolinspectionsheetInfoVo();
-            List<String> stringList = new ArrayList<>();
+            ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.fetchBySid(recordSid);
-            appScmVehiclePatrolinspectionsheetInfoVo.setImages(stringList);
+            patrolinspectionsheetInfoVo.setVin(scmVehiclePatrolinspection.getVinNo());
-            appScmVehiclePatrolinspectionsheetInfoVo.setRecordSid(recordSid);
+            BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(scmVehiclePatrolinspection.getVinNo()).getData();
-            return appScmVehiclePatrolinspectionsheetInfoVo;
+            patrolinspectionsheetInfoVo.setModel(data.getModelName());
+            patrolinspectionsheetInfoVo.setModelSid(data.getModelSid());
+            patrolinspectionsheetInfoVo.setRecordSid(recordSid);
+            return patrolinspectionsheetInfoVo;
         }
+
+        List<AppLiableListVo> list = new ArrayList<>();
+        List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
+        List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
+        for (int i = 0; i < splitName.size(); i++) {
+            AppLiableListVo v = new AppLiableListVo();
+            v.setLiableName(splitName.get(i));
+            v.setLiableSid(splitSid.get(i));
+            list.add(v);
+        }
+        vo.setLiableList(list);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
         if (scmFiles1.size() > 0) {
             for (ScmFile scmFile : scmFiles1) {
@@ -159,10 +224,40 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         } else {
             vo.setImages(images);
         }
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(vo.getUserSid()).getData();
+        vo.setUserName(sysUserVo.getName());
         vo.setRecordSid(recordSid);
         return vo;
     }
 
+    public AppScmVehiclePatroVo getInspectionInfo(String recordSid) {
+        String type1 = "06"; // 巡检相关照片
+        AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid);
+        if (StringUtils.isNotBlank(vo.getLiableName())) {
+            List<AppLiableListVo> list = new ArrayList<>();
+            List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
+            List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
+            for (int i = 0; i < splitName.size(); i++) {
+                AppLiableListVo v = new AppLiableListVo();
+                v.setLiableName(splitName.get(i));
+                v.setLiableSid(splitSid.get(i));
+                list.add(v);
+            }
+            vo.setLiableList(list);
+        }
+        List<String> images = new ArrayList<>();
+        List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
+        if (scmFiles1.size() > 0) {
+            for (ScmFile scmFile : scmFiles1) {
+                images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            }
+            vo.setImages(images);
+        } else {
+            vo.setImages(images);
+        }
+        return vo;
+    }
+
     /**
      * 手机端-保存巡检操作
      *
@@ -174,12 +269,49 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         ResultBean rb = ResultBean.fireFail();
         String s1 = "";
         String type1 = "06"; //巡检相关照片
+        String oneKey = "001";
+        String oneValue = "问题未解决";
+        String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        ScmVehiclePatrolinspectionsheetDetailsVo pcInspection = baseMapper.getPCInspection(dto.getMainSid());
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
-        if (pcInspection == null) {
+        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
+        Boolean newAdd = dto.getNewAdd();
+        if (newAdd) {
+            List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
+            ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null;
+            if (monthVoList.size() > 0) {
+                scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+            } else {
+                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid());
+                monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
+                scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+            }
+            ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+            scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+            scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
+            scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
+            scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
+            scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
+            scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
+            scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+            scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+
             BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
+            List<AppLiableListDto> liableList = dto.getLiableList();
+            String DutyName = "";
+            String DutySid = "";
+            for (AppLiableListDto appLiableListDto : liableList) {
+                DutyName = appLiableListDto.getLiableName() + "," + DutyName;
+                DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
+            }
+            scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
+            scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
             scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
+            scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+            scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
             save(scmVehiclePatrolinspectionsheet);
             scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
@@ -194,29 +326,235 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
                 scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid());
                 scmFileService.save(scmFile1);
             }
-            return rb.success();
+            List<String> receiveIdList = new ArrayList<>();
-        } else {
+            for (AppLiableListDto appLiableListDto : liableList) {
-            dto.setCreateOrgSid(useOrgSid);
+                SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData();
-            dto.setSid(pcInspection.getSid());
+                Integer id = sysUserVos.getId();
-            int i = updateBySid(dto, pcInspection.getSid());
+                receiveIdList.add(String.valueOf(id));
-            if (i == 0) {
-                return rb.setMsg("操作失败");
             }
-            scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
+            AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto();
-            List<String> images = dto.getImages();
+            appPatrolinspectionDto.setMsgContent(sysUserVo.getName());
-            for (String s : images) {
+            appPatrolinspectionDto.setList(liableList);
-                if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+            appPatrolinspectionDto.setMainSid(dto.getMainSid());
-                    s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            appPatrolinspectionDto.setReceiveIdList(receiveIdList);
+            // 消息推送
+            sendMessage(appPatrolinspectionDto);
+            return rb.success().setMsg("添加成功");
+        }
+        BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
+        scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+        scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
+        List<AppLiableListDto> liableList = dto.getLiableList();
+        String DutyName = "";
+        String DutySid = "";
+        for (AppLiableListDto appLiableListDto : liableList) {
+            DutyName = appLiableListDto.getLiableName() + "," + DutyName;
+            DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
+        }
+        scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
+        scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
+        scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
+        List<String> images = dto.getImages();
+        for (String s : images) {
+            if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            ScmFile scmFile1 = new ScmFile();
+            scmFile1.setAttachType(type1);
+            scmFile1.setFileName("巡检相关照片");
+            scmFile1.setFilePath(s1);
+            scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid());
+            scmFileService.save(scmFile1);
+        }
+        save(scmVehiclePatrolinspectionsheet);
+        scmVehiclePatrolinspectionService.updateByMainSid(oneKey, oneValue, newDate, sysUserVo.getName(), dto.getMainSid());
+        List<String> receiveIdList = new ArrayList<>();
+        for (AppLiableListDto appLiableListDto : liableList) {
+            SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData();
+            Integer id = sysUserVos.getId();
+            receiveIdList.add(String.valueOf(id));
+        }
+        AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto();
+        appPatrolinspectionDto.setMsgContent(sysUserVo.getName());
+        appPatrolinspectionDto.setList(liableList);
+        appPatrolinspectionDto.setMainSid(dto.getMainSid());
+        appPatrolinspectionDto.setReceiveIdList(receiveIdList);
+        // 消息推送
+        sendMessage(appPatrolinspectionDto);
+        return rb.success();
+    }
+
+    /**
+     * 手机端-盘库推送保存巡检操作
+     *
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean savePatrolinspectionsheet(ScmVehiclePatrolinspectionsheetDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String s1 = "";
+        String type1 = "06"; //巡检相关照片
+        String oneKey = "001";
+        String oneValue = "问题未解决";
+
+        ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        //查询是否有月度巡检记录
+        List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
+        ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null;
+        if (monthVoList.size() > 0) { // 有 根据生成巡检月度报告 判断 是否已生成报告
+
+            scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+
+            if (scmVehPatrolinspectionmonthVo.getState() == 0) {
+                // 否 继续走新增
+                scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+
+            } else if (scmVehPatrolinspectionmonthVo.getState() == 1) {
+                // 是 先生成月度巡检 和 巡检记录
+                scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid());
+                monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
+                scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+
+            }
+        } else { // 否 先生成月度巡检 和 巡检记录
+
+            scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid());
+            monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
+            scmVehPatrolinspectionmonthVo = monthVoList.get(0);
+
+        }
+
+        ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+        scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+        scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
+        scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
+        scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
+        scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
+        scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
+        scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+        scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+        scmVehiclePatrolinspection.setState(0);
+        scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+
+        BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
+        ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(dto.getWarehouseSid());
+        scmVehiclePatrolinspectionsheet.setDutyName(scmWarehouse.getLibTubeName());
+        scmVehiclePatrolinspectionsheet.setDutySid(scmWarehouse.getLibTubeSid());
+        scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+        scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
+        scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+        scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
+        BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
+        scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
+        scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
+        save(scmVehiclePatrolinspectionsheet);
+
+        scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
+        List<String> images = dto.getImages();
+        if (images != null) {
+            if (images.size() > 0) {
+                for (String s : images) {
+                    if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    ScmFile scmFile1 = new ScmFile();
+                    scmFile1.setAttachType(type1);
+                    scmFile1.setFileName("巡检相关照片");
+                    scmFile1.setFilePath(s1);
+                    scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid());
+                    scmFileService.save(scmFile1);
                 }
-                ScmFile scmFile1 = new ScmFile();
-                scmFile1.setAttachType(type1);
-                scmFile1.setFileName("巡检相关照片");
-                scmFile1.setFilePath(s1);
-                scmFile1.setLinkSid(dto.getSid());
-                scmFileService.save(scmFile1);
             }
-            return rb.success();
         }
+
+        List<String> receiveIdList = new ArrayList<>();
+        SysUserVo sysUserVos = sysUserFeign.fetchBySid(scmWarehouse.getLibTubeSid()).getData();
+        Integer id = sysUserVos.getId();
+        receiveIdList.add(String.valueOf(id));
+        List<AppLiableListDto> liableList = new ArrayList<>();
+        AppLiableListDto appLiableListDto = new AppLiableListDto();
+        appLiableListDto.setLiableName(scmWarehouse.getLibTubeName());
+        appLiableListDto.setLiableSid(scmWarehouse.getLibTubeSid());
+        liableList.add(appLiableListDto);
+        AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto();
+        appPatrolinspectionDto.setMsgContent(sysUserVo.getName());
+        appPatrolinspectionDto.setList(liableList);
+        appPatrolinspectionDto.setMainSid(dto.getMainSid());
+        appPatrolinspectionDto.setReceiveIdList(receiveIdList);
+        // 消息推送
+        sendMessage(appPatrolinspectionDto);
+        return rb.success().setMsg("添加成功");
+    }
+
+    /**
+     * 保存消息、发出推送
+     *
+     * @throws InterruptedException
+     */
+    public void sendMessage(AppPatrolinspectionDto appPatrolinspectionDto) {
+        // 1、保存消息体
+        AppMessageDto messageDto = new AppMessageDto();
+        ResultBean<List<MessageTypeVo>> messageBean = messageTypeFeign.selectAppMsgTypeList(IDENTIFIER);
+        if (messageBean.getSuccess() && messageBean.getData() != null) {
+            List<MessageTypeVo> typeVoList = messageBean.getData();
+            for (MessageTypeVo message : typeVoList) {
+                if (message.getMsgType().equals("供应链")) {
+                    messageDto.setMsgTypeSid(message.getMsgTypeSid());
+                    messageDto.setMsgType(message.getMsgType());
+                }
+            }
+        }
+        messageDto.setMsgTitle("月度巡检问题");
+        messageDto.setMsgContent(appPatrolinspectionDto.getMsgContent() + "提交的月度巡检问题,请查阅");
+        messageDto.setMsgSource("供应链");
+        messageDto.setMsgTargetUri(MsgTargetUriEnum.GYLXJWT.getUri());
+        messageDto.setApp_type("2");
+        messageDto.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd");
+        JSONObject json = new JSONObject();
+        json.put("recordSid", appPatrolinspectionDto.getMainSid());
+        messageDto.setArgs_json(json.toJSONString());
+        String msgSid = (String) messageFeign.saveOrUpdateAppMessage(messageDto).getData();
+        String msgTypeSid = messageDto.getMsgTypeSid();
+        // 2、保存至消息列表
+        List<AppLiableListDto> list = appPatrolinspectionDto.getList();
+        // 使用多线程保存
+        List<Future<?>> futures = new ArrayList<Future<?>>();
+        ExecutorService executor = Executors.newFixedThreadPool(4);
+        for (AppLiableListDto appLiableListDto : list) {
+            Future<?> f = executor.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
+                        MessageListDto messageList = new MessageListDto();
+                        messageList.setMsgSid(msgSid);
+                        messageList.setRDelStatus(0);
+                        messageList.setSDelStatus(0);
+                        messageList.setReceiverSid(appLiableListDto.getLiableSid());
+                        messageListFeign.save(messageList);
+//						 Thread.sleep(5 * 1000);
+                        System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            futures.add(f);
+        }
+        executor.shutdown();
+        for (int i = 0; i < appPatrolinspectionDto.getReceiveIdList().size(); i++) {
+            /**
+             * msgTitle:排产申请
+             * content:xxx的排产申请
+             */
+            JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, "供应链", appPatrolinspectionDto.getReceiveIdList().get(i));
+        }        // 3、推送
+//        JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType());
+//		JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名
+        System.out.println("process end");
     }
 
     /**
@@ -228,27 +566,35 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
     @Transactional(rollbackFor = Exception.class)
     public ResultBean submitInspection(ScmVehiclePatrolinspectionsheetDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isNotBlank(dto.getDutyName())) {
-            return rb.setMsg("选择相关责任人后，不允许点击通过");
-        }
-        if (StringUtils.isNotBlank(dto.getDutySid())) {
-            return rb.setMsg("选择相关责任人后，不允许点击通过");
-        }
         String s1 = "";
         String type1 = "06"; //巡检相关照片
-        String patrolInspectionSid = dto.getMainSid();
+        String twoKey = "002";
-        String newTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        String twoValue = "问题已解决";
-        ScmVehiclePatrolinspectionsheetDetailsVo pcInspection = baseMapper.getPCInspection(patrolInspectionSid);
+        String threeKey = "003";
+        String threeValue = "正常";
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
-        SysStaffOrg data = sysStaffOrgFeign.getOrgByStaffSid(staffSid).getData();
+        String mainSid = dto.getMainSid();
-        if (pcInspection != null) {
+        String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-            dto.setCreateOrgSid(useOrgSid);
+        AppScmVehiclePatrolinspectionsheetVo vo = baseMapper.selectByMainSid(mainSid);
-            int i = updateBySid(dto, dto.getSid());
+        if (vo == null) {
-            if (i == 0) {
+            ScmVehiclePatrolinspectionsheet patrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
-                return rb.setMsg("操作失败");
+            BeanUtil.copyProperties(dto, patrolinspectionsheet, "sid");
+            patrolinspectionsheet.setUseOrgSid(useOrgSid);
+            patrolinspectionsheet.setCreateOrgSid(useOrgSid);
+            patrolinspectionsheet.setCreateBySid(dto.getUserSid());
+            List<AppLiableListDto> liableList = dto.getLiableList();
+            if (liableList.size() > 0) {
+                String DutyName = "";
+                String DutySid = "";
+                for (AppLiableListDto appLiableListDto : liableList) {
+                    DutyName = appLiableListDto.getLiableName() + "," + DutyName;
+                    DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
+                }
+                patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
+                patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
             }
-            scmFileService.deleteByLinkSidAndType(dto.getSid(), type1);
+            scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
             for (String s : images) {
                 if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@@ -258,57 +604,43 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
                 scmFile1.setAttachType(type1);
                 scmFile1.setFileName("巡检相关照片");
                 scmFile1.setFilePath(s1);
-                scmFile1.setLinkSid(dto.getSid());
+                scmFile1.setLinkSid(patrolinspectionsheet.getSid());
                 scmFileService.save(scmFile1);
             }
-            ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = scmVehicleStayPatrolinspectionService.fetchBySid(patrolInspectionSid);
+            save(patrolinspectionsheet);
-            scmVehicleStayPatrolinspectionService.updateByStaySid(patrolInspectionSid, newTime, dto.getUserName());
+            scmVehiclePatrolinspectionService.updateByMainSid(threeKey, threeValue, newDate, sysUserVo.getName(), dto.getMainSid());
-            ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+        } else {
-            scmVehiclePatrolinspection.setMainSid(scmVehicleStayPatrolinspection.getMainSid());
+            ScmVehiclePatrolinspectionsheet patrolinspectionsheet = fetchBySid(vo.getSid());
-            scmVehiclePatrolinspection.setPatrolInspectionState("1");
+            BeanUtil.copyProperties(dto, patrolinspectionsheet, "sid");
-            scmVehiclePatrolinspection.setLocation(scmVehicleStayPatrolinspection.getLocation());
+            patrolinspectionsheet.setUseOrgSid(useOrgSid);
-            scmVehiclePatrolinspection.setLocationSid(scmVehicleStayPatrolinspection.getLocationSid());
+            patrolinspectionsheet.setCreateOrgSid(useOrgSid);
-            scmVehiclePatrolinspection.setPatrolInspectionDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+            patrolinspectionsheet.setCreateBySid(dto.getUserSid());
-            scmVehiclePatrolinspection.setPatrolInspectionName(dto.getUserName());
+            List<AppLiableListDto> liableList = dto.getLiableList();
-            scmVehiclePatrolinspection.setUseOrgSid(dto.getCreateOrgSid());
+            String DutyName = "";
-            scmVehiclePatrolinspection.setCreateOrgSid(dto.getCreateOrgSid());
+            String DutySid = "";
-            scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+            for (AppLiableListDto appLiableListDto : liableList) {
-            baseMapper.updatePatSid(pcInspection.getSid(), scmVehiclePatrolinspection.getSid());
+                DutyName = appLiableListDto.getLiableName() + "," + DutyName;
-            return rb.success().setMsg("操作成功");
+                DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
-        }
-        ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
-        BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
-        String sid = scmVehiclePatrolinspectionsheet.getSid();
-        scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
-        scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
-        List<String> images = dto.getImages();
-        for (String s : images) {
-            if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
             }
-            ScmFile scmFile1 = new ScmFile();
+            patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
-            scmFile1.setAttachType(type1);
+            patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
-            scmFile1.setFileName("巡检相关照片");
+            scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1);
-            scmFile1.setFilePath(s1);
+            List<String> images = dto.getImages();
-            scmFile1.setLinkSid(sid);
+            for (String s : images) {
-            scmFileService.save(scmFile1);
+                if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                ScmFile scmFile1 = new ScmFile();
+                scmFile1.setAttachType(type1);
+                scmFile1.setFileName("巡检相关照片");
+                scmFile1.setFilePath(s1);
+                scmFile1.setLinkSid(patrolinspectionsheet.getSid());
+                scmFileService.save(scmFile1);
+            }
+            updateById(patrolinspectionsheet);
+            scmVehiclePatrolinspectionService.updateByMainSid(twoKey, twoValue, newDate, sysUserVo.getName(), dto.getMainSid());
         }
-        ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = scmVehicleStayPatrolinspectionService.fetchBySid(patrolInspectionSid);
+        return rb.success();
-        scmVehicleStayPatrolinspectionService.updateByStaySid(patrolInspectionSid, newTime, dto.getUserName());
-        ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
-        scmVehiclePatrolinspection.setMainSid(scmVehicleStayPatrolinspection.getMainSid());
-        scmVehiclePatrolinspection.setPatrolInspectionState("1");
-        scmVehiclePatrolinspection.setLocation(scmVehicleStayPatrolinspection.getLocation());
-        scmVehiclePatrolinspection.setLocationSid(scmVehicleStayPatrolinspection.getLocationSid());
-        scmVehiclePatrolinspection.setPatrolInspectionDate(newTime);
-        scmVehiclePatrolinspection.setPatrolInspectionName(dto.getUserName());
-        scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
-        scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
-        scmVehiclePatrolinspection.setSid(scmVehicleStayPatrolinspection.getSid());
-        scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
-        scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
-        save(scmVehiclePatrolinspectionsheet);
-        return rb.success().setMsg("操作成功");
     }
 
     public ResultBean<ScmVehiclePatrolinspectionsheetDetailsVo> fetchSheetBySid(String sid) {
@@ -334,4 +666,25 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         vo.setImages(images);
         return vo;
     }
+
+    public String getApplyCode() {
+        String billNo = "";
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("+8"));
+        String pattern = "yyyyMM";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        String bill = formatter.format(now);
+        String i = scmVehPatrolinspectionmonthService.selectNum(bill);
+        if (StringUtils.isNotBlank(i)) {
+            billNo = getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
+    public static String getBillNo(String bill, int i) {
+        String num = String.format("%02d", i + 1); // 不足2位补0
+        String billNo = bill + num;
+        return billNo;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java

@@ -68,20 +68,8 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
     @Select("select * from scm_vehicle_stay_patrolinspection where isDelete = 0 and createOrgSid = #{orgSid}")
     List<ScmVehicleStayPatrolinspectionVo> selectListVo(String orgSid);
 
-    /**
-     * 手机端-获取巡检列表
-     *
-     * @param page
-     * @param qw
-     * @param name
-     * @return
-     */
-    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
-
-
     void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName);
 
-    List<ScmVehicleStayPatrolinspectionVo> selPatrolinspection(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid);
 
     @Select("SELECT count(*) FROM scm_vehicle_stay_patrolinspection  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ")
     int getToDoNum(@Param("useOrgSid") String useOrgSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml

@@ -35,40 +35,6 @@
         <where>${ew.sqlSegment}</where>
     </select>
 
-    <select id="getInventoryList"
-            resultType="com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo">
-        SELECT
-        svsp.id,
-        svsp.sid,
-        svsp.mainSid AS vin,
-        svsp.location AS warehouse,
-        svsp.patrolInspectionDate AS inspectionName,
-        svsp.patrolInspectionName AS inspectionDate,
-        svsp.modelName AS model,
-        case svsp.state when 1 then 0
-        when 2 then 1 end as state
-        FROM
-        scm_vehicle_stay_patrolinspection svsp
-        <where>
-            ${ew.sqlSegment}
-            <if test="names != '' and names != null ">
-                and concat(svsp.mainSid) LIKE concat('%', #{names}, '%')
-            </if>
-        </where>
-        ORDER BY id DESC
-    </select>
-
-    <select id="selPatrolinspection"
-            resultType="com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo">
-        select patrolInspectionDate,
-               patrolInspectionName
-        from scm_vehicle_stay_patrolinspection svsp
-        where svsp.mainSid = #{vin}
-          and svsp.id &lt; #{id}
-          and svsp.createOrgSid = #{useOrgSid}
-        ORDER BY id DESC
-    </select>
-
     <update id="updateByStaySid">
         update scm_vehicle_stay_patrolinspection
         set isDelete             = 1,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java

@@ -95,16 +95,6 @@ public class ScmVehicleStayPatrolinspectionRest implements ScmVehicleStayPatroli
         return rb.success().setData(vo);
     }
 
-    @Override
-    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
-        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
-            new ResultBean<>().success().setMsg("用户sid不能为空");
-        }
-        PagerVo<AppScmVehicleStayPatrolinspectionPageVo> page = new PagerVo<>();
-        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = scmVehicleStayPatrolinspectionService.getInspectionList(pagerQuery);
-        PagerVo<AppScmVehicleStayPatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>>().success().setData(pagerVo);
-    }
 
     @Override
     public ResultBean<String> getToDoNum(String userSid) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@@ -124,57 +124,6 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
     }
 
 
-    /**
-     * 手机端-获取巡检列表
-     *
-     * @param pagerQuery
-     * @return
-     */
-    public IPage<AppScmVehicleStayPatrolinspectionPageVo> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
-        IPage<AppScmVehicleStayPatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
-        QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
-        AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
-        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
-        List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
-        for (AppScmVehicleStayPatrolinspectionPageVo record : records) {
-            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid);
-
-            if (scmVehicleStayPatrolinspectionVos.size() <= 0) {
-                record.setInspectionDate("无");
-            } else {
-                ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0);
-                record.setInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
-            }
-            if (scmVehicleStayPatrolinspectionVos.size() <= 0) {
-                record.setInspectionName("无");
-            } else {
-                ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0);
-                record.setInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
-            }
-        }
-        return iPage;
-    }
-
-    /**
-     * 手机端-获取巡检列表 查询条件
-     *
-     * @param query
-     * @return
-     */
-    private QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> appQueryWrapper(AppScmVehicleStayPatrolinspectionPageQuery query) {
-        QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-            qw.eq("svsp.createOrgSid", query.getUseOrgSid());
-        }
-        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
-            qw.eq("svsp.locationSid", query.getWarehouseSid());
-        }
-        qw.eq("svsp.isDelete", 0);
-        return qw;
-    }
-
     public void updateByStaySid(String patrolInspectionSid, String newTime, String userName) {
         baseMapper.updateByStaySid(patrolInspectionSid, newTime, userName);
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java

@@ -62,7 +62,7 @@ public interface ScmVehInventorymonthMapper extends BaseMapper<ScmVehInventorymo
 
     List<ScmVehInventorymonthVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventorymonth> qw);
 
-    @Select("select * from scm_veh_inventorymonth")
+    @Select("select * from scm_veh_inventorymonth order by id desc")
     List<ScmVehInventorymonthVo> selectListVo();
 
     IPage<AppScmVehInventorymonthVo> getCarInventoryReportList(IPage<AppScmVehInventorymonthQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehInventorymonthVo> qw, @Param("names") String names);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml

@@ -20,13 +20,14 @@
         billNo as reportId,
         DATE_FORMAT(svi.createTime, '%Y-%m-%d') as `date`,
         createBySid,
+        createByName as `name`,
         `state`
         FROM
         scm_veh_inventorymonth svi
         <where>
             ${ew.sqlSegment}
             <if test="names != '' and names != null ">
-                and concat(svi.billNo) LIKE concat('%', #{names}, '%')
+                and concat(svi.billNo,svi.createByName) LIKE concat('%', #{names}, '%')
             </if>
         </where>
         ORDER BY id DESC

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -144,13 +144,34 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
         boolean inventoryState = scmVehicleInventoryService.getInventoryState(userSid);
         if (inventoryState) {
-            return rb.setMsg("盘库记录生成失败，记录存在未确认数据");
+            return rb.setMsg("记录存在未确认数据，盘库记录生成失败！");
         }
+        List<AppScmVehicleCarInventoryListPageVo> vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(useOrgSid);
+        if (vehicleCarInventoryListPageVos != null) {
+            if (vehicleCarInventoryListPageVos.size() > 0) {
+                for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) {
+                    ScmVehInventorymonth scmVehInventorymonth = fetchBySid(vehicleCarInventoryListPageVo.getMainSid());
+                    if (scmVehInventorymonth.getState() == 0) {
+                        return rb.setMsg("上次盘库记录未生成报告，请先生成再操作！");
+                    }
+                }
+            }
+        }
+//        List<ScmVehInventorymonthVo> scmVehInventorymonthVos = baseMapper.selectListVo();
+//        if (scmVehInventorymonthVos.size() > 0) {
+//            Date oldDate = scmVehInventorymonthVos.get(0).getCreateTime();
+//            Date newDate = new Date();
+//            int days = (int) ((newDate.getTime() - oldDate.getTime()) / (1000 * 3600 * 24));
+//            if (days < 30) {
+//                return rb.setMsg("未到盘库周期，盘库记录生成失败！");
+//            }
+//        }
         List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
         ScmVehInventorymonth scmVehInventorymonth = new ScmVehInventorymonth();
         String billNo = getApplyCode();
         scmVehInventorymonth.setBillNo(billNo);
         scmVehInventorymonth.setCreateBySid(userSid);
+        scmVehInventorymonth.setCreateByName(sysUserVo.getName());
         scmVehInventorymonth.setState(0);
         scmVehInventorymonth.setCreateOrgSid(useOrgSid);
         scmVehInventorymonth.setCreateOrgName(sysStaffOrg.getOrgName());
@@ -220,9 +241,6 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             } else {
                 record.setShowBtn(false);
             }
-            String createBySid = record.getCreateBySid();
-            SysUserVo data = sysUserFeign.fetchBySid(createBySid).getData();
-            record.setName(data.getName());
         }
         return iPage;
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.java

@@ -37,6 +37,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonth;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -56,17 +57,23 @@ import java.util.List;
 @Mapper
 public interface ScmVehPatrolinspectionmonthMapper extends BaseMapper<ScmVehPatrolinspectionmonth> {
 
-	//@Update("update scm_veh_patrolinspectionmonth set name=#{msg} where id=#{id}")
+    //@Update("update scm_veh_patrolinspectionmonth set name=#{msg} where id=#{id}")
-	//IPage<ScmVehPatrolinspectionmonthVo> voPage(IPage<ScmVehPatrolinspectionmonth> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehPatrolinspectionmonth> qw);
+    //IPage<ScmVehPatrolinspectionmonthVo> voPage(IPage<ScmVehPatrolinspectionmonth> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehPatrolinspectionmonth> qw);
 
-	IPage<ScmVehPatrolinspectionmonthVo> selectPageVo(IPage<ScmVehPatrolinspectionmonth> page, @Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionmonth> qw);
+    IPage<ScmVehPatrolinspectionmonthVo> selectPageVo(IPage<ScmVehPatrolinspectionmonth> page, @Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionmonth> qw);
 
-	List<ScmVehPatrolinspectionmonthVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionmonth> qw);
+    List<ScmVehPatrolinspectionmonthVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionmonth> qw);
 
-	@Select("select * from scm_veh_patrolinspectionmonth")
+    @Select("select * from scm_veh_patrolinspectionmonth")
-	List<ScmVehPatrolinspectionmonthVo> selectListVo();
+    List<ScmVehPatrolinspectionmonthVo> selectListVo();
 
-	String selectNum(String bill);
+    @Select("select * from scm_veh_patrolinspectionmonth order by id desc ")
+    List<ScmVehPatrolinspectionmonthVo> selectListAll();
 
-    IPage<AppScmVehPatrolinspectionmonthVo> getCarInspectionReportList(IPage<AppScmVehPatrolinspectionmonthQuery> page,@Param(Constants.WRAPPER) QueryWrapper<AppScmVehPatrolinspectionmonthVo> qw, @Param("names") String names);
+    String selectNum(String bill);
+
+    IPage<AppScmVehPatrolinspectionmonthVo> getCarInspectionReportList(IPage<AppScmVehPatrolinspectionmonthQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehPatrolinspectionmonthVo> qw, @Param("names") String names);
+
+    @Update("update scm_veh_patrolinspectionmonth set state = 1 where sid = #{sid}")
+    void updateBySidAndState(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml

@@ -28,13 +28,14 @@
         billNo as reportId,
         DATE_FORMAT(svp.createTime, '%Y-%m-%d') as `date`,
         createBySid,
+        createByName as `name`,
         `state`
         FROM
         scm_veh_patrolinspectionmonth svp
         <where>
             ${ew.sqlSegment}
             <if test="names != '' and names != null ">
-                and concat(svp.billNo) LIKE concat('%', #{names}, '%')
+                and concat(svp.billNo,svp.createByName) LIKE concat('%', #{names}, '%')
             </if>
         </where>
         ORDER BY id DESC

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -35,14 +35,14 @@ 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.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
-import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
+import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -84,6 +85,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     BaseVehicleFeign baseVehicleFeign;
     @Autowired
     ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService;
+    @Autowired
+    ScmVehPatrolinspectionreportService scmVehPatrolinspectionreportService;
 
     private QueryWrapper<ScmVehPatrolinspectionmonth> createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -141,19 +144,36 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     @Transactional(rollbackFor = Exception.class)
     public ResultBean getInspectionRecords(String userSid) {
         ResultBean rb = ResultBean.fireFail();
-
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
-        boolean inventoryState = scmVehiclePatrolinspectionService.getPatrolinspectionState(userSid);
+        List<String> vinNoList = new ArrayList<>();
-        if (inventoryState) {
+        List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
-            return rb.setMsg("巡检记录生成失败，有未巡检完成记录!");
+        List<AppScmInventoryRecordsVo> list = new ArrayList<>();
+        if (patrolinspectionVos.size() > 0) {
+            for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) {
+                // 判断是否生成报告
+                ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = fetchBySid(patrolinspectionVo.getMainSid());
+                if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录
+                    return rb.setMsg("上次巡检记录未生成报告，请先生成再操作！");
+                }
+                if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
+                    String vinNo = patrolinspectionVo.getVinNo();
+                    vinNoList.add(vinNo);
+                }
+                if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
+                    scmVehiclePatrolinspectionService.updatePatrolInspectionState(patrolinspectionVo.getSid());
+                }
+            }
+            list = baseVehicleFeign.selectPatrolinspections(userSid, vinNoList).getData();
+        } else {
+            list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
         }
-        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
         ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = new ScmVehPatrolinspectionmonth();
         String billNo = getApplyCode();
         scmVehPatrolinspectionmonth.setBillNo(billNo);
         scmVehPatrolinspectionmonth.setCreateBySid(userSid);
+        scmVehPatrolinspectionmonth.setCreateByName(sysUserVo.getName());
         scmVehPatrolinspectionmonth.setState(0);
         scmVehPatrolinspectionmonth.setCreateOrgSid(useOrgSid);
         scmVehPatrolinspectionmonth.setCreateOrgName(sysStaffOrg.getOrgName());
@@ -201,6 +221,10 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         return billNo;
     }
 
+    public String selectNum(String bill) {
+        return baseMapper.selectNum(bill);
+    }
+
     public IPage<AppScmVehPatrolinspectionmonthVo> getCarInspectionReportList(PagerQuery<AppScmVehPatrolinspectionmonthQuery> pagerQuery) {
         IPage<AppScmVehPatrolinspectionmonthQuery> page = PagerUtil.queryToPage(pagerQuery);
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
@@ -228,15 +252,17 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         for (AppScmVehPatrolinspectionmonthVo record : iPage.getRecords()) {
             String mainSid = record.getSid();
             VehPatrolinspectionmonthVo vo = scmVehiclePatrolinspectionService.getMonthByMainSid(mainSid);
-            record.setSurplusNumber(String.valueOf(vo.getSurplusNumber()));
+            record.setSurplusNumber(String.valueOf(vo.getUnHandledNumber() + vo.getNotHandledNumber()));
             record.setTotalNumber(String.valueOf(vo.getTotalNumber()));
             record.setUnHandledNumber(String.valueOf(vo.getUnHandledNumber()));
             record.setProcessedNumber(String.valueOf(vo.getProcessedNumber()));
             record.setNotHandledNumber(String.valueOf(vo.getNotHandledNumber()));
-            record.setActualNumber(String.valueOf(vo.getTotalNumber() - vo.getNotHandledNumber()));
+            record.setActualNumber(String.valueOf(vo.getNormalNumber() + vo.getUnHandledNumber() + vo.getProcessedNumber()));
-            String createBySid = record.getCreateBySid();
+            if (record.getState() == 0) {
-            SysUserVo data = sysUserFeign.fetchBySid(createBySid).getData();
+                record.setShowReportBtn(true);
-            record.setName(data.getName());
+            } else {
+                record.setShowReportBtn(false);
+            }
         }
         return iPage;
     }
@@ -245,10 +271,47 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         ResultBean<AppScmVehPatrolinspectionmonthInfoVo> rb = ResultBean.fireFail();
         AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo();
         VehPatrolinspectionmonthVo vehPatrolinspectionmonthVo = scmVehiclePatrolinspectionService.getMonthByMainSid(sid);
-        vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber() - vehPatrolinspectionmonthVo.getNotHandledNumber()));
+        vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getNormalNumber() + vehPatrolinspectionmonthVo.getUnHandledNumber() + vehPatrolinspectionmonthVo.getProcessedNumber()));
         vo.setTotalNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber()));
+        String StateKey1 = "001";
+        String StateKey2 = "002";
+        List<AppVinAndRemarksVo> questions1 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(sid, StateKey1);
+        List<AppVinAndRemarksVo> questions2 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(sid, StateKey2);
+
+        StringBuilder question = new StringBuilder();
 
-        vo.setQuestion("");
+        for (AppVinAndRemarksVo remark : questions1) {
+            // 问题未解决
+            question.append(remark.getVinNo());
+            question.append(remark.getRemarks());
+            question.append("(问题已反馈)");
+            question.append("\n");
+        }
+        for (AppVinAndRemarksVo remark : questions2) {
+            // 问题已解决
+            question.append(remark.getVinNo());
+            question.append(remark.getRemarks());
+            question.append("(问题已解决)");
+            question.append("\n");
+        }
+        if (StringUtils.isNotBlank(question)) {
+            vo.setQuestion(question.substring(0, question.length() - 1));
+        } else {
+            vo.setQuestion(String.valueOf(question));
+        }
+        ScmVehPatrolinspectionreport scmVehPatrolinspectionreport = new ScmVehPatrolinspectionreport();
+        scmVehPatrolinspectionreport.setMainSid(sid);
+        if (StringUtils.isNotBlank(question)) {
+            scmVehPatrolinspectionreport.setReportContent(question.substring(0, question.length() - 1));
+        } else {
+            scmVehPatrolinspectionreport.setReportContent(String.valueOf(question));
+        }
+        scmVehPatrolinspectionreportService.save(scmVehPatrolinspectionreport);
+        baseMapper.updateBySidAndState(sid);
         return rb.success().setData(vo);
     }
+
+    public List<ScmVehPatrolinspectionmonthVo> selectListAll() {
+        return baseMapper.selectListAll();
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport;
 
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportQuery;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportVo;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDetailsVo;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDto;
-import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeign;
 
 /**
  * Project: aaa(aaa) <br/>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmwarehouse.AppScmWarehouseVo;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -68,4 +69,7 @@ public interface ScmWarehouseMapper extends BaseMapper<ScmWarehouse> {
     List<Map<String, String>> fetchByUseOrgSid(String sid);
 
     List<AppScmWarehouseVo> selectWarehouseByUserSid(@Param("useOrgSid") String useOrgSid);
+
+    @Select("select * from scm_warehouse where sid =#{addressSid}")
+    ScmWarehouseVo selectByAddressSid(@Param("addressSid") String addressSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java

@@ -117,4 +117,9 @@ public class ScmWarehouseRest implements ScmWarehouseFeign {
         }
         return scmWarehouseService.selectWarehouseByUserSid(userSid);
     }
+
+    @Override
+    public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
+        return scmWarehouseService.selectByAddressSid(addressSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -151,4 +151,10 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         List<AppScmWarehouseVo> list = baseMapper.selectWarehouseByUserSid(useOrgSid);
         return new ResultBean<List<AppScmWarehouseVo>>().success().setData(list);
     }
+
+    public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
+        ResultBean<ScmWarehouseVo> rb = ResultBean.fireFail();
+        ScmWarehouseVo scmWarehouseVo = baseMapper.selectByAddressSid(addressSid);
+        return rb.success().setData(scmWarehouseVo);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppInspectionVinQuery implements Query {
+    private static final long serialVersionUID = 3988923864600126962L;
+
+    @ApiModelProperty("车架号")
+    private String name;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppInspectionVinVo implements Vo {
+    private static final long serialVersionUID = 9073694108825056129L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("存放地点")
+    private String address;
+    @ApiModelProperty("存放地点")
+    private String addressSid;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+    @ApiModelProperty("仓库管理员")
+    private String administratorsName;
+    @ApiModelProperty("仓库管理员Sid")
+    private String administratorsSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -15,12 +16,13 @@ import java.util.List;
 @Data
 public class AppScmVehiclePatrolinVo implements Vo {
     private static final long serialVersionUID = 6432538949747322376L;
+
+
     @ApiModelProperty("车架号")
     @JsonProperty("vin")
-    private String mainSid;
+    private String vinNo;
 
     @ApiModelProperty("车型")
-    @JsonProperty("model")
     private String model;
 
     @ApiModelProperty("巡检日期")
@@ -39,16 +41,26 @@ public class AppScmVehiclePatrolinVo implements Vo {
     @JsonProperty("explain")
     private String situationExplain;
 
-    @ApiModelProperty("存在的问题及处理结果")
+    @ApiModelProperty("存在问题")
+    @JsonProperty("question")
+    private String problems;
+
+    @ApiModelProperty("处理结果")
     @JsonProperty("result")
-    private String problemsAndResults;
+    private String results;
 
     @ApiModelProperty("相关附件")
-    private List<String> images;
+    private List<String> images = new ArrayList<>();
+
+    @ApiModelProperty("相关责任人")
+    private List<LiableListVo> liableList = new ArrayList<>();
 
     @ApiModelProperty(value = "定位地址")
     private String address;
 
-    @ApiModelProperty(value = "定位经纬度")
+    @ApiModelProperty(value = "经纬度")
     private String addressCode;
+
+    @ApiModelProperty("巡检结果")
+    private String state;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.supplychain.inspection;
 
+import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery;
+import com.yxt.anrui.base.api.basevehicle.InspectionVinVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -60,7 +62,7 @@ public interface AppScmVehiclePatrolinspectionFeign {
     public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
 
     @ApiOperation("手机端-获取巡检报告列表")
-    @PostMapping("/getCarInventoryReportList")
+    @PostMapping("/getCarInspectionReportList")
     @ResponseBody
     public ResultBean<PagerVo<VehPatrolinspectionmonthVo>> getCarInspectionReportList(@RequestBody PagerQuery<VehPatrolinspectionmonthQuery> pagerQuery);
 
@@ -69,7 +71,7 @@ public interface AppScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean<VehPatrolinspectionmonthInfoVo> getCarInspectionReport(@PathVariable("sid") String sid);
 
-    @ApiOperation("手机端-获取巡检列表")
+    @ApiOperation("手机端-获取待巡检列表")
     @PostMapping("/getInspectionList")
     @ResponseBody
     public ResultBean<PagerVo<StayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<StayPatrolinspectionPageQuery> pagerQuery);
@@ -84,7 +86,7 @@ public interface AppScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean<PatrolinspectionInfoVo> getInspection(@PathVariable("recordSid") String recordSid);
 
-    @ApiOperation("手机端-保存巡检操作")
+    @ApiOperation("手机端-提交巡检操作")
     @PostMapping("/saveInspection")
     @ResponseBody
     public ResultBean saveInspection(@RequestBody PatrolinspectionDto dto);
@@ -98,4 +100,9 @@ public interface AppScmVehiclePatrolinspectionFeign {
     @GetMapping("/getInspectionInfo/{recordSid}")
     @ResponseBody
     public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(@PathVariable("recordSid") String recordSid);
+
+    @ApiOperation("巡检获取车价号")
+    @PostMapping("/getInspectionVinList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppInspectionVinVo>> getInspectionVinList(@RequestBody PagerQuery<AppInspectionVinQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java

@@ -91,4 +91,9 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle
 	public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(String recordSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppInspectionVinVo>> getInspectionVinList(PagerQuery<AppInspectionVinQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListDto.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LiableListDto implements Dto {
+    private static final long serialVersionUID = 6962328180470052805L;
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LiableListVo implements Vo {
+    private static final long serialVersionUID = 2369067075168143230L;
+
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java

@@ -51,51 +51,63 @@ import java.util.List;
 @ApiModel(value = "巡检记录 数据传输对象", description = "巡检记录 数据传输对象")
 public class PatrolinspectionDto implements Dto {
 
-    @ApiModelProperty("记录sid")
+    @ApiModelProperty("巡检记录sid")
     @JsonProperty("recordSid")
-    private String patrolInspectionSid;
+    private String mainSid;
 
     @ApiModelProperty("车架号")
     @JsonProperty("vin")
-    private String mainSid;
+    private String vinNo;
 
     @ApiModelProperty("车型")
-    @JsonProperty("model")
     private String model;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
     @ApiModelProperty("巡检情况说明")
     @JsonProperty("explain")
     private String situationExplain;
 
-    @ApiModelProperty("存在的问题及处理结果")
+    @ApiModelProperty("存在问题")
-    @JsonProperty("result")
+    @JsonProperty("question")
-    private String problemsAndResults;
+    private String problems;
 
-    @ApiModelProperty("相关责任人")
+    @ApiModelProperty("处理结果")
-    @JsonProperty("liableName")
+    @JsonProperty("result")
-    private String dutyName;
+    private String results;
 
     @ApiModelProperty("相关责任人")
-    @JsonProperty("liableSid")
+    private List<LiableListDto> liableList;
-    private String dutySid;
 
     @ApiModelProperty("相关照片")
     private List<String> images;
 
     @ApiModelProperty("经纬度")
-    @JsonProperty("location")
     private String location;
 
     @ApiModelProperty("详细地址")
-    @JsonProperty("address")
     private String address;
 
     @ApiModelProperty("用户sid")
-    @JsonProperty("userSid")
     private String userSid;
 
     @ApiModelProperty("用户名称")
-    @JsonProperty("userName")
     private String userName;
 
+    @ApiModelProperty("车况")
+    private String carConditionValue;
+
+    @ApiModelProperty("车况")
+    private String carConditionKey;
+
+    @ApiModelProperty("新增状态值")
+    private Boolean newAdd;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.supplychain.inspection;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,17 +19,22 @@ public class PatrolinspectionInfoVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
+    @ApiModelProperty("车型Sid")
+    private String modelSid;
+
     @ApiModelProperty("巡检情况说明")
     private String explain;
 
-    @ApiModelProperty("存在的问题及处理结果")
+    @ApiModelProperty("存在问题")
-    private String result;
+    @JsonProperty("question")
+    private String problems;
 
-    @ApiModelProperty("相关责任人")
+    @ApiModelProperty("处理结果")
-    private String liableName;
+    @JsonProperty("result")
+    private String results;
 
     @ApiModelProperty("相关责任人")
-    private String liableSid;
+    private List<LiableListVo> liableList;
 
     @ApiModelProperty("相关照片")
     private List<String> images;
@@ -42,4 +48,7 @@ public class PatrolinspectionInfoVo implements Vo {
     @ApiModelProperty("用户sid")
     private String userSid;
 
+    @ApiModelProperty("用户sid")
+    private String userName;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java

@@ -18,6 +18,12 @@ public class PatrolinspectionPageQuery implements Query {
     @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31")
     private String date;
 
+    @ApiModelProperty("巡检结果")
+    private String state;
+
+    @ApiModelProperty("月度巡检sid")
+    private String reportSid;
+
     @ApiModelProperty("盘库开始日期")
     @JsonProperty("patrolinspectionStartDate")
     private String patrolinspectionStartDate;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageVo.java

@@ -13,6 +13,12 @@ public class PatrolinspectionPageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("巡检结果")
+    private String state;
+
+    @ApiModelProperty("巡检结果")
+    private String stateKey;
+
     @ApiModelProperty("上次巡检日期")
     private String newInspectionDate;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.supplychain.inspection;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +14,9 @@ public class StayPatrolinspectionPageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("月度巡检sid")
+    private String mainSid;
+
     @ApiModelProperty("存放地点")
     private String warehouse;
 
@@ -25,7 +29,9 @@ public class StayPatrolinspectionPageVo implements Vo {
     @ApiModelProperty("车型")
     private String model;
 
-    @ApiModelProperty("暂存状态")
+    @ApiModelProperty("巡检结果")
-    private boolean state;
+    private String resultKey;
 
+    @ApiModelProperty("巡检结果")
+    private String resultValue;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java

@@ -100,4 +100,9 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins
     public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(String recordSid) {
         return appScmVehiclePatrolinspectionService.getInspectionInfo(recordSid);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppInspectionVinVo>> getInspectionVinList(PagerQuery<AppInspectionVinQuery> pagerQuery) {
+        return appScmVehiclePatrolinspectionService.getInspectionVinList(pagerQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java

@@ -26,7 +26,10 @@
 package com.yxt.anrui.terminal.biz.supplychain.inspection;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatroVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery;
+import com.yxt.anrui.base.api.basevehicle.InspectionVinVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
@@ -69,7 +72,8 @@ public class AppScmVehiclePatrolinspectionService {
 
     @Autowired
     ScmVehicleStayPatrolinspectionFeign scmVehicleStayPatrolinspectionFeign;
-
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
     @Autowired
     ScmVehiclePatrolinspectionsheetFeign scmVehiclePatrolinspectionsheetFeign;
     @Autowired
@@ -89,7 +93,7 @@ public class AppScmVehiclePatrolinspectionService {
     public ResultBean<PagerVo<StayPatrolinspectionPageVo>> getInspectionList(PagerQuery<StayPatrolinspectionPageQuery> pagerQuery) {
         ResultBean<PagerVo<StayPatrolinspectionPageVo>> rb = ResultBean.fireFail();
         PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
-        ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> inspectionList = scmVehicleStayPatrolinspectionFeign.getInspectionList(pq);
+        ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> inspectionList = scmVehiclePatrolinspectionFeign.getInspectionList(pq);
         PagerVo<StayPatrolinspectionPageVo> vo = CoverUtils.selectPagerVo(inspectionList.getData());
         return rb.success().setData(vo);
     }
@@ -131,7 +135,7 @@ public class AppScmVehiclePatrolinspectionService {
     public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(String recordSid) {
         ResultBean<AppScmVehiclePatrolinVo> rb = ResultBean.fireFail();
         AppScmVehiclePatrolinVo vo = new AppScmVehiclePatrolinVo();
-        ResultBean<AppScmVehiclePatroVo> getInspectionInfo = scmVehiclePatrolinspectionFeign.getInspectionInfo(recordSid);
+        ResultBean<AppScmVehiclePatroVo> getInspectionInfo = scmVehiclePatrolinspectionsheetFeign.getInspectionInfo(recordSid);
         if (!getInspectionInfo.getSuccess()) {
             return rb.setMsg(getInspectionInfo.getMsg());
         }
@@ -159,4 +163,11 @@ public class AppScmVehiclePatrolinspectionService {
     }
 
 
+    public ResultBean<PagerVo<AppInspectionVinVo>> getInspectionVinList(PagerQuery<AppInspectionVinQuery> pagerQuery) {
+        ResultBean<PagerVo<AppInspectionVinVo>> rb = ResultBean.fireFail();
+        PagerQuery<InspectionVinQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<InspectionVinVo>> inspectionList = baseVehicleFeign.getInspectionVinList(pq);
+        PagerVo<AppInspectionVinVo> vo = CoverUtils.selectPagerVo(inspectionList.getData());
+        return rb.success().setData(vo);
+    }
 }

doc/databases/scm_tables_vehicle.sql

@@ -326,3 +326,51 @@ CREATE TABLE `scm_veh_inventoryReport`
     KEY             `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='盘库报告';
+
+
+DROP TABLE IF EXISTS `scm_veh_patrolinspectionMonth`;
+CREATE TABLE `scm_veh_patrolinspectionMonth`
+(
+    `id`            int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32) DEFAULT '1' COMMENT '日常管理报告生成状态（0 未生成 1 已生成）',
+    `isDelete`      int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `billNo`        varchar(64)          DEFAULT NULL COMMENT '编号（yyyyMMdd）',
+    `createOrgSid`  varchar(64)          DEFAULT NULL COMMENT '创建组织',
+    `createOrgName` varchar(64)          DEFAULT NULL COMMENT '创建组织名称',
+    `useOrgSid`     varchar(64)          DEFAULT NULL COMMENT '使用组织',
+    `useOrgName`    varchar(64)          DEFAULT NULL COMMENT '使用组织名称',
+    PRIMARY KEY (`id`),
+    KEY             `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='月度日常管理记录';
+
+DROP TABLE IF EXISTS `scm_veh_patrolinspectionReport`;
+CREATE TABLE `scm_veh_patrolinspectionReport`
+(
+    `id`            int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`       varchar(64)          DEFAULT NULL COMMENT '月度日常管理记录sid',
+    `receiverSids`  varchar(64)          DEFAULT NULL COMMENT '接收人sid',
+    `receiverNames` varchar(64)          DEFAULT NULL COMMENT '接收人姓名',
+    `reportContent` varchar(64)          DEFAULT NULL COMMENT '盘库报告内容',
+    PRIMARY KEY (`id`),
+    KEY             `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='日常管理报告';