移动端巡检，盘库接口

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmInventoryRecordsVo implements Vo {
+
+    @ApiModelProperty("列表sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+}

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

@@ -273,4 +273,7 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("根据用户sid 获取库存车辆信息")
+    @GetMapping("/selectInventoryRecords/{userSid}")
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);
 }

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

@@ -201,4 +201,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+        return null;
+    }
+
 }

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

@@ -375,4 +375,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     String selectImage(String vehicleSid);
 
     List<AppScmWarehouseVinVo> getVinByWarehouseSid(@Param("warehouseSid") String warehouseSid);
+
+    List<AppScmInventoryRecordsVo> selectInventoryRecords(@Param("userOrgSid") String userOrgSid);
 }

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

@@ -13,13 +13,13 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT bv.sid,
-               bv.modelName,
-               bv.vinNo,
-               bv.engineNo,
-               bv.vehicleStateValue,
-               bv.locationName,
-               bv.libraryAge,
-               bv.modelConfigSid
+        bv.modelName,
+        bv.vinNo,
+        bv.engineNo,
+        bv.vehicleStateValue,
+        bv.locationName,
+        bv.libraryAge,
+        bv.modelConfigSid
         FROM base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -59,10 +59,10 @@
         <!--库龄（根据首次发车日期计算）-->
         bv.libraryAge
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-                 LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
-            ${ew.customSqlSegment}
+        LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+        LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
+        ${ew.customSqlSegment}
     </select>
     <!--删除或批量删除车辆信息-->
     <delete id="deleteBySids" parameterType="java.util.List">
@@ -148,16 +148,16 @@
         bvm.isValidity,
         bvm.isValidityValue
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
-                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+        LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
+        LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         WHERE bvm.sid = #{modelSid}
-          AND bmc.sid = #{modelConfigSid}
+        AND bmc.sid = #{modelConfigSid}
     </select>
     <!--导入车辆信息-->
     <insert id="saveList">
         INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
-                                 vehicleState, firstStartDate, libraryAge)
+        vehicleState, firstStartDate, libraryAge)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -186,8 +186,8 @@
     </select>
     <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         select bv.sid,
-               bv.modelSid,
-               bv.modelConfigSid,
+        bv.modelSid,
+        bv.modelConfigSid,
         <!--车架号(VIN)-->
         bv.vinNo,
         <!--发动机号/许可证号-->
@@ -246,13 +246,13 @@
     <select id="getAppCurrentCarByPageList"
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
         SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias,
-               bvm.brandName,
-               bvm.vehicleVersionValue,
-               bvm.fuelTypeValue,
-               bvm.gearboxTypeValue
+        bvm.vehicleAlias,
+        bvm.brandName,
+        bvm.vehicleVersionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -464,11 +464,11 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        ${ew.customSqlSegment}
         ORDER BY
-            bv.priceDate desc
+        bv.priceDate desc
     </select>
 
     <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo">
@@ -552,29 +552,29 @@
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
-        SELECT DISTINCT bvm.sid                               AS modelSid,
-                        bvm.vehicleAlias                      AS modelName,
-                        bvm.brandName,
-                        bvm.carBrand                          AS brandSid,
-                        bvm.vehicleVersionValue               AS versionValue,
-                        bvm.fuelTypeValue,
-                        bvm.gearboxTypeValue,
-                        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
-                         FROM base_vehmodel_config bvc
-                         WHERE bvc.modelSid = bvm.sid
-                           AND bvc.useOrgSid = #{useOrgSid})  AS guidedPrice,
-                        (SELECT count(*)
-                         FROM base_vehmodel_config bvc2
-                         WHERE bvc2.modelSid = bvm.sid
-                           AND bvc2.useOrgSid = #{useOrgSid}) AS configNum,
-                        (SELECT count(*)
-                         FROM base_vehicle bv
-                         WHERE bv.modelSid = bvm.sid
-                           AND bv.lockedState = #{state}
-                           and bv.useOrg = #{useOrgSid})      AS nowCarNum
+        SELECT DISTINCT bvm.sid AS modelSid,
+        bvm.vehicleAlias AS modelName,
+        bvm.brandName,
+        bvm.carBrand AS brandSid,
+        bvm.vehicleVersionValue AS versionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue,
+        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
+        FROM base_vehmodel_config bvc
+        WHERE bvc.modelSid = bvm.sid
+        AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
+        (SELECT count(*)
+        FROM base_vehmodel_config bvc2
+        WHERE bvc2.modelSid = bvm.sid
+        AND bvc2.useOrgSid = #{useOrgSid}) AS configNum,
+        (SELECT count(*)
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
-                 left join base_vehmodel_config bvc on bvc.modelSid = bvm.sid
+        WHERE bv.modelSid = bvm.sid
+        AND bv.lockedState = #{state}
+        and bv.useOrg = #{useOrgSid}) AS nowCarNum
+        FROM base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        left join base_vehmodel_config bvc on bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
             <if test="useOrgSid != null and useOrgSid != ''">
@@ -775,4 +775,14 @@
         from base_vehicle bv
         where bv.location = #{warehouseSid}
     </select>
+
+    <select id="selectInventoryRecords"
+            resultType="com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo">
+        select sid,
+               vinNo        as vin,
+               locationName as warehouse,
+               location     as warehouseSid
+        from base_vehicle bv
+        where bv.useOrg = #{userOrgSid}
+    </select>
 </mapper>

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

@@ -593,5 +593,10 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid);
     }
 
+    @Override
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+        return baseVehicleService.selectInventoryRecords(userSid);
+    }
+
 
 }

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

@@ -1390,4 +1390,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid);
+        return rb.success().setData(list);
+    }
 }

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleCarInventoryListPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 盘库人员")
+    private String names;
+
+    @ApiModelProperty("时间段 示例 2020-02-01至2022-03-31")
+    private String date;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("盘库状态 通过1 不通过 2")
+    private String state;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+
+}

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

@@ -0,0 +1,44 @@
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleCarInventoryListPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("合格证状态")
+    private String certificateState;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("最新盘库日期")
+    private String newInventoryDate;
+
+    @ApiModelProperty("最新存放地点")
+    private String newWarehouse;
+
+    @ApiModelProperty("最新盘库人员")
+    private String newInventoryName;
+
+    @ApiModelProperty("盘库人员Sid 除自己外另一人的sid")
+    private String inventorySid;
+
+    @ApiModelProperty("盘库人员名称 除自己外另一人的姓名")
+    private String inventoryName;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("是否显示办理按钮 不通过时显")
+    private boolean showUpdataBtn;
+
+
+}

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

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryVo.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo <br/>
+ * Description: 待盘库记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
+public class AppScmVehicleStayInventoryDetailedsVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("合格证状态 有true")
+    private String certificateState;
+
+    @ApiModelProperty("本次盘库日期")
+    private String date;
+
+    @ApiModelProperty("本次存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("本次本次盘库人员")
+    private String name;
+
+    @ApiModelProperty("本次盘库状态")
+    private String state;
+
+    @ApiModelProperty("本次备注 “”/null 默认 -")
+    private String remarks;
+
+    @ApiModelProperty("上次盘库信息 无 默认null")
+    private LastInfo lastInfo;
+
+}

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

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryDto.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryDto <br/>
+ * Description: 待盘库记录 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 数据传输对象", description = "待盘库记录 数据传输对象")
+public class AppScmVehicleStayInventoryDto implements Dto {
+
+    @ApiModelProperty(value = "车架号")
+    private String mainSid;
+
+    @ApiModelProperty(value = "存放地点")
+    private String location;
+
+    @ApiModelProperty(value = "上次盘库日期")
+    private String lastData;
+
+    @ApiModelProperty(value = "上次盘库人员")
+    private String lastName;
+
+    @ApiModelProperty(value = "本次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty(value = "本次盘库人员sid")
+    private String inventorySid;
+
+    @ApiModelProperty(value = "是否有合格证")
+    private String certificate;
+
+    @ApiModelProperty(value = "是否有合格证")
+    private String certificateKey;
+
+    @ApiModelProperty(value = "状态 是否通过")
+    private String InventoryState;
+
+    @ApiModelProperty(value = "状态")
+    private String InventoryStateKey;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

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

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryVo.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo <br/>
+ * Description: 待盘库记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
+public class AppScmVehicleStayInventoryInfoVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid; // sid
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次盘库日期")
+    private String lastData;
+
+    @ApiModelProperty("上次盘库人")
+    private String lastName;
+
+    @ApiModelProperty("本次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty("本次盘库人员sid")
+    private String inventorySid;
+
+    @ApiModelProperty("是否有合格证")
+    private String certificateType;
+
+    @ApiModelProperty("是否有合格证")
+    private String certificateKey;
+
+    @ApiModelProperty("状态 是否通过")
+    private String stateType;
+
+    @ApiModelProperty("状态key")
+    private String stateKey;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LastInfo implements Vo {
+
+    @ApiModelProperty("上次盘库日期")
+    private String lastDate;
+
+    @ApiModelProperty("上次盘库名称")
+    private String lastName;
+
+    @ApiModelProperty("上次存放地点")
+    private String lastWarehouse;
+
+    @ApiModelProperty("上次盘库状态")
+    private String lastState;
+
+    @ApiModelProperty("上次合格证状态")
+    private String lastCertificateState;
+
+    @ApiModelProperty("上次备注")
+    private String lastRemarks;
+
+}

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

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleInventoryFeign.java <br/>
@@ -65,14 +63,35 @@ public interface ScmVehicleInventoryFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehicleInventoryDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehicleInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-获取盘库记录列表")
+    @PostMapping("/getCarInventoryList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化盘库操作")
+    @GetMapping("/getInventory/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(@PathVariable("recordSid") String recordSid);
+
+    @ApiOperation("手机端-保存盘库操作")
+    @PostMapping("/saveInventory")
+    @ResponseBody
+    public ResultBean saveInventory(@RequestBody AppScmVehicleStayInventoryDto dto);
+
+    @ApiOperation("手机端-盘库详情")
+    @GetMapping("/getInventoryInfo/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(@PathVariable("recordSid") String recordSid);
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.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: ScmVehicleInventoryFeignFallback.java <br/>
@@ -69,4 +67,25 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehicleinventory/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+		return null;
+	}
+
 }

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

@@ -0,0 +1,9 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppScmVehiclePatrolinspectionDetailedsVo implements Vo {
+
+}

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

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionDto.java <br/>
+ * Class: anrui_scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionDto <br/>
+ * Description: 巡检记录 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "巡检记录 数据传输对象", description = "巡检记录 数据传输对象")
+public class AppScmVehiclePatrolinspectionDto implements Dto {
+
+    private String sid; // sid
+
+    @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/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionInfoVo.java

@@ -0,0 +1,45 @@
+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;
+
+@Data
+public class AppScmVehiclePatrolinspectionInfoVo implements Vo {
+
+    @ApiModelProperty("记录sid")
+    private String recordSid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("巡检情况说明")
+    private String explain;
+
+    @ApiModelProperty("存在的问题及处理结果")
+    private String result;
+
+    @ApiModelProperty("相关责任人")
+    private String liableName;
+
+    @ApiModelProperty("相关责任人")
+    private String liableSid;
+
+    @ApiModelProperty("相关照片")
+    private List<String> images;
+
+    @ApiModelProperty("经纬度")
+    private String location;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppScmVehiclePatrolinspectionPageQuery implements Query {
+
+    private String userSid;
+
+    private String names;
+
+    private String useOrgSid;
+
+}

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AppScmVehiclePatrolinspectionPageVo implements Vo {
+
+    private String sid;
+
+    private String vin;
+
+    private String newInspectionDate;
+
+    private String newInspectionName;
+
+    private String warehouse;
+
+}

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

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehiclePatrolinspectionFeign.java <br/>
@@ -65,14 +63,34 @@ public interface ScmVehiclePatrolinspectionFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehiclePatrolinspectionDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehiclePatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-获取巡检记录列表")
+    @PostMapping("/getCarInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化 巡检操作")
+    @GetMapping("/getInspection/{recordSid}")
+    @ResponseBody
+    public ResultBean<AppScmVehiclePatrolinspectionInfoVo> getInspection(@PathVariable("recordSid") String recordSid);
+
+    @ApiOperation("手机端-保存巡检操作")
+    @PostMapping("/saveInspection")
+    @ResponseBody
+    public ResultBean saveInspection(@RequestBody AppScmVehiclePatrolinspectionDto dto);
+
+    @ApiOperation("手机端-通过巡检操作")
+    @PostMapping("/submitInspection")
+    @ResponseBody
+    public ResultBean submitInspection(@RequestBody AppScmVehiclePatrolinspectionDto dto);
 }

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

@@ -69,4 +69,24 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehiclepatrolinspection/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppScmVehiclePatrolinspectionInfoVo> getInspection(String recordSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInspection(AppScmVehiclePatrolinspectionDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitInspection(AppScmVehiclePatrolinspectionDto dto) {
+		return null;
+	}
 }

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

@@ -0,0 +1,21 @@
+package com.yxt.anrui.scm.api.scmvehiclestayinventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayInventoryListPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 盘库人员")
+    private String names;
+
+    @ApiModelProperty(" 存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
+    private String warehouseSid;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+}

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

@@ -0,0 +1,29 @@
+package com.yxt.anrui.scm.api.scmvehiclestayinventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayInventoryListPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty("上次盘库日期")
+    private String inventoryDate;
+
+    @ApiModelProperty("合格证状态")
+    private String certificateState;
+
+
+}

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

@@ -65,14 +65,27 @@ public interface ScmVehicleStayInventoryFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehicleStayInventoryDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehicleStayInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+    @ApiOperation("手机端-判断是否生成盘库记录")
+    @GetMapping("/getInventoryRecords/{userSid}")
+    @ResponseBody
+    public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-获取盘库列表")
+    @PostMapping("/getInventoryList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery);
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeignFallback.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: ScmVehicleStayInventoryFeignFallback.java <br/>
@@ -69,4 +67,16 @@ public class ScmVehicleStayInventoryFeignFallback implements ScmVehicleStayInven
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehiclestayinventory/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean getInventoryRecords(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
+
 }

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
+    private String names;
+
+    @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
+    private String warehouseSid;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleStayPatrolinspectionPageVo implements Vo {
+
+    @ApiModelProperty("")
+    private String sid;
+
+    @ApiModelProperty("")
+    private String vin;
+
+    @ApiModelProperty("")
+    private String warehouse;
+
+    @ApiModelProperty("")
+    private String inspectionName;
+
+    @ApiModelProperty("")
+    private String inspectionDate;
+
+    @ApiModelProperty("")
+    private boolean state;
+
+}

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

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleStayPatrolinspectionFeign.java <br/>
@@ -65,14 +63,27 @@ public interface ScmVehicleStayPatrolinspectionFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehicleStayPatrolinspectionDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmVehicleStayPatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-判断是否生成巡检记录")
+    @GetMapping("/getInspectionRecords/{userSid}")
+    @ResponseBody
+    public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
+
+
+    @ApiOperation("手机端-获取巡检列表")
+    @PostMapping("/getInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery);
+
+
 }

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

@@ -69,4 +69,16 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui_scm/scmvehiclestaypatrolinspection/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean getInspectionRecords(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
+		return null;
+	}
+
+
 }

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

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;

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

@@ -26,11 +26,11 @@
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
-import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -63,4 +63,31 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
 	
 	@Select("select * from scm_vehicle_inventory")
 	List<ScmVehicleInventoryVo> selectListVo();
+
+	/**
+	 * 手机端-获取盘库记录列表
+	 *
+	 * @param page
+	 * @param qw
+	 * @param names
+	 * @return
+	 */
+	IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(IPage<AppScmVehicleCarInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw, @Param("names") String names);
+
+	/**
+	 * 手机端-初始化盘库操作
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	AppScmVehicleStayInventoryInfoVo getInventory(@Param("recordSid") String recordSid);
+
+	/**
+	 * 手机端-盘库详情
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(@Param("recordSid") String recordSid);
+
 }

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

@@ -12,4 +12,58 @@
         SELECT * FROM scm_vehicle_inventory
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="getCarInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo">
+        SELECT
+        sid,
+        mainSid AS vin,
+        certificate AS certificateState,
+        InventoryState AS `state`,
+        inventorySid,
+        inventoryName,
+        remarks,
+        ( SELECT count( certificate ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) )
+        AS newInventoryDate,
+        ( SELECT count( location ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) ) AS
+        newWarehouse,
+        ( SELECT count( inventoryName ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime )
+        ) AS newInventoryName
+        FROM
+        scm_vehicle_inventory svi
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svi.mainSid,svi.InventoryName) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
+    <select id="getInventory"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryInfoVo">
+        SELECT sid,
+               mainSid        AS vin,
+               location       AS warehouse,
+               inventorySid,
+               inventoryName,
+               certificate    AS certificateType,
+               InventoryState AS stateType,
+               remarks
+        FROM scm_vehicle_inventory
+        where sid = #{recordSid}
+    </select>
+
+    <select id="getInventoryInfo"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryDetailedsVo">
+        SELECT mainSid           AS vin,
+               certificateKey    AS certificateState,
+               InventoryDate     AS `date`,
+               location          AS warehouse,
+               inventoryName     AS `name`,
+               InventoryStateKey AS state,
+               remarks
+        FROM scm_vehicle_inventory
+        where sid = #{recordSid}
+    </select>
 </mapper>

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

@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+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;
@@ -92,4 +95,36 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
 		ScmVehicleInventoryDetailsVo vo = scmVehicleInventoryService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
+		if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+			new ResultBean<>().success().setMsg("用户sid不能为空");
+		}
+		PagerVo<AppScmVehicleCarInventoryListPageVo> page = new PagerVo<>();
+		IPage<AppScmVehicleCarInventoryListPageVo> iPage = scmVehicleInventoryService.getCarInventoryList(pagerQuery);
+		PagerVo<AppScmVehicleCarInventoryListPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+		return new ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>>().success().setData(pagerVo);
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
+		ResultBean rb = ResultBean.fireFail();
+		AppScmVehicleStayInventoryInfoVo vo = scmVehicleInventoryService.getInventory(recordSid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		scmVehicleInventoryService.AppScmVehicleStayInventoryDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+		ResultBean rb = ResultBean.fireFail();
+		AppScmVehicleStayInventoryDetailedsVo vo = scmVehicleInventoryService.getInventoryInfo(recordSid);
+		return rb.success().setData(vo);
+	}
 }

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

@@ -28,7 +28,11 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory;
 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.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -36,9 +40,9 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -55,6 +59,13 @@ import java.util.List;
  */
 @Service
 public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInventoryMapper, ScmVehicleInventory> {
+
+	@Autowired
+	SysStaffOrgFeign sysStaffOrgFeign;
+
+	@Autowired
+	BaseVehicleFeign baseVehicleFeign;
+
 	private QueryWrapper<ScmVehicleInventory> createQueryWrapper(ScmVehicleInventoryQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -102,4 +113,78 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	/**
+	 * 手机端-获取盘库记录列表
+	 *
+	 * @param pagerQuery
+	 * @return
+	 */
+	public IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery) {
+		IPage<AppScmVehicleCarInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+		String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+		pagerQuery.getParams().setUseOrgSid(useOrgSid);
+		QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
+		AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
+		IPage<AppScmVehicleCarInventoryListPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
+		return iPage;
+	}
+
+	/**
+	 * 手机端-获取盘库记录列表 查询条件
+	 *
+	 * @param query
+	 * @return
+	 */
+	private QueryWrapper<AppScmVehicleCarInventoryListPageVo> appCarQueryWrapper(AppScmVehicleCarInventoryListPageQuery query) {
+		QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+			qw.eq("svi.createOrgSid", query.getUseOrgSid());
+		}
+		if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+			qw.eq("svi.locationSid", query.getWarehouseSid());
+		}
+		if (StringUtils.isNotBlank(query.getState())) {
+			qw.eq("svi.InventoryState", query.getState());
+		}
+		return qw;
+	}
+
+	/**
+	 * 手机端-初始化盘库操作
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	public AppScmVehicleStayInventoryInfoVo getInventory(String recordSid) {
+		AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid);
+		return vo;
+	}
+
+	/**
+	 * 手机端-保存盘库操作
+	 *
+	 * @param dto
+	 * @return
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public ResultBean AppScmVehicleStayInventoryDto(AppScmVehicleStayInventoryDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
+		ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
+		BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
+		save(scmVehicleInventory);
+		return rb.success().setMsg("保存成功");
+	}
+
+	/**
+	 * 手机端-盘库详情
+	 *
+	 * @param recordSid
+	 * @return
+	 */
+	public AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(String recordSid) {
+		AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid);
+		return vo;
+	}
 }

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

@@ -26,11 +26,11 @@
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
-import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +53,31 @@ import java.util.List;
 @Mapper
 public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehiclePatrolinspection> {
 
-	//@Update("update scm_vehicle_patrolinspection set name=#{msg} where id=#{id}")
-	//IPage<ScmVehiclePatrolinspectionVo> voPage(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehiclePatrolinspection> qw);
-	
-	IPage<ScmVehiclePatrolinspectionVo> selectPageVo(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
-	
-	List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
-	
-	@Select("select * from scm_vehicle_patrolinspection")
-	List<ScmVehiclePatrolinspectionVo> selectListVo();
+    //@Update("update scm_vehicle_patrolinspection set name=#{msg} where id=#{id}")
+    //IPage<ScmVehiclePatrolinspectionVo> voPage(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehiclePatrolinspection> qw);
+
+    IPage<ScmVehiclePatrolinspectionVo> selectPageVo(IPage<ScmVehiclePatrolinspection> page, @Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
+
+    List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
+
+    @Select("select * from scm_vehicle_patrolinspection")
+    List<ScmVehiclePatrolinspectionVo> selectListVo();
+
+    /**
+     * 手机端-获取巡检记录列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw, @Param("names") String names);
+
+    /**
+     * 手机端-初始化 巡检操作
+     *
+     * @param recordSid
+     * @return
+     */
+    AppScmVehiclePatrolinspectionInfoVo getInspection(@Param("recordSid") String recordSid);
 }

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

@@ -14,4 +14,27 @@
         SELECT * FROM scm_vehicle_patrolinspection
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="getCarInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
+        SELECT
+        sid,
+        mainSid as vin,
+        location as warehouse,
+        FROM
+        scm_vehicle_patrolinspection svp
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svp.mainSid,svp.patrolInspectionDate ,svp.location) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
+    <select id="getInspection"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionInfoVo">
+
+
+    </select>
 </mapper>

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

@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+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;
@@ -91,4 +94,36 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio
         ScmVehiclePatrolinspectionDetailsVo vo = scmVehiclePatrolinspectionService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmVehiclePatrolinspectionPageVo> page = new PagerVo<>();
+        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = scmVehiclePatrolinspectionService.getCarInventoryList(pagerQuery);
+        PagerVo<AppScmVehiclePatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>>().success().setData(pagerVo);
+    }
+
+    @Override
+    public ResultBean<AppScmVehiclePatrolinspectionInfoVo> getInspection(String recordSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppScmVehiclePatrolinspectionInfoVo vo = scmVehiclePatrolinspectionService.getInspection(recordSid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehiclePatrolinspectionService.saveInspection(dto);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean submitInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehiclePatrolinspectionService.submitInspection(dto);
+        return rb.success();
+    }
 }

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

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 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.scmvehiclepatrolinspection.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -37,9 +38,9 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -56,51 +57,121 @@ import java.util.List;
  */
 @Service
 public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVehiclePatrolinspectionMapper, ScmVehiclePatrolinspection> {
-	private QueryWrapper<ScmVehiclePatrolinspection> createQueryWrapper(ScmVehiclePatrolinspectionQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<ScmVehiclePatrolinspectionVo> listPageVo(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
-		ScmVehiclePatrolinspectionQuery query = pq.getParams();
-		QueryWrapper<ScmVehiclePatrolinspection> qw = createQueryWrapper(query);
-		IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
-		IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(ScmVehiclePatrolinspectionDto dto){
+
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+
+    private QueryWrapper<ScmVehiclePatrolinspection> createQueryWrapper(ScmVehiclePatrolinspectionQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmVehiclePatrolinspectionVo> listPageVo(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
+        ScmVehiclePatrolinspectionQuery query = pq.getParams();
+        QueryWrapper<ScmVehiclePatrolinspection> qw = createQueryWrapper(query);
+        IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(ScmVehiclePatrolinspectionDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(ScmVehiclePatrolinspectionDto dto){
-		ScmVehiclePatrolinspection entity = new ScmVehiclePatrolinspection();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(ScmVehiclePatrolinspectionDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(ScmVehiclePatrolinspectionDto dto) {
+        ScmVehiclePatrolinspection entity = new ScmVehiclePatrolinspection();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(ScmVehiclePatrolinspectionDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		ScmVehiclePatrolinspection entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public ScmVehiclePatrolinspectionDetailsVo fetchDetailsVoBySid(String sid){
-		ScmVehiclePatrolinspection entity = fetchBySid(sid);
-		ScmVehiclePatrolinspectionDetailsVo vo = new ScmVehiclePatrolinspectionDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        ScmVehiclePatrolinspection entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmVehiclePatrolinspectionDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmVehiclePatrolinspection entity = fetchBySid(sid);
+        ScmVehiclePatrolinspectionDetailsVo vo = new ScmVehiclePatrolinspectionDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    /**
+     * 手机端-获取巡检记录列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pagerQuery) {
+        IPage<AppScmVehiclePatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
+        AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
+        return iPage;
+    }
+
+    /**
+     * 手机端-获取巡检记录列表 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<AppScmVehiclePatrolinspectionPageVo> appCarQueryWrapper(AppScmVehiclePatrolinspectionPageQuery query) {
+        QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("svi.createOrgSid", query.getUseOrgSid());
+        }
+        return qw;
+    }
+
+    /**
+     * 手机端-初始化 巡检操作
+     *
+     * @param recordSid
+     * @return
+     */
+    public AppScmVehiclePatrolinspectionInfoVo getInspection(String recordSid) {
+        AppScmVehiclePatrolinspectionInfoVo vo = baseMapper.getInspection(recordSid);
+        return vo;
+    }
+
+    /**
+     * 手机端-保存巡检操作
+     *
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean saveInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+
+        return rb.success();
+    }
+
+    /**
+     * 手机端-通过巡检操作
+     *
+     * @param dto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean submitInspection(AppScmVehiclePatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.success();
+    }
 }

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

@@ -26,11 +26,15 @@
 package com.yxt.anrui.scm.biz.scmvehiclestayinventory;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventory;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryDetailedsVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryInfoVo;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -54,13 +58,25 @@ import java.util.List;
 @Mapper
 public interface ScmVehicleStayInventoryMapper extends BaseMapper<ScmVehicleStayInventory> {
 
-	//@Update("update scm_vehicle_stay_inventory set name=#{msg} where id=#{id}")
-	//IPage<ScmVehicleStayInventoryVo> voPage(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleStayInventory> qw);
-	
-	IPage<ScmVehicleStayInventoryVo> selectPageVo(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
-	
-	List<ScmVehicleStayInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
-	
-	@Select("select * from scm_vehicle_stay_inventory")
-	List<ScmVehicleStayInventoryVo> selectListVo();
+    //@Update("update scm_vehicle_stay_inventory set name=#{msg} where id=#{id}")
+    //IPage<ScmVehicleStayInventoryVo> voPage(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleStayInventory> qw);
+
+    IPage<ScmVehicleStayInventoryVo> selectPageVo(IPage<ScmVehicleStayInventory> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
+
+    List<ScmVehicleStayInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
+
+    @Select("select * from scm_vehicle_stay_inventory")
+    List<ScmVehicleStayInventoryVo> selectListVo();
+
+    /**
+     * 手机端-获取盘库列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(IPage<AppScmVehicleStayInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw, @Param("names") String names);
+
+
 }

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

@@ -12,4 +12,24 @@
         SELECT * FROM scm_vehicle_stay_inventory
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="getInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageVo">
+        SELECT
+        sid,
+        mainSid AS vin,
+        location AS warehouse,
+        InventoryDate,
+        InventoryName
+        FROM
+        scm_vehicle_stay_inventory svsi
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svsi.mainSid,svsi.InventoryName) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
 </mapper>

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

@@ -25,7 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehiclestayinventory;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
+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;
@@ -34,8 +39,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleStayInventoryFeignFallback.java <br/>
@@ -54,42 +57,62 @@ import java.util.List;
 @RequestMapping("v1/scmvehiclestayinventory")
 public class ScmVehicleStayInventoryRest implements ScmVehicleStayInventoryFeign {
 
-	@Autowired
-	private ScmVehicleStayInventoryService scmVehicleStayInventoryService;
+    @Autowired
+    private ScmVehicleStayInventoryService scmVehicleStayInventoryService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmVehicleStayInventoryVo>> listPage(@RequestBody PagerQuery<ScmVehicleStayInventoryQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmVehicleStayInventoryVo> pv = scmVehicleStayInventoryService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmVehicleStayInventoryVo>> listPage(@RequestBody PagerQuery<ScmVehicleStayInventoryQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehicleStayInventoryVo> pv = scmVehicleStayInventoryService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody ScmVehicleStayInventoryDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		scmVehicleStayInventoryService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ScmVehicleStayInventoryDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleStayInventoryService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		scmVehicleStayInventoryService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleStayInventoryService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmVehicleStayInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		ScmVehicleStayInventoryDetailsVo vo = scmVehicleStayInventoryService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<ScmVehicleStayInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehicleStayInventoryDetailsVo vo = scmVehicleStayInventoryService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean getInventoryRecords(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleStayInventoryService.getInventoryRecords(userSid);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmVehicleStayInventoryListPageVo> page = new PagerVo<>();
+        IPage<AppScmVehicleStayInventoryListPageVo> iPage = scmVehicleStayInventoryService.getInventoryList(pagerQuery);
+        PagerVo<AppScmVehicleStayInventoryListPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>>().success().setData(pagerVo);
+    }
+
+
 }

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

@@ -28,6 +28,13 @@ package com.yxt.anrui.scm.biz.scmvehiclestayinventory;
 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.base.api.basevehicle.AppScmInventoryRecordsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -37,7 +44,9 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -56,6 +65,13 @@ import java.util.List;
  */
 @Service
 public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicleStayInventoryMapper, ScmVehicleStayInventory> {
+
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+
     private QueryWrapper<ScmVehicleStayInventory> createQueryWrapper(ScmVehicleStayInventoryQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -103,4 +119,53 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+    /**
+     * 保存所有库存车，信息
+     *
+     * @param userSid
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void getInventoryRecords(String userSid) {
+        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
+        for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
+            ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
+            scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin());
+            scmVehicleStayInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
+            scmVehicleStayInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
+            save(scmVehicleStayInventory);
+        }
+    }
+
+    /**
+     * 手机端-获取盘库列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
+        IPage<AppScmVehicleStayInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = appQueryWrapper(pagerQuery.getParams());
+        AppScmVehicleStayInventoryListPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehicleStayInventoryListPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
+        return iPage;
+    }
+
+    /**
+     * 手机端-获取验车管理列表 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<AppScmVehicleStayInventoryListPageVo> appQueryWrapper(AppScmVehicleStayInventoryListPageQuery query) {
+        QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("svsi.createOrgSid", query.getUseOrgSid());
+        }
+        return qw;
+    }
+
+
 }

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

@@ -26,9 +26,12 @@
 package com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -54,13 +57,23 @@ import java.util.List;
 @Mapper
 public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehicleStayPatrolinspection> {
 
-	//@Update("update scm_vehicle_stay_patrolinspection set name=#{msg} where id=#{id}")
-	//IPage<ScmVehicleStayPatrolinspectionVo> voPage(IPage<ScmVehicleStayPatrolinspection> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleStayPatrolinspection> qw);
-	
-	IPage<ScmVehicleStayPatrolinspectionVo> selectPageVo(IPage<ScmVehicleStayPatrolinspection> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleStayPatrolinspection> qw);
-	
-	List<ScmVehicleStayPatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayPatrolinspection> qw);
-	
-	@Select("select * from scm_vehicle_stay_patrolinspection")
-	List<ScmVehicleStayPatrolinspectionVo> selectListVo();
+    //@Update("update scm_vehicle_stay_patrolinspection set name=#{msg} where id=#{id}")
+    //IPage<ScmVehicleStayPatrolinspectionVo> voPage(IPage<ScmVehicleStayPatrolinspection> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleStayPatrolinspection> qw);
+
+    IPage<ScmVehicleStayPatrolinspectionVo> selectPageVo(IPage<ScmVehicleStayPatrolinspection> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleStayPatrolinspection> qw);
+
+    List<ScmVehicleStayPatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayPatrolinspection> qw);
+
+    @Select("select * from scm_vehicle_stay_patrolinspection")
+    List<ScmVehicleStayPatrolinspectionVo> selectListVo();
+
+    /**
+     * 手机端-获取巡检列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
 }

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

@@ -14,4 +14,23 @@
         SELECT * FROM scm_vehicle_stay_patrolinspection
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="getInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo">
+        SELECT
+        sid,
+        mainSid AS vin,
+        location AS warehouse,
+        patrolInspectionDate as inspectionName,
+        patrolInspectionNamea as inspectionDate
+        FROM
+        scm_vehicle_stay_patrolinspection svsp
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svsp.mainSid,svsp.patrolInspectionName) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
 </mapper>

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

@@ -25,7 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.*;
+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;
@@ -55,42 +59,62 @@ import java.util.List;
 @RequestMapping("v1/scmvehiclestaypatrolinspection")
 public class ScmVehicleStayPatrolinspectionRest implements ScmVehicleStayPatrolinspectionFeign {
 
-	@Autowired
-	private ScmVehicleStayPatrolinspectionService scmVehicleStayPatrolinspectionService;
+    @Autowired
+    private ScmVehicleStayPatrolinspectionService scmVehicleStayPatrolinspectionService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmVehicleStayPatrolinspectionVo>> listPage(@RequestBody PagerQuery<ScmVehicleStayPatrolinspectionQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmVehicleStayPatrolinspectionVo> pv = scmVehicleStayPatrolinspectionService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmVehicleStayPatrolinspectionVo>> listPage(@RequestBody PagerQuery<ScmVehicleStayPatrolinspectionQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehicleStayPatrolinspectionVo> pv = scmVehicleStayPatrolinspectionService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody ScmVehicleStayPatrolinspectionDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		scmVehicleStayPatrolinspectionService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ScmVehicleStayPatrolinspectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleStayPatrolinspectionService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		scmVehicleStayPatrolinspectionService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleStayPatrolinspectionService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmVehicleStayPatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		ScmVehicleStayPatrolinspectionDetailsVo vo = scmVehicleStayPatrolinspectionService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<ScmVehicleStayPatrolinspectionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehicleStayPatrolinspectionDetailsVo vo = scmVehicleStayPatrolinspectionService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean getInspectionRecords(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        scmVehicleStayPatrolinspectionService.getInspectionRecords(userSid);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppScmVehicleStayPatrolinspectionPageVo> page = new PagerVo<>();
+        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = scmVehicleStayPatrolinspectionService.getInspectionList(pagerQuery);
+        PagerVo<AppScmVehicleStayPatrolinspectionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>>().success().setData(pagerVo);
+    }
+
+
 }

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

@@ -28,6 +28,12 @@ package com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection;
 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.base.api.basevehicle.AppScmInventoryRecordsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+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.scmvehiclestaypatrolinspection.*;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -37,7 +43,9 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -56,6 +64,13 @@ import java.util.List;
  */
 @Service
 public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<ScmVehicleStayPatrolinspectionMapper, ScmVehicleStayPatrolinspection> {
+
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+
     private QueryWrapper<ScmVehicleStayPatrolinspection> createQueryWrapper(ScmVehicleStayPatrolinspectionQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -103,4 +118,54 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+
+    /**
+     * 保存所有待巡检，信息
+     *
+     * @param userSid
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void getInspectionRecords(String userSid) {
+
+        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
+        for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
+            ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = new ScmVehicleStayPatrolinspection();
+            scmVehicleStayPatrolinspection.setMainSid(appScmInventoryRecordsVo.getVin());
+            scmVehicleStayPatrolinspection.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
+            scmVehicleStayPatrolinspection.setLocation(appScmInventoryRecordsVo.getWarehouse());
+            save(scmVehicleStayPatrolinspection);
+        }
+
+    }
+
+    /**
+     * 手机端-获取巡检列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehicleStayPatrolinspectionPageVo> getInspectionList(PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery) {
+        IPage<AppScmVehicleStayPatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
+        AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
+        return iPage;
+    }
+
+    /**
+     * 手机端-获取巡检列表 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> appQueryWrapper(AppScmVehicleStayPatrolinspectionPageQuery query) {
+        QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("svsi.createOrgSid", query.getUseOrgSid());
+        }
+        return qw;
+    }
 }

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

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+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.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionFeign.java <br/>
+ * Class: anrui_scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign <br/>
+ * Description: 巡检记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "巡检记录")
+@FeignClient(
+        contextId = "anrui-scm-ScmVehiclePatrolinspection",
+        name = "anrui-terminal",
+        path = "/supplychain/v1/inspection",
+        fallback = AppScmVehiclePatrolinspectionFeignFallback.class)
+public interface AppScmVehiclePatrolinspectionFeign {
+
+    @ApiOperation("手机端-判断是否生成巡检记录")
+    @GetMapping("/getInspectionRecords/{userSid}")
+    @ResponseBody
+    public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端-获取巡检列表")
+    @PostMapping("/getInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<StayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<StayPatrolinspectionPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-获取巡检记录列表")
+    @PostMapping("/getCarInspectionList")
+    @ResponseBody
+    public ResultBean<PagerVo<PatrolinspectionPageVo>> getCarInventoryList(@RequestBody PagerQuery<PatrolinspectionPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化 巡检操作")
+    @GetMapping("/getInspection/{recordSid}")
+    @ResponseBody
+    public ResultBean<PatrolinspectionInfoVo> getInspection(@PathVariable("recordSid") String recordSid);
+
+    @ApiOperation("手机端-保存巡检操作")
+    @PostMapping("/saveInspection")
+    @ResponseBody
+    public ResultBean saveInspection(@RequestBody PatrolinspectionDto dto);
+
+    @ApiOperation("手机端-通过巡检操作")
+    @PostMapping("/submitInspection")
+    @ResponseBody
+    public ResultBean submitInspection(@RequestBody PatrolinspectionDto dto);
+}

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

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionFeignFallback.java <br/>
+ * Class: anrui_scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeignFallback <br/>
+ * Description: 巡检记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehiclePatrolinspectionFeign {
+
+
+	@Override
+	public ResultBean getInspectionRecords(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<StayPatrolinspectionPageVo>> getInspectionList(PagerQuery<StayPatrolinspectionPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<PatrolinspectionPageVo>> getCarInventoryList(PagerQuery<PatrolinspectionPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PatrolinspectionInfoVo> getInspection(String recordSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInspection(PatrolinspectionDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitInspection(PatrolinspectionDto dto) {
+		return null;
+	}
+}

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

@@ -0,0 +1,9 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class PatrolinspectionDetailedsVo implements Vo {
+
+}

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

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionDto.java <br/>
+ * Class: anrui_scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionDto <br/>
+ * Description: 巡检记录 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "巡检记录 数据传输对象", description = "巡检记录 数据传输对象")
+public class PatrolinspectionDto implements Dto {
+
+    @ApiModelProperty("记录sid")
+    @JsonProperty("recordSid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String mainSid;
+
+    @ApiModelProperty("车型")
+    @JsonProperty("model")
+    private String model;
+
+    @ApiModelProperty("巡检情况说明")
+    @JsonProperty("explain")
+    private String situationExplain;
+
+    @ApiModelProperty("存在的问题及处理结果")
+    @JsonProperty("result")
+    private String problemsAndResults;
+
+    @ApiModelProperty("相关责任人")
+    @JsonProperty("liableName")
+    private String dutyName;
+
+    @ApiModelProperty("相关责任人")
+    @JsonProperty("liableSid")
+    private String dutySid;
+
+    @ApiModelProperty("相关照片")
+    private List<String> images;
+
+    @ApiModelProperty("经纬度")
+    @JsonProperty("location")
+    private String location;
+
+    @ApiModelProperty("详细地址")
+    @JsonProperty("address")
+    private String address;
+
+    @ApiModelProperty("用户sid")
+    @JsonProperty("userSid")
+    private String userSid;
+
+}

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

@@ -0,0 +1,45 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PatrolinspectionInfoVo implements Vo {
+
+    @ApiModelProperty("记录sid")
+    private String recordSid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("巡检情况说明")
+    private String explain;
+
+    @ApiModelProperty("存在的问题及处理结果")
+    private String result;
+
+    @ApiModelProperty("相关责任人")
+    private String liableName;
+
+    @ApiModelProperty("相关责任人")
+    private String liableSid;
+
+    @ApiModelProperty("相关照片")
+    private List<String> images;
+
+    @ApiModelProperty("经纬度")
+    private String location;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Data
+public class PatrolinspectionPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 巡检日期 存放地点")
+    private String names;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PatrolinspectionPageVo implements Vo {
+
+    @ApiModelProperty("记录sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("上次巡检日期")
+    private String newInspectionDate;
+
+    @ApiModelProperty("上次巡检人员")
+    private String newInspectionName;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+}

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StayPatrolinspectionPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
+    private String names;
+
+    @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
+    private String warehouseSid;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.supplychain.inspection;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StayPatrolinspectionPageVo implements Vo {
+
+    @ApiModelProperty("列表sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次巡检人员")
+    private String inspectionName;
+
+    @ApiModelProperty("上次巡检日期")
+    private String inspectionDate;
+
+    @ApiModelProperty("暂存状态")
+    private boolean state;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeignFallback.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleInventoryFeignFallback.java <br/>
+ * Class: anrui_scm.api.scmvehicleinventory.ScmVehicleInventoryFeignFallback <br/>
+ * Description: 盘库记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppScmVehicleInventoryFeignFallback implements AppScmVehicleInventoryFeign {
+
+	@Override
+	public ResultBean getInventoryRecords(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(PagerQuery<InventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<CarInventoryListPageVo>> getCarInventoryList(PagerQuery<CarInventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<StayInventoryInfoVo> getInventory(String recordSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInventory (StayInventoryDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<StayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+		return null;
+	}
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CarInventoryListPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 盘库人员")
+    private String names;
+
+    @ApiModelProperty("时间段 示例 2020-02-01至2022-03-31")
+    private String date;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("盘库状态 通过1 不通过 2")
+    private String state;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageVo.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CarInventoryListPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("合格证状态")
+    private String certificateState;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("最新盘库日期")
+    private String newInventoryDate;
+
+    @ApiModelProperty("最新存放地点")
+    private String newWarehouse;
+
+    @ApiModelProperty("最新盘库人员")
+    private String newInventoryName;
+
+    @ApiModelProperty("盘库人员Sid 除自己外另一人的sid")
+    private String inventorySid;
+
+    @ApiModelProperty("盘库人员名称 除自己外另一人的姓名")
+    private String inventoryName;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("是否显示办理按钮 不通过时显")
+    private boolean showUpdataBtn;
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class InventoryListPageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("优先匹配车架号 盘库人员")
+    private String names;
+
+    @ApiModelProperty("存放地点 “”/null 全部  有值时只查询当前存放地点的记录")
+    private String warehouseSid;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class InventoryListPageVo implements Vo {
+
+    @ApiModelProperty("列表sid")
+    private String sid;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty("上次盘库日期")
+    private String inventoryDate;
+
+    @ApiModelProperty("合格证状态")
+    private String certificateState;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/LastInfo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LastInfo implements Vo {
+
+    @ApiModelProperty("上次盘库日期")
+    private String lastDate;
+
+    @ApiModelProperty("上次盘库名称")
+    private String lastName;
+
+    @ApiModelProperty("上次存放地点")
+    private String lastWarehouse;
+
+    @ApiModelProperty("上次盘库状态")
+    private String lastState;
+
+    @ApiModelProperty("上次合格证状态")
+    private String lastCertificateState;
+
+    @ApiModelProperty("上次备注")
+    private String lastRemarks;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDetailedsVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryVo.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo <br/>
+ * Description: 待盘库记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
+public class StayInventoryDetailedsVo implements Vo {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("合格证状态 有true")
+    private String certificateState;
+
+    @ApiModelProperty("本次盘库日期")
+    private String date;
+
+    @ApiModelProperty("本次存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("本次本次盘库人员")
+    private String name;
+
+    @ApiModelProperty("本次盘库状态")
+    private String state;
+
+    @ApiModelProperty("本次备注 “”/null 默认 -")
+    private String remarks;
+
+    @ApiModelProperty("上次盘库信息 无 默认null")
+    private LastInfo lastInfo;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StayInventoryDto implements Dto {
+
+    @ApiModelProperty(value = "车架号")
+    @JsonProperty(value = "vin")
+    private String mainSid;
+
+    @ApiModelProperty(value = "存放地点")
+    @JsonProperty(value = "warehouse")
+    private String location;
+
+    @ApiModelProperty(value = "上次盘库日期")
+    @JsonProperty(value = "lastData")
+    private String lastData;
+
+    @ApiModelProperty(value = "上次盘库人员")
+    @JsonProperty(value = "lastName")
+    private String lastName;
+
+    @ApiModelProperty(value = "本次盘库人员")
+    @JsonProperty(value = "inventoryName")
+    private String inventoryName;
+
+    @ApiModelProperty(value = "本次盘库人员sid")
+    @JsonProperty(value = "inventorySid")
+    private String inventorySid;
+
+    @ApiModelProperty(value = "是否有合格证")
+    @JsonProperty(value = "certificateType")
+    private String certificate;
+
+    @ApiModelProperty(value = "是否有合格证")
+    @JsonProperty(value = "certificateKey")
+    private String certificateKey;
+
+    @ApiModelProperty(value = "状态 是否通过")
+    @JsonProperty(value = "stateType")
+    private String InventoryState;
+
+    @ApiModelProperty(value = "状态")
+    @JsonProperty(value = "stateKey")
+    private String InventoryStateKey;
+
+    @ApiModelProperty(value = "备注")
+    @JsonProperty(value = "remarks")
+    private String remarks;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleStayInventoryVo.java <br/>
+ * Class: anrui_scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo <br/>
+ * Description: 待盘库记录 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
+public class StayInventoryInfoVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid; // sid
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
+
+    @ApiModelProperty("上次盘库日期")
+    private String lastData;
+
+    @ApiModelProperty("上次盘库人")
+    private String lastName;
+
+    @ApiModelProperty("本次盘库人员")
+    private String inventoryName;
+
+    @ApiModelProperty("本次盘库人员sid")
+    private String inventorySid;
+
+    @ApiModelProperty("是否有合格证")
+    private String certificateType;
+
+    @ApiModelProperty("是否有合格证")
+    private String certificateKey;
+
+    @ApiModelProperty("状态 是否通过")
+    private String stateType;
+
+    @ApiModelProperty("状态key")
+    private String stateKey;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppScmVehicleEnterlibraryFeign.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "入库单")
 @FeignClient(
         contextId = "scm-ScmVehicleEnterlibrary",
-        name = "anrui-scm",
+        name = "anrui-terminal",
         path = "/supplychain/v1/carWarehousing",
         fallback = AppScmVehicleEnterlibraryFeignFallback.class)
 public interface AppScmVehicleEnterlibraryFeign {

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

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "验车单")
 @FeignClient(
         contextId = "scm-ScmVehicleExamine",
-        name = "anrui-scm",
+        name = "anrui-terminal",
         path = "/supplychain/v1/carInspected",
         fallback = AppScmVehicleExamineFeignFallback.class)
 public interface AppScmVehicleExamineFeign {

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

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+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.*;
+
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehiclePatrolinspectionFeignFallback.java <br/>
+ * Class: anrui_scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionRest <br/>
+ * Description: 巡检记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "巡检记录")
+@Controller
+@RequestMapping("/supplychain/v1/inspection")
+public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolinspectionFeign {
+
+    @Autowired
+    AppScmVehiclePatrolinspectionService appScmVehiclePatrolinspectionService;
+
+    @Override
+    public ResultBean getInspectionRecords(String userSid) {
+        return appScmVehiclePatrolinspectionService.getInspectionRecords(userSid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<StayPatrolinspectionPageVo>> getInspectionList(PagerQuery<StayPatrolinspectionPageQuery> pagerQuery) {
+        return appScmVehiclePatrolinspectionService.getInspectionList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<PagerVo<PatrolinspectionPageVo>> getCarInventoryList(PagerQuery<PatrolinspectionPageQuery> pagerQuery) {
+        return appScmVehiclePatrolinspectionService.getCarInventoryList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<PatrolinspectionInfoVo> getInspection(String recordSid) {
+        return appScmVehiclePatrolinspectionService.getInspection(recordSid);
+    }
+
+    @Override
+    public ResultBean saveInspection(PatrolinspectionDto dto) {
+        return appScmVehiclePatrolinspectionService.saveInspection(dto);
+    }
+
+    @Override
+    public ResultBean submitInspection(PatrolinspectionDto dto) {
+        return appScmVehiclePatrolinspectionService.submitInspection(dto);
+    }
+}

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

@@ -0,0 +1,128 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.inspection;
+
+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.scmvehicleenterlibrary.AppScmVehicleEnterlibraryInfoVo;
+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.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/>
+ * File: ScmVehiclePatrolinspectionService.java <br/>
+ * Class: anrui_scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService <br/>
+ * Description: 巡检记录 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppScmVehiclePatrolinspectionService {
+
+    @Autowired
+    ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign;
+
+    @Autowired
+    ScmVehicleStayPatrolinspectionFeign scmVehicleStayPatrolinspectionFeign;
+
+    public ResultBean getInspectionRecords(String userSid) {
+        ResultBean resultBean = scmVehicleStayPatrolinspectionFeign.getInspectionRecords(userSid);
+        return resultBean;
+    }
+
+    /**
+     * 手机端-获取巡检列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public ResultBean<PagerVo<StayPatrolinspectionPageVo>> getInspectionList(PagerQuery<StayPatrolinspectionPageQuery> pagerQuery) {
+        ResultBean<PagerVo<StayPatrolinspectionPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> inspectionList = scmVehicleStayPatrolinspectionFeign.getInspectionList(pq);
+        PagerVo<StayPatrolinspectionPageVo> vo = CoverUtils.selectPagerVo(inspectionList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<PagerVo<PatrolinspectionPageVo>> getCarInventoryList(PagerQuery<PatrolinspectionPageQuery> pagerQuery) {
+        ResultBean<PagerVo<PatrolinspectionPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppScmVehiclePatrolinspectionPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppScmVehiclePatrolinspectionPageVo>> carInventoryList = scmVehiclePatrolinspectionFeign.getCarInventoryList(pq);
+        PagerVo<PatrolinspectionPageVo> vo = CoverUtils.selectPagerVo(carInventoryList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<PatrolinspectionInfoVo> getInspection(String recordSid) {
+        ResultBean<PatrolinspectionInfoVo> rb = ResultBean.fireFail();
+        PatrolinspectionInfoVo vo = new PatrolinspectionInfoVo();
+        ResultBean<AppScmVehiclePatrolinspectionInfoVo> resultBean = scmVehiclePatrolinspectionFeign.getInspection(recordSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppScmVehiclePatrolinspectionInfoVo appScmVehiclePatrolinspectionInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appScmVehiclePatrolinspectionInfoVo, vo);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveInspection(PatrolinspectionDto dto) {
+        AppScmVehiclePatrolinspectionDto appScmVehiclePatrolinspectionDto = new AppScmVehiclePatrolinspectionDto();
+        BeanUtil.copyProperties(dto, appScmVehiclePatrolinspectionDto);
+        ResultBean resultBean = scmVehiclePatrolinspectionFeign.saveInspection(appScmVehiclePatrolinspectionDto);
+        return resultBean;
+    }
+
+    public ResultBean submitInspection(PatrolinspectionDto dto) {
+        AppScmVehiclePatrolinspectionDto appScmVehiclePatrolinspectionDto = new AppScmVehiclePatrolinspectionDto();
+        BeanUtil.copyProperties(dto, appScmVehiclePatrolinspectionDto);
+        ResultBean resultBean = scmVehiclePatrolinspectionFeign.submitInspection(appScmVehiclePatrolinspectionDto);
+        return resultBean;
+    }
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryRest.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.inventory;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.terminal.api.supplychain.inventory.*;
+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.*;
+
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleInventoryFeignFallback.java <br/>
+ * Class: anrui_scm.biz.scmvehicleinventory.ScmVehicleInventoryRest <br/>
+ * Description: 盘库记录. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "盘库记录")
+@Controller
+@RequestMapping("/supplychain/v1/inventory")
+public class AppScmVehicleInventoryRest implements AppScmVehicleInventoryFeign {
+
+    @Autowired
+    AppScmVehicleInventoryService appScmVehicleInventoryService;
+
+
+    @Override
+    public ResultBean getInventoryRecords(String userSid) {
+        return appScmVehicleInventoryService.getInventoryRecords(userSid);
+    }
+
+    @Override
+    public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(PagerQuery<InventoryListPageQuery> pagerQuery) {
+        return appScmVehicleInventoryService.getInventoryList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<PagerVo<CarInventoryListPageVo>> getCarInventoryList(PagerQuery<CarInventoryListPageQuery> pagerQuery) {
+        return appScmVehicleInventoryService.getCarInventoryList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<StayInventoryInfoVo> getInventory(String recordSid) {
+        return appScmVehicleInventoryService.getInventory(recordSid);
+    }
+
+    @Override
+    public ResultBean saveInventory(StayInventoryDto dto) {
+        return appScmVehicleInventoryService.saveInventory(dto);
+    }
+
+    @Override
+    public ResultBean<StayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+        return appScmVehicleInventoryService.getInventoryInfo(recordSid);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java

@@ -0,0 +1,159 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.inventory;
+
+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.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionDto;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionInfoVo;
+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.ScmVehicleStayInventoryFeign;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
+import com.yxt.anrui.terminal.api.supplychain.inspection.PatrolinspectionInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo;
+import com.yxt.anrui.terminal.api.supplychain.inventory.*;
+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/>
+ * File: ScmVehicleInventoryService.java <br/>
+ * Class: anrui_scm.biz.scmvehicleinventory.ScmVehicleInventoryService <br/>
+ * Description: 盘库记录 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppScmVehicleInventoryService {
+
+    @Autowired
+    ScmVehicleInventoryFeign scmVehicleInventoryFeign;
+
+    @Autowired
+    ScmVehicleStayInventoryFeign scmVehicleStayInventoryFeign;
+
+    public ResultBean getInventoryRecords(String userSid) {
+        ResultBean resultBean = scmVehicleStayInventoryFeign.getInventoryRecords(userSid);
+        return resultBean;
+    }
+
+    /**
+     * 手机端-获取盘库列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(PagerQuery<InventoryListPageQuery> pagerQuery) {
+        ResultBean<PagerVo<InventoryListPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppScmVehicleStayInventoryListPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> inspectionList = scmVehicleStayInventoryFeign.getInventoryList(pq);
+        PagerVo<InventoryListPageVo> vo = CoverUtils.selectPagerVo(inspectionList.getData());
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 手机端-获取盘库记录列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public ResultBean<PagerVo<CarInventoryListPageVo>> getCarInventoryList(PagerQuery<CarInventoryListPageQuery> pagerQuery) {
+        ResultBean<PagerVo<CarInventoryListPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppScmVehicleCarInventoryListPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> carInventoryList = scmVehicleInventoryFeign.getCarInventoryList(pq);
+        PagerVo<CarInventoryListPageVo> vo = CoverUtils.selectPagerVo(carInventoryList.getData());
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 手机端-初始化盘库操作
+     *
+     * @param recordSid
+     * @return
+     */
+    public ResultBean<StayInventoryInfoVo> getInventory(String recordSid) {
+        ResultBean<StayInventoryInfoVo> rb = ResultBean.fireFail();
+        StayInventoryInfoVo vo = new StayInventoryInfoVo();
+        ResultBean<AppScmVehicleStayInventoryInfoVo> resultBean = scmVehicleInventoryFeign.getInventory(recordSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppScmVehicleStayInventoryInfoVo appScmVehicleStayInventoryInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appScmVehicleStayInventoryInfoVo, vo);
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 手机端-保存盘库操作
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean saveInventory(StayInventoryDto dto) {
+        AppScmVehicleStayInventoryDto appScmVehicleStayInventoryDto = new AppScmVehicleStayInventoryDto();
+        BeanUtil.copyProperties(dto, appScmVehicleStayInventoryDto);
+        ResultBean resultBean = scmVehicleInventoryFeign.saveInventory(appScmVehicleStayInventoryDto);
+        return resultBean;
+    }
+
+    /**
+     * 手机端-盘库详情
+     *
+     * @param recordSid
+     * @return
+     */
+    public ResultBean<StayInventoryDetailedsVo> getInventoryInfo(String recordSid) {
+        ResultBean<StayInventoryDetailedsVo> rb = ResultBean.fireFail();
+        StayInventoryDetailedsVo vo = new StayInventoryDetailedsVo();
+        ResultBean<AppScmVehicleStayInventoryDetailedsVo> resultBean = scmVehicleInventoryFeign.getInventoryInfo(recordSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppScmVehicleStayInventoryDetailedsVo appScmVehicleStayInventoryDetailedsVo = resultBean.getData();
+        BeanUtil.copyProperties(appScmVehicleStayInventoryDetailedsVo, vo);
+        return rb.success().setData(vo);
+    }
+}

doc/databases/scm_tables_vehicle.sql

@@ -248,29 +248,31 @@ CREATE TABLE `scm_vehicle_stay_patrolInspection`
   DEFAULT CHARSET = utf8 COMMENT ='待巡检记录';
 
 -- 9、巡检单
-DROP TABLE IF EXISTS `scm_vehicle_patrolInspectionsheet`;
-CREATE TABLE `scm_vehicle_patrolInspectionsheet`
+DROP TABLE IF EXISTS `scm_vehicle_patrolinspectionsheet`;
+CREATE TABLE `scm_vehicle_patrolinspectionsheet`
 (
-    `id`                   int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `sid`                  varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`          int(32) DEFAULT '0' COMMENT '版本锁',
-    `createTime`           timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `modifyTime`           timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`             int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`                int(32) DEFAULT '1' COMMENT '状态',
-    `isDelete`             int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`              varchar(255)         DEFAULT NULL COMMENT '备注',
-    `createBySid`          varchar(64)          DEFAULT NULL COMMENT '创建人sid',
-    `updateBySid`          varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `mainSid`              varchar(64)          DEFAULT NULL COMMENT '主表sid',
-    `mainSid`              varchar(64)          DEFAULT NULL COMMENT '车架号',
-    `locationSid`          varchar(64)          DEFAULT NULL COMMENT '车型sid',
-    `location`             varchar(64)          DEFAULT NULL COMMENT '车型',
-    `patrolInspectionDate` varchar(64)          DEFAULT NULL COMMENT '巡检情况说明',
-    `patrolInspectionName` varchar(64)          DEFAULT NULL COMMENT '存在问题及处理结果',
-    `createOrgSid`         varchar(64)          DEFAULT NULL COMMENT '相关责任人',
-    `useOrgName`           varchar(64)          DEFAULT NULL COMMENT '相关责任人sid',
+    `id`                  int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                 varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`         int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`            int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `patrolInspectionSid` varchar(64)          DEFAULT NULL COMMENT '主表sid',
+    `mainSid`             varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `modelSid`            varchar(64)          DEFAULT NULL COMMENT '车型sid',
+    `model`               varchar(64)          DEFAULT NULL COMMENT '车型',
+    `situationExplain`    varchar(64)          DEFAULT NULL COMMENT '巡检情况说明',
+    `problemsAndResults`  varchar(64)          DEFAULT NULL COMMENT '存在问题及处理结果',
+    `dutyName`            varchar(64)          DEFAULT NULL COMMENT '相关责任人',
+    `dutySid`             varchar(64)          DEFAULT NULL COMMENT '相关责任人sid',
+    `createOrgSid`        varchar(64)          DEFAULT NULL COMMENT '创建组织',
+    `useOrgName`          varchar(64)          DEFAULT NULL COMMENT '使用组织',
     PRIMARY KEY (`id`),
-    KEY                    `id` (`id`)
+    KEY                   `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='巡检单';