巡检添加详情

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

@@ -0,0 +1,35 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/6 16:56
+ * @Description
+ */
+@Data
+public class AppScmVehiclePatroVo implements Vo {
+    private static final long serialVersionUID = 4433285895858153789L;
+    @ApiModelProperty("车架号")
+    private String mainSid;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("巡检日期")
+    private String patrolInspectionDate;
+    @ApiModelProperty("巡检人员")
+    private String patrolInspectionName;
+    @ApiModelProperty("存放地地点")
+    private String location;
+    @ApiModelProperty("巡检情况说明")
+    private String situationExplain;
+    @ApiModelProperty("存在的问题及处理结果")
+    private String problemsAndResults;
+    @ApiModelProperty("相关附件")
+    private List<String> images;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+}

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

@@ -78,4 +78,11 @@ public interface ScmVehiclePatrolinspectionFeign {
     @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

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehiclePatrolinspectionFeignFallback.java <br/>
@@ -75,6 +73,10 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 		return null;
 	}
 
+	@Override
+	public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
+		return null;
+	}
 
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -379,6 +379,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (dto.getFactoryImage().size() <= 0) {
             return rb.setMsg("厂家验车照片不能为空");
         }
+        if(StringUtils.isBlank(dto.getInboundDate())){
+            return rb.setMsg("厂家入库日期不能为空");
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         String s1 = "";
@@ -461,6 +464,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (dto.getFactoryImage().size() <= 0) {
             return rb.setMsg("厂家验车照片不能为空!");
         }
+        if(StringUtils.isBlank(dto.getInboundDate())){
+            return rb.setMsg("厂家入库日期不能为空");
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         SysOrganizationVo data1 = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -36,7 +36,6 @@ import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
 import com.yxt.anrui.base.api.basevehicle.VehicleGression;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
-import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -594,7 +593,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(dto.getVinNo(), dto.getTargetLocationSid());
         if (scmVehicleGressionVos.size() > 0) {
             if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
-                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("已终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
                     return rb.setMsg("该申请已存在，请务重复提交！");
                 }
             }

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

@@ -72,4 +72,6 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
      * @return
      */
     IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw, @Param("name") String name);
+
+    AppScmVehiclePatroVo getInspectionInfo(String recordSid);
 }

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

@@ -5,32 +5,52 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo">
-        SELECT * FROM scm_vehicle_patrolinspection
+        SELECT *
-        <where>${ew.sqlSegment}</where>
+        FROM scm_vehicle_patrolinspection
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo">
-        SELECT * FROM scm_vehicle_patrolinspection
+        SELECT *
-        <where>${ew.sqlSegment}</where>
+        FROM scm_vehicle_patrolinspection
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="getCarInventoryList"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
-        SELECT
+        SELECT sid,
-        sid,
                mainSid              as vin,
                location             as warehouse,
                patrolInspectionDate as newInspectionDate,
                patrolInspectionName as newInspectionName
-        FROM
+        FROM scm_vehicle_patrolinspection svp
-        scm_vehicle_patrolinspection svp
         <where>
             ${ew.sqlSegment}
             <if test="name != '' and name != null">
-                and concat(svp.mainSid) LIKE concat('%', #{name}, '%')
+                and concat(svp.mainSid) LIKE concat('%'
+                  , #{name}
+                  , '%')
             </if>
         </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
+        from scm_vehicle_patrolinspection svp
+                 left join scm_vehicle_patrolinspectionsheet svss on svss.patrolInspectionSid = svp.sid
+        where sid = #{recordSid}
+    </select>
 </mapper>

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

@@ -105,4 +105,9 @@ 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

@@ -29,18 +29,21 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
-import org.apache.commons.lang3.StringUtils;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
+import org.apache.commons.lang3.StringUtils;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -60,6 +63,10 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
 
     @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private ScmFileService scmFileService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     private QueryWrapper<ScmVehiclePatrolinspection> createQueryWrapper(ScmVehiclePatrolinspectionQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -178,4 +185,20 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         updateById(scmVehiclePatrolinspection);
     }
 
+    public ResultBean<AppScmVehiclePatroVo> getInspectionInfo(String recordSid) {
+        ResultBean<AppScmVehiclePatroVo> rb = ResultBean.fireFail();
+        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);
+    }
 }

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

@@ -0,0 +1,46 @@
+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;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/6 16:45
+ * @Description
+ */
+@Data
+public class AppScmVehiclePatrolinVo implements Vo {
+    private static final long serialVersionUID = 6432538949747322376L;
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String mainSid;
+    @ApiModelProperty("车型")
+    @JsonProperty("model")
+    private String model;
+
+    @ApiModelProperty("巡检日期")
+    @JsonProperty("date")
+    private String patrolInspectionDate;
+
+    @ApiModelProperty("巡检人员")
+    @JsonProperty("name")
+    private String patrolInspectionName;
+
+    @ApiModelProperty("存放地地点")
+    @JsonProperty("warehouse")
+    private String location;
+
+    @ApiModelProperty("巡检情况说明")
+    @JsonProperty("explain")
+    private String situationExplain;
+
+    @ApiModelProperty("存在的问题及处理结果")
+    @JsonProperty("result")
+    private String problemsAndResults;
+    @ApiModelProperty("相关附件")
+    private List<String> images;
+}

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

@@ -83,4 +83,9 @@ public interface AppScmVehiclePatrolinspectionFeign {
     @PostMapping("/submitInspection")
     @ResponseBody
     public ResultBean submitInspection(@RequestBody PatrolinspectionDto dto);
+
+    @ApiOperation("手机端-巡检详情")
+    @GetMapping("/getInspectionInfo/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(@PathVariable("recordSid") String recordSid);
 }

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

@@ -76,4 +76,9 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle
 	public ResultBean submitInspection(PatrolinspectionDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(String recordSid) {
+		return null;
+	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java

@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleExamineFeign.java <br/>
@@ -45,7 +43,7 @@ public interface AppScmVehicleExamineFeign {
     @ApiOperation("手机端-保存验车单")
     @PostMapping("/saveCarInspectedInfo")
     @ResponseBody
-    public ResultBean saveCarInspectedInfo(@Valid @RequestBody AppExamineDto dto);
+    public ResultBean saveCarInspectedInfo(@RequestBody AppExamineDto dto);
 
     @ApiOperation("手机端-通过验车单")
     @PostMapping("/submitCarInspectedInfo")

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

@@ -25,19 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.supplychain.inspection;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import com.yxt.anrui.terminal.api.supplychain.inspection.*;
-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;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**
@@ -90,4 +85,9 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins
     public ResultBean submitInspection(PatrolinspectionDto dto) {
         return appScmVehiclePatrolinspectionService.submitInspection(dto);
     }
+
+    @Override
+    public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(String recordSid) {
+        return appScmVehiclePatrolinspectionService.getInspectionInfo(recordSid);
+    }
 }

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

@@ -26,33 +26,23 @@
 package com.yxt.anrui.terminal.biz.supplychain.inspection;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatroVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
-import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryInfoVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
-import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryPageQuery;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetFeign;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign;
 import com.yxt.anrui.terminal.api.supplychain.inspection.*;
-import com.yxt.anrui.terminal.api.supplychain.scmvehicleenterlibrary.AppEnterlibraryInfoVo;
-import com.yxt.anrui.terminal.api.supplychain.scmvehicleenterlibrary.AppEnterlibraryPageVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -132,4 +122,14 @@ public class AppScmVehiclePatrolinspectionService {
         return resultBean;
     }
 
+    public ResultBean<AppScmVehiclePatrolinVo> getInspectionInfo(String recordSid) {
+        ResultBean<AppScmVehiclePatrolinVo> rb = ResultBean.fireFail();
+        AppScmVehiclePatrolinVo vo = new AppScmVehiclePatrolinVo();
+        ResultBean<AppScmVehiclePatroVo> getInspectionInfo = scmVehiclePatrolinspectionFeign.getInspectionInfo(recordSid);
+        if(!getInspectionInfo.getSuccess()){
+           return rb.setMsg(getInspectionInfo.getMsg());
+        }
+        BeanUtil.copyProperties(getInspectionInfo.getData(),vo);
+        return rb.success().setData(vo);
+    }
 }