巡检盘库

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

@@ -53,6 +53,7 @@ import java.util.Date;
 @ApiModel(value = "盘库记录 视图数据对象", description = "盘库记录 视图数据对象")
 public class ScmVehicleInventoryVo implements Vo {
 
+    private String id; // id
     private String sid; // sid
 
 	@ApiModelProperty("车架号")
@@ -73,4 +74,6 @@ public class ScmVehicleInventoryVo implements Vo {
     private String InventoryState; // 盘库结果
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
 }

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

@@ -61,6 +61,11 @@ public interface ScmVehiclePatrolinspectionFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehiclePatrolinspectionVo>> listPage(@RequestBody PagerQuery<ScmVehiclePatrolinspectionQuery> pq);
 
+    @ApiOperation("查询待巡检记录列表")
+    @PostMapping("/stayListPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehiclePatrolinspectionVo>> stayListPage(@RequestBody PagerQuery<ScmVehiclePatrolinspectionQuery> pq);
+
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody

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

@@ -54,6 +54,11 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 		return rb.setMsg("接口anrui_scm/scmvehiclepatrolinspection/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehiclePatrolinspectionVo>> stayListPage(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(ScmVehiclePatrolinspectionDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui_scm/scmvehiclepatrolinspection/save无法访问");

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

@@ -50,7 +50,7 @@ import lombok.Data;
 public class ScmVehiclePatrolinspectionQuery implements Query {
 
 	@ApiModelProperty("车架号")
-    private String mainSid; // 车架号
+    private String vinNo; // 车架号
 	@ApiModelProperty("存放地点sid")
     private String locationSid; // 存放地点sid
 	@ApiModelProperty("巡检开始日期")

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

@@ -49,6 +49,7 @@ import lombok.Data;
 @ApiModel(value = "巡检记录 视图数据对象", description = "巡检记录 视图数据对象")
 public class ScmVehiclePatrolinspectionVo implements Vo {
 
+    private String id; // id
     private String sid; // sid
 
     @ApiModelProperty("车架号")
@@ -65,4 +66,6 @@ public class ScmVehiclePatrolinspectionVo implements Vo {
     private String patrolInspectionState; // 巡检状态（通过/不通过）
     @ApiModelProperty("巡检状态（通过/不通过）")
     private String patrolInspectionStateKey; // 巡检状态（通过/不通过）
+    @ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
 }

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
@@ -49,15 +50,12 @@ import lombok.Data;
 @ApiModel(value = "月度日常管理记录 查询条件", description = "月度日常管理记录 查询条件")
 public class ScmVehPatrolinspectionmonthQuery implements Query {
 
-	@ApiModelProperty("编号（yyyyMMdd）")
-    private String billNo; // 编号（yyyyMMdd）
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织")
-    private String useOrgSid; // 使用组织
-	@ApiModelProperty("使用组织名称")
-    private String useOrgName; // 使用组织名称
-
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime; // 创建开始日期
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime; // 创建结束日期
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
 }

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

@@ -49,20 +49,29 @@ import lombok.Data;
 @ApiModel(value = "月度日常管理记录 视图数据对象", description = "月度日常管理记录 视图数据对象")
 public class ScmVehPatrolinspectionmonthVo implements Vo {
 
-    private String sid; // sid
-
-    @ApiModelProperty("编号（yyyyMMdd）")
-    private String billNo; // 编号（yyyyMMdd）
-    @ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-    @ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-    @ApiModelProperty("使用组织")
-    private String useOrgSid; // 使用组织
-    @ApiModelProperty("使用组织名称")
-    private String useOrgName; // 使用组织名称
-    @ApiModelProperty("创建人")
+    private String sid;
+    @ApiModelProperty("编号")
+    private String billNo;
+    @ApiModelProperty("创建人员")
     private String createByName;
-    @ApiModelProperty("巡检报告生成状态")
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+    @ApiModelProperty("创建时间")
+    private String createTime;
+    @ApiModelProperty("剩余巡检记录数量")
+    private String surplusNumber;
+    @ApiModelProperty("巡检记录总数数量")
+    private String totalNumber;
+    @ApiModelProperty("未处理数量")
+    private String unHandledNumber;
+    @ApiModelProperty("已处理数量")
+    private String processedNumber;
+    @ApiModelProperty("未巡检数量")
+    private String notHandledNumber;
+    @ApiModelProperty("实际巡检数量")
+    private String actualNumber;
+    @ApiModelProperty("报告状态")
     private int state;
+    @ApiModelProperty("是否显示生成报告按钮")
+    private Boolean showReportBtn;
 }

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

@@ -76,7 +76,6 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
      *
      * @param page
      * @param qw
-     * @param name
      * @return
      */
     IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(IPage<AppScmVehicleCarInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw, @Param("names") String names);
@@ -143,4 +142,5 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
 
 
     List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid);
+
 }

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

@@ -171,5 +171,4 @@
         where svi.useOrgSid = #{useOrgSid}
         order by id desc
     </select>
-
 </mapper>

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

@@ -139,6 +139,17 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         qw.eq("InventoryStateKey", "");
         IPage<ScmVehicleInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehicleInventoryVo record : pagging.getRecords()) {
+            String vinNo = record.getVinNo();
+            String createOrgSid = record.getCreateOrgSid();
+            String id = record.getId();
+            List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid);
+            if (scmVehicleStayInventoryVos.size() > 0){
+                ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
+                record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
+                record.setInventoryDate(scmVehicleStayInventoryVo.getLastDate());
+            }
+        }
         for (ScmVehicleInventoryVo record : pagging.getRecords()) {
             record.setInventoryState("");
         }

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

@@ -70,6 +70,13 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<ScmVehiclePatrolinspectionVo>> stayListPage(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehiclePatrolinspectionVo> pv = scmVehiclePatrolinspectionService.stayListPage(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")

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

@@ -84,23 +84,52 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         ScmVehiclePatrolinspectionQuery query = pq.getParams();
         QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
         qw.eq("createOrgSid", query.getCreateOrgSid());
-        if (StringUtils.isNotBlank(query.getMainSid())) {
-            qw.like("mainSid", query.getMainSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getLocationSid())) {
-            qw.like("locationSid", query.getLocationSid());
+            qw.eq("locationSid", query.getLocationSid());
         }
         String patrolInspectionStartDate = query.getPatrolInspectionStartDate();
         String patrolInspectionEndDate = query.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')"
                 );
+        qw.ne("patrolInspectionStateKey","");
         IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
+    public PagerVo<ScmVehiclePatrolinspectionVo> stayListPage(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
+        ScmVehiclePatrolinspectionQuery query = pq.getParams();
+        QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
+            qw.eq("locationSid", query.getLocationSid());
+        }
+        qw.eq("patrolInspectionStateKey","");
+        IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehiclePatrolinspectionVo record : pagging.getRecords()) {
+            String vinNo = record.getVinNo();
+            String id = record.getId();
+            String createOrgSid = record.getCreateOrgSid();
+            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(vinNo, id, createOrgSid);
+            if (scmVehicleStayPatrolinspectionVos.size() > 0){
+                ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0);
+                record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
+                record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
+            }
+        }
+        PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public void saveOrUpdateDto(ScmVehiclePatrolinspectionDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
@@ -262,4 +291,5 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
     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/scmvehiclereturn/ScmVehicleReturnService.java

@@ -411,6 +411,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 brd.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehs);//aseManufacturerRetwareVehs;
                 brd.setApplyName(sysUserResultBean.getData().getName());
                 baseManufacturerRetwareFeign.save(brd);
+
             } else {
                 //极光推送
                 UpdateFlowFieldVo uff = rb1.getData();

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

@@ -5,8 +5,18 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo">
-        SELECT * FROM scm_veh_patrolinspectionmonth
-        <where>${ew.sqlSegment}</where>
+        SELECT
+        sid,
+        billNo,
+        createTime,
+        createBySid,
+        createByName,
+        `state`
+        FROM
+        scm_veh_patrolinspectionmonth
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo"

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

@@ -97,9 +97,34 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
 
     public PagerVo<ScmVehPatrolinspectionmonthVo> listPageVo(PagerQuery<ScmVehPatrolinspectionmonthQuery> pq) {
         ScmVehPatrolinspectionmonthQuery query = pq.getParams();
-        QueryWrapper<ScmVehPatrolinspectionmonth> qw = createQueryWrapper(query);
+        QueryWrapper<ScmVehPatrolinspectionmonth> qw = new QueryWrapper<>();
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("createByName", query.getCreateByName());
+        }
+        qw.orderByDesc("id");
         IPage<ScmVehPatrolinspectionmonth> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehPatrolinspectionmonthVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehPatrolinspectionmonthVo record : pagging.getRecords()) {
+            String mainSid = record.getSid();
+            VehPatrolinspectionmonthVo vo = scmVehiclePatrolinspectionService.getMonthByMainSid(mainSid);
+            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.getNormalNumber() + vo.getUnHandledNumber() + vo.getProcessedNumber()));
+            if (record.getState() == 0) {
+                record.setShowReportBtn(true);
+            } else {
+                record.setShowReportBtn(false);
+            }
+        }
         PagerVo<ScmVehPatrolinspectionmonthVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }