巡检代码开发、盘库接口完善

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

@@ -80,9 +80,9 @@ public class BaseVehicleDto implements Dto {
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
     @ApiModelProperty(value = "厂家入库价")
-    private float priced;
+    private Integer costPriced;
     @ApiModelProperty(value = "成交价")
-    private float guidedPrice;
+    private Integer salePrice;
     @ApiModelProperty("保修卡号")
     private String warrantyCardNo;
     @ApiModelProperty("锁定状态")
@@ -90,11 +90,11 @@ public class BaseVehicleDto implements Dto {
     @ApiModelProperty("锁定状态Value")
     private String lockedStateValue;
     @ApiModelProperty("创建组织sid(陕汽必须的字段)")
-    private String createOrg;
+    private String createOrgSid;
     @ApiModelProperty("创建组织名称(陕汽必须的字段)")
     private String createOrgName;
     @ApiModelProperty("使用组织sid")
-    private String useOrg;
+    private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
 }

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

@@ -70,9 +70,9 @@ public class BaseVehicleSelectVo implements Vo {
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
     @ApiModelProperty(value = "厂家入库价")
-    private float priced;
+    private float costPriced;
     @ApiModelProperty(value = "成交价")
-    private float guidedPrice;
+    private float salePrice;
     @ApiModelProperty("保修卡号")
     private String warrantyCardNo;
     @ApiModelProperty("锁定状态")
@@ -80,11 +80,11 @@ public class BaseVehicleSelectVo implements Vo {
     @ApiModelProperty("锁定状态Value")
     private String lockedStateValue;
     @ApiModelProperty("创建组织sid(陕汽必须的字段)")
-    private String createOrg;
+    private String createOrgSid;
     @ApiModelProperty("创建组织名称(陕汽必须的字段)")
     private String createOrgName;
     @ApiModelProperty("使用组织sid")
-    private String useOrg;
+    private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
 }

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

@@ -44,9 +44,6 @@ public class BaseVehicleVo implements Vo {
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
 
-    @ApiModelProperty("库龄（根据首次发车日期计算）")
-    private String libraryAge;
-
     @ApiModelProperty("车型配置sid")
     private String modelConfigSid;
 }

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

@@ -783,7 +783,7 @@
                locationName as warehouse,
                location     as warehouseSid
         from base_vehicle bv
-        where bv.useOrg = #{userOrgSid}
+        where bv.createOrgSid = #{userOrgSid}
     </select>
 
     <select id="selExistingCar" resultType="com.yxt.anrui.base.api.basevehicle.BaseExistingCarListVo">

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -187,4 +188,8 @@ public interface SysUserFeign {
     @ApiOperation(value = "根据角色、发起人部门sidPath获取用户列表算法")
     @GetMapping(value = "getUserByRole")
     ResultBean<List<SysUserVo>> getUserByRole(@SpringQueryMap UserQuery query);
+
+    @ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名")
+    @GetMapping(value = "getUserByOrgSid")
+    ResultBean<List<Map<String, String>>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -173,4 +174,9 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean<List<SysUserVo>> getUserByRole(UserQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -194,7 +194,10 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public ResultBean<String> selectSidPathByStaffSid(String applySid) {
         ResultBean<String> rb = ResultBean.fireFail();
         String orgSid = baseMapper.selectBySidPathByStaffSid(applySid);
-        String orgPathSid = getOrgByOrgSid(orgSid);
+        String orgPathSid = "";
+        if (StringUtils.isNotBlank(orgSid)){
+            orgPathSid = getOrgByOrgSid(orgSid);
+        }
         return rb.success().setData(orgPathSid);
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -18,6 +18,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -159,4 +160,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUserVo> getUsersByRoleSid(@Param("roleSid") String roleSid);
 
     List<SysUserVo> getUserByRole(@Param("roleSid") String roleSid, @Param("levelOrgSid") String levelOrgSid);
+
+    List<Map<String,String>> getUserByOrgSid(@Param("userSid") String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -219,4 +219,13 @@
         where sr.roleSid = #{roleSid}
           and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
     </select>
+
+    <select id="getUserByOrgSid" resultType="java.util.Map">
+        SELECT
+                su.sid,st.name
+        FROM sys_user su
+                     LEFT JOIN sys_staffinfo st
+                ON su.`staffSid` = st.`sid`
+        WHERE su.sid != #{userSid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -319,7 +319,7 @@ public class SysUserRest implements SysUserFeign {
         String captcha = redisUtil.get(uuid);
         List<Map> list = JSONObject.parseArray(captcha, Map.class);
 
-        if (StringUtils.isEmpty(verifyCode)) {
+       /* if (StringUtils.isEmpty(verifyCode)) {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
         }
 
@@ -384,7 +384,7 @@ public class SysUserRest implements SysUserFeign {
             isCorrect = true;
         } else {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
-        }
+        }*/
         if (StringUtils.isBlank(userName)) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
         }
@@ -577,4 +577,9 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<List<SysUserVo>> getUserByRole(UserQuery query) {
         return sysUserService.getUserByRole(query);
     }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
+        return sysUserService.getUserByOrgSid(orgSid,userSid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -901,4 +901,19 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
 
     }
+
+    public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> userByOrgSid = baseMapper.getUserByOrgSid(userSid);
+        List<Map<String, String>> user = new ArrayList<>();
+        for (Map<String, String> map : userByOrgSid) {
+            String s = map.get("sid");
+            ResultBean<String> pathSidByUserSid = sysStaffOrgService.getPathSidByUserSid(s);
+            String data = pathSidByUserSid.getData();
+            if (data.equals(orgSid)){
+                user.add(map);
+            }
+        }
+        return rb.success().setData(user);
+    }
 }

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

@@ -70,6 +70,12 @@ public class AppScmVehicleStayInventoryDto implements Dto {
     @ApiModelProperty(value = "本次盘库人员sid")
     private String inventorySid;
 
+    @ApiModelProperty(value = "当前登录人姓名")
+    private String loginName;
+
+    @ApiModelProperty(value = "当前登录人sid")
+    private String loginSid;
+
     @ApiModelProperty(value = "是否有合格证")
     private String certificate;
 

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

@@ -62,6 +62,8 @@ public class ScmVehicleInventory extends BaseEntity {
     private String InventoryDate; // 盘库日期
 	@ApiModelProperty("盘库人员")
     private String InventoryName; // 盘库人员
+    @ApiModelProperty("盘库人员sid")
+    private String InventorySid; // 盘库人员sid
 	@ApiModelProperty("盘库状态 通过/未通过")
     private String InventoryState; // 盘库状态 通过/未通过
 	@ApiModelProperty("创建组织")

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

@@ -54,7 +54,7 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 
 	@Override
 	public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState) {
-		return null;
+		return ResultBean.fireFail().setMsg("接口anrui_scm/scmvehicleinventory/updateState无法访问");
 	}
 
 	@Override
@@ -75,22 +75,25 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 
 	@Override
 	public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
-		return null;
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_scm/scmvehicleinventory/getCarInventoryList无法访问");
 	}
 
 	@Override
 	public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
-		return null;
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_scm/scmvehicleinventory/getInventory无法访问");
 	}
 
 	@Override
 	public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
-		return null;
+		return ResultBean.fireFail().setMsg("接口anrui_scm/scmvehicleinventory/saveInventory无法访问");
 	}
 
 	@Override
 	public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
-		return null;
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_scm/scmvehicleinventory/getInventoryInfo无法访问");
 	}
 
 }

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

@@ -53,19 +53,10 @@ public class ScmVehiclePatrolinspectionQuery implements Query {
     private String mainSid; // 车架号
 	@ApiModelProperty("存放地点sid")
     private String locationSid; // 存放地点sid
-	@ApiModelProperty("存放地点")
+	@ApiModelProperty("巡检开始日期")
-    private String location; // 存放地点
+    private String patrolInspectionStartDate; // 巡检开始日期
-	@ApiModelProperty("合格证（有/无）")
+    @ApiModelProperty("巡检结束日期")
-    private String certificate; // 合格证（有/无）
+    private String patrolInspectionEndDate; // 巡检结束日期
-	@ApiModelProperty("巡检日期")
-    private String patrolInspectionDate; // 巡检日期
-	@ApiModelProperty("巡检人员")
-    private String patrolInspectionName; // 巡检人员
-	@ApiModelProperty("巡检状态（通过/不通过）")
-    private String patrolInspectionState; // 巡检状态（通过/不通过）
 	@ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

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

@@ -53,21 +53,12 @@ public class ScmVehiclePatrolinspectionVo implements Vo {
 
 	@ApiModelProperty("车架号")
     private String mainSid; // 车架号
-	@ApiModelProperty("存放地点sid")
-    private String locationSid; // 存放地点sid
 	@ApiModelProperty("存放地点")
     private String location; // 存放地点
-	@ApiModelProperty("合格证（有/无）")
-    private String certificate; // 合格证（有/无）
 	@ApiModelProperty("巡检日期")
     private String patrolInspectionDate; // 巡检日期
 	@ApiModelProperty("巡检人员")
     private String patrolInspectionName; // 巡检人员
 	@ApiModelProperty("巡检状态（通过/不通过）")
     private String patrolInspectionState; // 巡检状态（通过/不通过）
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

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

@@ -77,6 +77,8 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private List<String> images;
     @ApiModelProperty("用户sid")
     private String userSid;
+    @ApiModelProperty("当前登录人姓名")
+    private String userName;
     @ApiModelProperty("创建组织")
     private String createOrgSid;
     @ApiModelProperty("使用组织")

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

@@ -74,6 +74,12 @@ public interface ScmVehiclePatrolinspectionsheetFeign {
     @ResponseBody
     public ResultBean<ScmVehiclePatrolinspectionsheetDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("根据待巡检sid查询巡检单是否存在")
+    @GetMapping("/fetchSheetBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehiclePatrolinspectionsheetDetailsVo> fetchSheetBySid(@PathVariable("sid") String sid);
+
+
     @ApiOperation("手机端-初始化 巡检操作")
     @GetMapping("/getInspection/{recordSid}")
     @ResponseBody

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

@@ -68,6 +68,11 @@ public class ScmVehiclePatrolinspectionsheetFeignFallback implements ScmVehicleP
 		return rb.setMsg("接口anrui_scm/scmvehiclepatrolinspectionsheet/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<ScmVehiclePatrolinspectionsheetDetailsVo> fetchSheetBySid(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<AppScmVehiclePatrolinspectionsheetInfoVo> getInspection(String recordSid) {
 		return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryVo.java

@@ -60,7 +60,7 @@ public class ScmVehicleStayInventoryVo implements Vo {
     private String location; // 存放地点
 	@ApiModelProperty("上次盘库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date InventoryDate; // 上次盘库日期
+    private Date lastDate; // 上次盘库日期
 	@ApiModelProperty("上次盘库人员")
-    private String InventoryName; // 上次盘库人员
+    private String lastName; // 上次盘库人员
 }

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

@@ -7,22 +7,22 @@ import lombok.Data;
 @Data
 public class AppScmVehicleStayPatrolinspectionPageVo implements Vo {
 
-    @ApiModelProperty("")
+    @ApiModelProperty("sid")
     private String sid;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("存放地点")
     private String warehouse;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("上次巡检人员")
     private String inspectionName;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("上次巡检日期")
     private String inspectionDate;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("暂存状态")
     private boolean state;
 
 }

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

@@ -53,15 +53,6 @@ public class ScmVehicleStayPatrolinspectionQuery implements Query {
     private String mainSid; // 车架号
 	@ApiModelProperty("存放地点sid")
     private String locationSid; // 存放地点sid
-	@ApiModelProperty("存放地点")
-    private String location; // 存放地点
-	@ApiModelProperty("上次巡检日期")
-    private String patrolInspectionDate; // 上次巡检日期
-	@ApiModelProperty("上次巡检人员")
-    private String patrolInspectionName; // 上次巡检人员
 	@ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

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

@@ -53,17 +53,10 @@ public class ScmVehicleStayPatrolinspectionVo implements Vo {
 
 	@ApiModelProperty("车架号")
     private String mainSid; // 车架号
-	@ApiModelProperty("存放地点sid")
-    private String locationSid; // 存放地点sid
 	@ApiModelProperty("存放地点")
     private String location; // 存放地点
 	@ApiModelProperty("上次巡检日期")
     private String patrolInspectionDate; // 上次巡检日期
 	@ApiModelProperty("上次巡检人员")
     private String patrolInspectionName; // 上次巡检人员
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

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

@@ -81,7 +81,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 	public PagerVo<ScmVehicleInventoryVo> listPageVo(PagerQuery<ScmVehicleInventoryQuery> pq) {
 		ScmVehicleInventoryQuery query = pq.getParams();
 		QueryWrapper<ScmVehicleInventory> qw = new QueryWrapper<>();
-		qw.eq("createOrg",query.getCreateOrgSid());
+		qw.eq("createOrgSid",query.getCreateOrgSid());
 		if (StringUtils.isNotBlank(query.getMainSid())){
 			qw.like("mainSid",query.getMainSid());
 		}
@@ -191,15 +191,25 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 	public ResultBean AppScmVehicleStayInventoryDto(AppScmVehicleStayInventoryDto dto) {
 		ResultBean rb = ResultBean.fireFail();
 		String inventorySid = dto.getInventorySid();
-		String[] split = inventorySid.split(",");
+		/*String[] split = inventorySid.split(",");
 		if (split.length < 2){
 			return rb.setMsg("请选择盘库人员");
+		}*/
+		String inventoryName = dto.getInventoryName();
+		if (StringUtils.isBlank(inventoryName)){
+			return rb.setMsg("请选择盘库人员");
 		}
 		String sid = dto.getSid();
 		scmVehicleStayInventoryService.delBySid(sid,dto.getInventoryName());
 		ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
 		BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
 		scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+		String loginName = dto.getLoginName();
+		String loginSid = dto.getLoginSid();
+		inventoryName += "、" + loginName;
+		inventorySid += "," + loginSid;
+		scmVehicleInventory.setInventoryName(inventoryName);
+		scmVehicleInventory.setInventorySid(inventorySid);
 		save(scmVehicleInventory);
 		return rb.success().setMsg("保存成功");
 	}

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

@@ -70,7 +70,19 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
 
     public PagerVo<ScmVehiclePatrolinspectionVo> listPageVo(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
         ScmVehiclePatrolinspectionQuery query = pq.getParams();
-        QueryWrapper<ScmVehiclePatrolinspection> qw = createQueryWrapper(query);
+        QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid",query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getMainSid())){
+            qw.like("mainSid",query.getMainSid());
+        }
+        if (StringUtils.isNotBlank(query.getLocationSid())){
+            qw.like("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')"
+                );
         IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);

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

@@ -31,10 +31,12 @@ 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.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;
+import org.apache.ibatis.annotations.Update;
 
 
 import java.util.List;
@@ -72,4 +74,10 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
      * @return
      */
     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);
+
+    @Select("SELECT * FROM scm_vehicle_patrolinspectionsheet WHERE patrolInspectionSid = #{sid}")
+    ScmVehiclePatrolinspectionsheetDetailsVo fetchSheetBySid(String sid);
 }

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

@@ -92,6 +92,11 @@ public class ScmVehiclePatrolinspectionsheetRest implements ScmVehiclePatrolinsp
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<ScmVehiclePatrolinspectionsheetDetailsVo> fetchSheetBySid(String sid) {
+        return scmVehiclePatrolinspectionsheetService.fetchSheetBySid(sid);
+    }
+
     @Override
     public ResultBean<AppScmVehiclePatrolinspectionsheetInfoVo> getInspection(String recordSid) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -30,9 +30,12 @@ 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.ScmVehiclePatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
 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.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -46,7 +49,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -67,13 +72,12 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
 
     @Autowired
     ScmFileService scmFileService;
-
     @Autowired
     FileUploadComponent fileUploadComponent;
-
     @Autowired
     ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService;
-
+    @Autowired
+    ScmVehicleStayPatrolinspectionService scmVehicleStayPatrolinspectionService;
     @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
 
@@ -208,6 +212,25 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmFileService.save(scmFile1);
         }
         save(scmVehiclePatrolinspectionsheet);
+        String patrolInspectionSid = scmVehiclePatrolinspectionsheet.getPatrolInspectionSid();
+        ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = scmVehicleStayPatrolinspectionService.fetchBySid(patrolInspectionSid);
+        scmVehicleStayPatrolinspectionService.updateByStaySid(patrolInspectionSid);
+        ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+        scmVehiclePatrolinspection.setMainSid(scmVehicleStayPatrolinspection.getMainSid());
+        scmVehiclePatrolinspection.setPatrolInspectionState("1");
+        scmVehiclePatrolinspection.setLocation(scmVehicleStayPatrolinspection.getLocation());
+        scmVehiclePatrolinspection.setLocationSid(scmVehicleStayPatrolinspection.getLocationSid());
+        scmVehiclePatrolinspection.setPatrolInspectionDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+        scmVehiclePatrolinspection.setPatrolInspectionName(dto.getUserName());
+        scmVehiclePatrolinspection.setCreateOrgSid(dto.getCreateOrgSid());
+        scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+        baseMapper.updatePatSid(dto.getSid(),scmVehiclePatrolinspection.getSid());
         return rb.success();
     }
+
+    public ResultBean<ScmVehiclePatrolinspectionsheetDetailsVo> fetchSheetBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehiclePatrolinspectionsheetDetailsVo scmVehiclePatrolinspectionsheetDetailsVo = baseMapper.fetchSheetBySid(sid);
+        return rb.success().setData(scmVehiclePatrolinspectionsheetDetailsVo);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java

@@ -66,8 +66,8 @@ public interface ScmVehicleStayInventoryMapper extends BaseMapper<ScmVehicleStay
 
     List<ScmVehicleStayInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
 
-    @Select("select * from scm_vehicle_stay_inventory where isDelete = 0")
+    @Select("select * from scm_vehicle_stay_inventory where isDelete = 0 and createOrgSid = #{orgSid}")
-    List<ScmVehicleStayInventoryVo> selectListVo();
+    List<ScmVehicleStayInventoryVo> selectListVo(String orgSid);
 
     /**
      * 手机端-获取盘库列表

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml

@@ -4,7 +4,15 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo">
-        SELECT * FROM scm_vehicle_stay_inventory
+        SELECT
+        svsi.sid,
+        svsi.mainSid,
+        svsi.location,
+        svi.InventoryDate AS lastDate,
+        svi.InventoryName AS lastName
+        FROM scm_vehicle_stay_inventory svsi
+        LEFT JOIN scm_vehicle_inventory svi
+        ON svsi.`mainSid` = svi.`mainSid`
         <where>${ew.sqlSegment}</where>
     </select>
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java

@@ -68,7 +68,6 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
 
     @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
-
     @Autowired
     BaseVehicleFeign baseVehicleFeign;
 
@@ -82,12 +81,12 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
     public PagerVo<ScmVehicleStayInventoryVo> listPageVo(PagerQuery<ScmVehicleStayInventoryQuery> pq) {
         ScmVehicleStayInventoryQuery query = pq.getParams();
         QueryWrapper<ScmVehicleStayInventory> qw = new QueryWrapper<>();
-        qw.eq("createOrgSid",query.getCreateOrgSid());
+        qw.eq("svsi.createOrgSid",query.getCreateOrgSid());
         if (StringUtils.isNotBlank(query.getMainSid())){
-            qw.like("mainSid",query.getMainSid());
+            qw.like("svsi.mainSid",query.getMainSid());
         }
         if (StringUtils.isNotBlank(query.getLocationSid())){
-            qw.eq("locationSid",query.getLocationSid());
+            qw.eq("svsi.locationSid",query.getLocationSid());
         }
         IPage<ScmVehicleStayInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleStayInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -136,15 +135,18 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
     public ResultBean getInventoryRecords(String userSid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
-        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectListVo();
+        ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        String orgSid = pathSidByUserSid.getData();
+        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectListVo(orgSid);
         if (scmVehicleStayInventoryVos.size() > 0){
-            return rb.setMsg("盘库失败，请查看是否有未盘库的记录");
+            return rb.setMsg("生成盘库记录失败，请查看是否有未盘库的记录");
         }
         for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
             ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
             scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin());
             scmVehicleStayInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
             scmVehicleStayInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
+            scmVehicleStayInventory.setCreateOrgSid(orgSid);
             save(scmVehicleStayInventory);
         }
         return rb.success();

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

@@ -37,6 +37,7 @@ import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrol
 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;
@@ -64,8 +65,8 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
 
     List<ScmVehicleStayPatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayPatrolinspection> qw);
 
-    @Select("select * from scm_vehicle_stay_patrolinspection")
+    @Select("select * from scm_vehicle_stay_patrolinspection where isDelete = 0 and createOrgSid = #{orgSid}")
-    List<ScmVehicleStayPatrolinspectionVo> selectListVo();
+    List<ScmVehicleStayPatrolinspectionVo> selectListVo(String orgSid);
 
     /**
      * 手机端-获取巡检列表
@@ -76,4 +77,7 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
      * @return
      */
     IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
+
+    @Update("update scm_vehicle_stay_patrolinspection set isDelete = 1")
+    void updateByStaySid(String patrolInspectionSid);
 }

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

@@ -100,9 +100,7 @@ public class ScmVehicleStayPatrolinspectionRest implements ScmVehicleStayPatroli
 
     @Override
     public ResultBean getInspectionRecords(String userSid) {
-        ResultBean rb = ResultBean.fireFail();
+        return scmVehicleStayPatrolinspectionService.getInspectionRecords(userSid);
-        scmVehicleStayPatrolinspectionService.getInspectionRecords(userSid);
-        return rb.success();
     }
 
     @Override

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

@@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventory;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -126,8 +127,14 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
      * @param userSid
      */
     @Transactional(rollbackFor = Exception.class)
-    public void getInspectionRecords(String userSid) {
+    public ResultBean getInspectionRecords(String userSid) {
-
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        String orgSid = pathSidByUserSid.getData();
+        List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selectListVo(orgSid);
+        if (scmVehicleStayPatrolinspectionVos.size() > 0){
+            return rb.setMsg("生成巡检记录失败，请查看是否有未巡检的记录");
+        }
         List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
         for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
             ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = new ScmVehicleStayPatrolinspection();
@@ -136,7 +143,7 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
             scmVehicleStayPatrolinspection.setLocation(appScmInventoryRecordsVo.getWarehouse());
             save(scmVehicleStayPatrolinspection);
         }
-
+        return rb.success();
     }
 
     /**
@@ -172,4 +179,8 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
         qw.eq("svsp.isDelete", "0");
         return qw;
     }
+
+    public void updateByStaySid(String patrolInspectionSid) {
+        baseMapper.updateByStaySid(patrolInspectionSid);
+    }
 }

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

@@ -53,7 +53,7 @@ public class PatrolinspectionDto implements Dto {
 
     @ApiModelProperty("记录sid")
     @JsonProperty("recordSid")
-    private String sid;
+    private String patrolInspectionSid;
 
     @ApiModelProperty("车架号")
     @JsonProperty("vin")