添加移动端验车 发动机号字段 修改移库巡检问题

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

@@ -36,10 +36,7 @@ import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPat
 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.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -105,7 +102,8 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
     @Select("select * from scm_vehicle_patrolinspection where isDelete = 0 and mainSid = #{sid} and vinNo = #{vin}")
     List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where vinNo = #{vinNo} and id = #{id} ")
+//    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where vinNo = #{vinNo} and id = #{id} ")
+    @Delete("delete from scm_vehicle_patrolinspection where vinNo = #{vinNo} and id = #{id}")
     void deleteByVinNo(@Param("vinNo") String vinNo, @Param("id") String id);
 
     List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);

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

@@ -46,9 +46,9 @@
             resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo">
         SELECT count(*),
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.pushState = 1 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_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 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_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

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

@@ -264,7 +264,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             paramsQuery.setPatrolinspectionEndDate(s[1]);
         }
         QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
-        qw.eq("svp.isDelete", 0);
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) {
             if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
                 qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
             }
@@ -274,9 +274,8 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             if (StringUtils.isNotBlank(pagerQuery.getParams().getReportSid())) {
                 qw.eq("svp.mainSid", pagerQuery.getParams().getReportSid());
             }
-        if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) {
             if ("01".equals(pagerQuery.getParams().getState())) {
-                qw.eq("svp.state", "1");
+                qw.eq("svp.state", 1);
             }
             if ("02".equals(pagerQuery.getParams().getState())) {
                 qw.ne("svp.patrolInspectionStateKey", "000");
@@ -294,6 +293,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
                 qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
             }
         } else {
+            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());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getParams().getReportSid())) {
+                qw.eq("svp.mainSid", pagerQuery.getParams().getReportSid());
+            }
             qw.eq("svp.patrolInspectionStateKey", "002").or().eq("svp.patrolInspectionStateKey", "003");
         }
         String patrolinspectionStartDate = pagerQuery.getParams().getPatrolinspectionStartDate();

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

@@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 
 import java.util.List;
@@ -87,7 +84,8 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
 
     AppScmVehiclePatrolinspectionsheetInfoVo fetchByMainSid(String mainSid);
 
-    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where mainSid = #{mainSid} ")
+//    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where mainSid = #{mainSid} ")
+    @Delete("delete from scm_vehicle_patrolinspectionsheet where mainSid = #{mainSid}")
     void deleteByMainSid(@Param("mainSid") String mainSid);
 
     @Select("SELECT count(*) FROM scm_vehicle_patrolinspectionsheet WHERE mainSid = #{mainSid}")

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

@@ -282,12 +282,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             if (list.size() > 0) {
                 String id = list.get(0).getId();
                 String mainSid = list.get(0).getSid();
+                if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())){
                     scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
                     int count = baseMapper.selectByMainSidNum(mainSid);
                     if (count > 0) {
                         baseMapper.deleteByMainSid(mainSid);
                     }
                 }
+            }
             ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
             scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
             scmVehiclePatrolinspection.setVehicleSid(dto.getVehicleSid());
@@ -297,6 +299,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
             scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
             scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+            scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
             scmVehiclePatrolinspection.setState(0);
             scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);

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

@@ -71,4 +71,7 @@ public class AppExamineDetailsVo implements Vo {
     @ApiModelProperty(value = "厂家入库日期")
     private String inboundDate;
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
 }

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

@@ -58,6 +58,9 @@ public class AppExamineDto implements Dto {
     @ApiModelProperty("洗车费")
     private BigDecimal price;
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
     @ApiModelProperty(value = "厂家入库日期")
     @NotBlank(message = "厂家入库日期不能为空")
     private String inboundDate;

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

@@ -67,6 +67,9 @@ public class AppExamineInfoVo implements Vo {
     @ApiModelProperty(value = "厂家入库日期")
     private String inboundDate;
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
     private AppScmVehicleVo carDetailPage;
 
 }

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

@@ -44,6 +44,9 @@ public class AppSubmitDto implements Dto {
     @ApiModelProperty("洗车费")
     private BigDecimal price;
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
     @ApiModelProperty(value = "厂家入库日期")
     @NotBlank(message = "厂家入库日期不能为空")
     private String inboundDate;