验车部分修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -31,7 +32,7 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
     private String inspectedDate;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
     @ApiModelProperty(" 1 已验车  2 未验车 验车状态")
     private String state;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -44,7 +45,7 @@ public class AppScmVehicleExamineDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -43,7 +44,7 @@ public class AppScmVehicleExamineInfoVo implements Vo {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
 
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -43,7 +44,7 @@ public class AppScmVehicleExamineSubmitDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleExamine.java <br/>
@@ -81,5 +83,5 @@ public class ScmVehicleExamine extends BaseEntity {
 	@ApiModelProperty("验车状态（已验车，未验车）")
     private String inspectionResult; // 验车状态（已验车，未验车）
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml

@@ -34,7 +34,7 @@
         <where>
             ${ew.sqlSegment}
             <if test="names != '' and names != null ">
-                and concat(sve.vin , sve.modelName ,sve.purchaseType ) LIKE concat('%', #{names}, '%')
+                and concat(sve.vinNo , sve.modelName ,sve.purchaseType ) LIKE concat('%', #{names}, '%')
             </if>
         </where>
         ORDER BY id DESC

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java

@@ -138,9 +138,7 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
     @ApiOperation("手机端-保存验车单")
     @PostMapping("/saveCarWarehousingInfo")
     public ResultBean saveCarWarehousingInfo(AppScmVehicleEnterlibraryDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        scmVehicleEnterlibraryService.saveCarWarehousingInfo(dto);
-        return rb.success();
+        return scmVehicleEnterlibraryService.saveCarWarehousingInfo(dto);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -282,8 +282,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     scmFile1.setLinkSid(dto.getWarehousingSid());
                     scmFileService.save(scmFile1);
                 }
+                return rb.success().setMsg("操作成功！");
             } else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) {
-                return rb.fail().setMsg("当前车辆已验车完成，请勿重复保存");
+                return rb.fail().setMsg("当前车辆已入库，请勿重复保存");
             }
         }
         return rb.fail().setMsg("保存失败");

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

@@ -144,9 +144,7 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
     @ApiOperation("手机端-保存验车单")
     @PostMapping("/saveCarInspectedInfo")
     public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        scmVehicleExamineService.saveCarInspectedInfo(dto);
-        return rb.success();
+        return scmVehicleExamineService.saveCarInspectedInfo(dto);
     }
 
     @Override
@@ -154,7 +152,6 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
     @PostMapping("/submitCarInspectedInfo")
     public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        scmVehicleExamineService.submitCarInspectedInfo(dto);
-        return rb.success();
+        return scmVehicleExamineService.submitCarInspectedInfo(dto);
     }
 }

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

@@ -51,6 +51,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -238,6 +239,10 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
 
         AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
+        if (vo.getPrice() == null || vo.getPrice().equals("")) {
+            BigDecimal bigDecimal = new BigDecimal("0.00");
+            vo.setPrice(bigDecimal);
+        }
         vo.setUserSid(userSid);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getInspectedSid(), type1);
         for (ScmFile scmFile : scmFiles1) {
@@ -266,7 +271,10 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         List<String> carInspectedImages = new ArrayList<>();
 
         AppScmVehicleExamineDetailsVo vo = baseMapper.getCarInspected(inspectedSid);
-
+        if (vo.getPrice() == null || vo.getPrice().equals("")) {
+            BigDecimal bigDecimal = new BigDecimal("0.00");
+            vo.setPrice(bigDecimal);
+        }
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(inspectedSid, type1);
         for (ScmFile scmFile : scmFiles1) {
             factoryImages.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
@@ -289,6 +297,15 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(dto.getPurchaseKey())) {
+            return rb.setMsg("车架号不能为空");
+        }
+        if (dto.getCarInspectedImage().size() <= 0) {
+            return rb.setMsg("验车相关照片不能为空");
+        }
+        if (dto.getFactoryImage().size() <= 0) {
+            return rb.setMsg("厂家验车照片不能为空");
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         String s1 = "";
@@ -338,11 +355,13 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     scmFile2.setLinkSid(dto.getInspectedSid());
                     scmFileService.save(scmFile2);
                 }
+                return rb.success().setMsg("操作成功！");
+
             } else if ("2".equals(scmVehicleExamine.getInspectionResult())) {
                 return rb.fail().setMsg("当前车辆已验车完成，请勿重复保存");
             }
         }
-        return rb.fail().setMsg("保存失败");
+        return rb.fail().setMsg("操作失败！");
     }
 
     /**
@@ -353,6 +372,15 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(dto.getPurchaseKey())) {
+            return rb.setMsg("车架号不能为空");
+        }
+        if (dto.getCarInspectedImage().size() <= 0) {
+            return rb.setMsg("验车相关照片不能为空");
+        }
+        if (dto.getFactoryImage().size() <= 0) {
+            return rb.setMsg("厂家验车照片不能为空");
+        }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         SysOrganizationVo data1 = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData();
@@ -417,10 +445,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     scmFile2.setLinkSid(dto.getInspectedSid());
                     scmFileService.save(scmFile2);
                 }
+                return rb.success().setMsg("操作成功！");
+
             } else if ("2".equals(scmVehicleExamine.getInspectionResult())) {
                 return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交");
             }
         }
-        return rb.fail().setMsg("提交失败");
+        return rb.fail().setMsg("操作失败！");
     }
 }

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

@@ -226,10 +226,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         for (AppScmVehicleGressionPageVo record : records) {
             if ("待提交".equals(record.getState())) {
                 record.setShowDetectBtn(true);
-                record.setShowDownloadBtn(true);
                 record.setShowUpdateBtn(true);
             }
             if ("审批通过".equals(record.getState())) {
+                record.setShowDownloadBtn(true);
                 record.setShowUploadBtn(true);
             }
         }

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

@@ -20,7 +20,7 @@
         SELECT
         sid,
         mainSid as vin,
-        location as warehouse,
+        location as warehouse
         FROM
         scm_vehicle_patrolinspection svp
         <where>

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

@@ -27,7 +27,7 @@
                location,
                address
         FROM scm_vehicle_patrolinspectionsheet
-        WHERE sid = #{recordSid}
+        WHERE patrolInspectionSid = #{recordSid}
     </select>
 
     <select id="getPCInspection"

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

@@ -40,8 +40,9 @@
         sid,
         mainSid AS vin,
         location AS warehouse,
-        patrolInspectionDate as inspectionName,
-        patrolInspectionName as inspectionDate
+        patrolInspectionDate AS inspectionName,
+        patrolInspectionName AS inspectionDate,
+        modelName AS model
         FROM
         scm_vehicle_stay_patrolinspection svsp
         <where>

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

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -22,7 +23,7 @@ public class AppExamineDetailsVo implements Vo {
     private String config;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
     @ApiModelProperty("发车日期")
     private String dispatchedDate;

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

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -42,5 +43,5 @@ public class AppExamineDto implements Dto {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 }

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

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -43,6 +44,6 @@ public class AppExamineInfoVo implements Vo {
     private String address;
 
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
 }

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

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -32,6 +33,6 @@ public class AppSubmitDto implements Dto {
     @ApiModelProperty("定位位置")
     private String address;
     @ApiModelProperty("洗车费")
-    private String price;
+    private BigDecimal price;
 
 }