盘库接口修改

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

@@ -74,6 +74,10 @@ public interface ScmVehicleExamineFeign {
     @ResponseBody
     public ResultBean<ScmVehicleExamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("PC端-获取验车管理列表")
+    @PostMapping("/selectCarInspectedList")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehicleExaminePageVo>> selectCarInspectedList(@RequestBody PagerQuery<ScmVehicleExaminePageQuery> pagerQuery);
 
     @ApiOperation("手机端-获取验车管理列表")
     @PostMapping("/getCarInspectedList")

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

@@ -68,6 +68,11 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
 		return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehicleExaminePageVo>> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<AppScmVehicleExaminePageVo>> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
 		return null;

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

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineQuery.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineQuery <br/>
+ * Description: 验车单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单 查询条件", description = "验车单 查询条件")
+public class ScmVehicleExaminePageQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("类型 “ ” 或 null 全部 1待验车 2已验车")
+    private String type;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("订单类型（外采，内购，排产）")
+    private String purchaseType;
+
+    @ApiModelProperty("使用组织分公司sid")
+    private String useOrgSid;
+
+}

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

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm) <br/>
+ * File: ScmVehicleExamineVo.java <br/>
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineVo <br/>
+ * Description: 验车单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-06 09:53:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "验车单 视图数据对象", description = "验车单 视图数据对象")
+public class ScmVehicleExaminePageVo implements Vo {
+
+    private String inspectedSid;
+
+    @ApiModelProperty("车型")
+    private String model;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+
+    @ApiModelProperty("发车日期")
+    private String dispatchedDate;
+
+    @ApiModelProperty("采购订单类型（外采，内购，排产）")
+    private String purchaseType;
+
+    @ApiModelProperty("验车人")
+    private String inspectedName;
+
+    @ApiModelProperty("验车日期")
+    private String inspectedDate;
+
+    @ApiModelProperty("验车按钮 显示 只要通过了就不显示")
+    private boolean showInspectedBtn;
+
+    @ApiModelProperty("是否验车 未验车 1 以验车2")
+    private String inspectedType;
+
+}

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

@@ -48,6 +48,8 @@ import lombok.Data;
 @ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象")
 public class AppScmVehicleStayInventoryDetailedsVo implements Vo {
 
+    private String id;
+
     @ApiModelProperty("车架号")
     private String vin;
 

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

@@ -58,6 +58,8 @@ public class ScmVehicleInventory extends BaseEntity {
     private String location; // 存放地点
     @ApiModelProperty("合格证（有/无）")
     private String certificate; // 合格证（有/无）
+    @ApiModelProperty("合格证（有 1 /无 0）")
+    private String certificateKey;
     @ApiModelProperty("盘库日期")
     private String InventoryDate; // 盘库日期
     @ApiModelProperty("盘库人员")
@@ -66,9 +68,13 @@ public class ScmVehicleInventory extends BaseEntity {
     private String InventorySid; // 盘库人员sid
     @ApiModelProperty("盘库状态 通过/未通过")
     private String InventoryState; // 盘库状态 通过/未通过
+    @ApiModelProperty("盘库状态 通过 1 /未通过 2")
+    private String InventoryStateKey;
     @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
     @ApiModelProperty("使用组织")
     private String useOrgName; // 使用组织
+    @ApiModelProperty("备注")
+    private String remarks; // 使用组织
 
 }

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

@@ -92,4 +92,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
      * @return
      */
     AppScmVehicleExamineDetailsVo getCarInspected(@Param("inspectedSid") String inspectedSid);
+
+    IPage<ScmVehicleExaminePageVo> selectCarInspectedList(IPage<ScmVehicleExaminePageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleExaminePageVo> qw);
 }

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

@@ -66,4 +66,22 @@
         FROM scm_vehicle_examine sve
         WHERE sve.sid = #{inspectedSid}
     </select>
+
+    <select id="selectCarInspectedList"
+            resultType="com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExaminePageVo">
+        SELECT
+        sve.sid as inspectedSid,
+        sve.modelName as model,
+        sve.vinNo as vin,
+        sve.departureDate as dispatchedDate,
+        sve.purchaseType,
+        sve.inspection as inspectedName,
+        sve.inspectionDate as inspectedDate,
+        sve.inspectionResult as inspectedType
+        FROM scm_vehicle_examine sve
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        ORDER BY id DESC
+    </select>
 </mapper>

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

@@ -95,6 +95,19 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    @ApiOperation("PC端-获取验车管理列表")
+    @PostMapping("/selectCarInspectedList")
+    public ResultBean<PagerVo<ScmVehicleExaminePageVo>> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<ScmVehicleExaminePageVo> page = new PagerVo<>();
+        IPage<ScmVehicleExaminePageVo> iPage = scmVehicleExamineService.selectCarInspectedList(pagerQuery);
+        PagerVo<ScmVehicleExaminePageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<ScmVehicleExaminePageVo>>().success().setData(pagerVo);
+    }
+
 
     @Override
     @ApiOperation("手机端-获取验车管理列表")

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

@@ -136,6 +136,47 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         return vo;
     }
 
+    /**
+     * PC端-获取验车管理列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<ScmVehicleExaminePageVo> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
+        IPage<ScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<ScmVehicleExaminePageVo> qw = carInspectedQueryWrapper(pagerQuery.getParams());
+        IPage<ScmVehicleExaminePageVo> iPage = baseMapper.selectCarInspectedList(page, qw);
+        return iPage;
+    }
+
+    /**
+     * 手机端-获取验车管理列表 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<ScmVehicleExaminePageVo> carInspectedQueryWrapper(ScmVehicleExaminePageQuery query) {
+        QueryWrapper<ScmVehicleExaminePageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("sve.useOrgSid", query.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(query.getVin())) {
+            qw.eq("sve.vinNo", query.getVin());
+        }
+        if (StringUtils.isNotBlank(query.getModel())) {
+            qw.eq("sve.modelName", query.getModel());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseType())) {
+            qw.eq("sve.purchaseTypeKey", query.getPurchaseType());
+        }
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("sve.inspectionResult", query.getType());
+        }
+        return qw;
+    }
+
     /**
      * 手机端-获取验车管理列表
      *

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

@@ -92,5 +92,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
     AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(@Param("recordSid") String recordSid);
 
     @Update("update scm_vehicle_inventory set InventoryStateKey = #{inventoryStateKey},InventoryState = #{inventoryState} where sid = #{sid}")
-    void updateState(@Param("sid") String sid,@Param("inventoryStateKey") String inventoryStateKey,@Param("inventoryState") String inventoryState);
+    void updateState(@Param("sid") String sid, @Param("inventoryStateKey") String inventoryStateKey, @Param("inventoryState") String inventoryState);
+
+    List<ScmVehicleInventory> getByVinLastInFo(@Param("vin") String vin,@Param("id") String id);
 }

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

@@ -23,12 +23,9 @@
         inventorySid,
         inventoryName,
         remarks,
-        ( SELECT count( certificate ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) )
+        InventoryDate as newInventoryDate,
-        AS newInventoryDate,
+        location as newWarehouse,
-        ( SELECT count( location ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) ) AS
+        InventoryName as newInventoryName
-        newWarehouse,
-        ( SELECT count( inventoryName ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime )
-        ) AS newInventoryName
         FROM
         scm_vehicle_inventory svi
         <where>
@@ -43,20 +40,16 @@
     <select id="getInventory"
             resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryInfoVo">
         SELECT sid,
-               mainSid        AS vin,
+               mainSid  as vin,
-               location       AS warehouse,
+               location as warehouse
-               inventorySid,
+        FROM scm_vehicle_stay_inventory
-               inventoryName,
+        WHERE sid = #{recordSid}
-               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,
+        SELECT id,
+               mainSid           AS vin,
                certificateKey    AS certificateState,
                InventoryDate     AS `date`,
                location          AS warehouse,
@@ -66,4 +59,16 @@
         FROM scm_vehicle_inventory
         where sid = #{recordSid}
     </select>
+    <select id="getByVinLastInFo" resultType="com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory">
+        SELECT InventoryDate,
+               InventoryName,
+               location,
+               certificate,
+               InventoryState,
+               remarks
+        FROM scm_vehicle_inventory
+        where mainSid = #{vin}
+          and id &lt; #{id}
+        ORDER BY id desc
+    </select>
 </mapper>

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

@@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 
-
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleInventoryFeignFallback.java <br/>
@@ -63,21 +62,21 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmVehicleInventoryVo>> listPage(@RequestBody PagerQuery<ScmVehicleInventoryQuery> pq){
+    public ResultBean<PagerVo<ScmVehicleInventoryVo>> listPage(@RequestBody PagerQuery<ScmVehicleInventoryQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<ScmVehicleInventoryVo> pv = scmVehicleInventoryService.listPageVo(pq);
         return rb.success().setData(pv);
     }
 
     @Override
-	public ResultBean updateState(String sid,String inventoryStateKey,String inventoryState) {
+    public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState) {
-		return scmVehicleInventoryService.updateState(sid,inventoryStateKey,inventoryState);
+        return scmVehicleInventoryService.updateState(sid, inventoryStateKey, inventoryState);
     }
 
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody ScmVehicleInventoryDto dto){
+    public ResultBean save(@RequestBody ScmVehicleInventoryDto dto) {
         ResultBean rb = ResultBean.fireFail();
         scmVehicleInventoryService.saveOrUpdateDto(dto);
         return rb.success();
@@ -86,7 +85,7 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
     @Override
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         scmVehicleInventoryService.delBySids(sids);
         return rb.success();
@@ -95,7 +94,7 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmVehicleInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<ScmVehicleInventoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         ScmVehicleInventoryDetailsVo vo = scmVehicleInventoryService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
@@ -122,7 +121,7 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
     @Override
     public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
         ResultBean rb = ResultBean.fireFail();
-		scmVehicleInventoryService.AppScmVehicleStayInventoryDto(dto);
+        scmVehicleInventoryService.saveInventory(dto);
         return rb.success();
     }
 

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

@@ -47,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Project: anrui_scm(anrui_scm) <br/>
@@ -81,15 +82,15 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     public PagerVo<ScmVehicleInventoryVo> listPageVo(PagerQuery<ScmVehicleInventoryQuery> pq) {
         ScmVehicleInventoryQuery query = pq.getParams();
         QueryWrapper<ScmVehicleInventory> qw = new QueryWrapper<>();
-		qw.eq("createOrgSid",query.getCreateOrgSid());
+        qw.eq("createOrgSid", query.getCreateOrgSid());
-		if (StringUtils.isNotBlank(query.getMainSid())){
+        if (StringUtils.isNotBlank(query.getMainSid())) {
-			qw.like("mainSid",query.getMainSid());
+            qw.like("mainSid", query.getMainSid());
         }
-		if (StringUtils.isNotBlank(query.getLocationSid())){
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
-			qw.eq("locationSid",query.getLocationSid());
+            qw.eq("locationSid", query.getLocationSid());
         }
-		if (StringUtils.isNotBlank(query.getInventoryState())){
+        if (StringUtils.isNotBlank(query.getInventoryState())) {
-			qw.eq("InventoryState",query.getInventoryState());
+            qw.eq("InventoryState", query.getInventoryState());
         }
         String inventStartDate = query.getInventStartDate();
         String inventEndDate = query.getInventEndDate();
@@ -102,7 +103,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         return p;
     }
 
-	public void saveOrUpdateDto(ScmVehicleInventoryDto dto){
+    public void saveOrUpdateDto(ScmVehicleInventoryDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
@@ -111,13 +112,13 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         this.updateByDto(dto);
     }
 
-	public void insertByDto(ScmVehicleInventoryDto dto){
+    public void insertByDto(ScmVehicleInventoryDto dto) {
         ScmVehicleInventory entity = new ScmVehicleInventory();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
     }
 
-	public void updateByDto(ScmVehicleInventoryDto dto){
+    public void updateByDto(ScmVehicleInventoryDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -127,7 +128,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         baseMapper.updateById(entity);
     }
 
-	public ScmVehicleInventoryDetailsVo fetchDetailsVoBySid(String sid){
+    public ScmVehicleInventoryDetailsVo fetchDetailsVoBySid(String sid) {
         ScmVehicleInventory entity = fetchBySid(sid);
         ScmVehicleInventoryDetailsVo vo = new ScmVehicleInventoryDetailsVo();
         BeanUtil.copyProperties(entity, vo);
@@ -165,7 +166,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             qw.eq("svi.locationSid", query.getWarehouseSid());
         }
         if (StringUtils.isNotBlank(query.getState())) {
-			qw.eq("svi.InventoryState", query.getState());
+            qw.eq("svi.InventoryStateKey", query.getState());
         }
         return qw;
     }
@@ -178,6 +179,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
      */
     public AppScmVehicleStayInventoryInfoVo getInventory(String recordSid) {
         AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid);
+        vo.setLastData("无");
+        vo.setLastName("无");
         return vo;
     }
 
@@ -188,19 +191,20 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-	public ResultBean AppScmVehicleStayInventoryDto(AppScmVehicleStayInventoryDto dto) {
+    public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
         String inventorySid = dto.getInventorySid();
 		/*String[] split = inventorySid.split(",");
 		if (split.length < 2){
 			return rb.setMsg("请选择盘库人员");
 		}*/
         String inventoryName = dto.getInventoryName();
-		if (StringUtils.isBlank(inventoryName)){
+        if (StringUtils.isBlank(inventoryName)) {
             return rb.setMsg("请选择盘库人员");
         }
         String sid = dto.getSid();
-		scmVehicleStayInventoryService.delBySid(sid,dto.getInventoryName());
+        scmVehicleStayInventoryService.delBySid(sid, dto.getInventoryName());
         ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
         BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
         scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
@@ -210,6 +214,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         inventorySid += "," + loginSid;
         scmVehicleInventory.setInventoryName(inventoryName);
         scmVehicleInventory.setInventorySid(inventorySid);
+        scmVehicleInventory.setCreateOrgSid(createOrgSid);
         save(scmVehicleInventory);
         return rb.success().setMsg("保存成功");
     }
@@ -222,12 +227,27 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
      */
     public AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(String recordSid) {
         AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid);
+        LastInfo lastInfo = new LastInfo();
+        ScmVehicleInventory scmVehicleInventory = null;
+        List<ScmVehicleInventory> list = baseMapper.getByVinLastInFo(vo.getVin(), vo.getId());
+        if (list.size() >= 1) {
+            scmVehicleInventory = list.get(0);
+            lastInfo.setLastDate(scmVehicleInventory.getInventoryDate());
+            lastInfo.setLastName(scmVehicleInventory.getInventoryName());
+            lastInfo.setLastWarehouse(scmVehicleInventory.getLocation());
+            lastInfo.setLastState(scmVehicleInventory.getInventoryState());
+            lastInfo.setLastCertificateState(scmVehicleInventory.getCertificate());
+            lastInfo.setLastRemarks(scmVehicleInventory.getRemarks());
+            vo.setLastInfo(lastInfo);
+        } else {
+            vo.setLastInfo(null);
+        }
         return vo;
     }
 
-	public ResultBean updateState(String sid,String inventoryStateKey,String inventoryState) {
+    public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState) {
         ResultBean rb = ResultBean.fireFail();
-		baseMapper.updateState(sid,inventoryStateKey,inventoryState);
+        baseMapper.updateState(sid, inventoryStateKey, inventoryState);
         return rb.success().setMsg("修改保存成功");
     }
 }

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

@@ -81,12 +81,12 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
     public PagerVo<ScmVehicleStayInventoryVo> listPageVo(PagerQuery<ScmVehicleStayInventoryQuery> pq) {
         ScmVehicleStayInventoryQuery query = pq.getParams();
         QueryWrapper<ScmVehicleStayInventory> qw = new QueryWrapper<>();
-        qw.eq("svsi.createOrgSid",query.getCreateOrgSid());
+        qw.eq("svsi.createOrgSid", query.getCreateOrgSid());
-        if (StringUtils.isNotBlank(query.getMainSid())){
+        if (StringUtils.isNotBlank(query.getMainSid())) {
-            qw.like("svsi.mainSid",query.getMainSid());
+            qw.like("svsi.mainSid", query.getMainSid());
         }
-        if (StringUtils.isNotBlank(query.getLocationSid())){
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
-            qw.eq("svsi.locationSid",query.getLocationSid());
+            qw.eq("svsi.locationSid", query.getLocationSid());
         }
         IPage<ScmVehicleStayInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleStayInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -138,7 +138,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         String orgSid = pathSidByUserSid.getData();
         List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectListVo(orgSid);
-        if (scmVehicleStayInventoryVos.size() > 0){
+        if (scmVehicleStayInventoryVos.size() > 0) {
             return rb.setMsg("生成盘库记录失败，请查看是否有未盘库的记录");
         }
         for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
@@ -165,6 +165,11 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleStayInventoryListPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleStayInventoryListPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
+        List<AppScmVehicleStayInventoryListPageVo> records = iPage.getRecords();
+        for (AppScmVehicleStayInventoryListPageVo record : records) {
+            record.setInventoryDate("无");
+            record.setInventoryName("无");
+        }
         return iPage;
     }
 
@@ -176,6 +181,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
      */
     private QueryWrapper<AppScmVehicleStayInventoryListPageVo> appQueryWrapper(AppScmVehicleStayInventoryListPageQuery query) {
         QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = new QueryWrapper<>();
+        qw.eq("svsi.isDelete", "0");
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("svsi.createOrgSid", query.getUseOrgSid());
         }
@@ -183,7 +189,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
     }
 
 
-    public void delBySid(String sid,String inventoryName) {
+    public void delBySid(String sid, String inventoryName) {
-        baseMapper.delBySid(sid,inventoryName);
+        baseMapper.delBySid(sid, inventoryName);
     }
 }

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

@@ -9,6 +9,10 @@ import lombok.Data;
 @Data
 public class StayInventoryDto implements Dto {
 
+    @ApiModelProperty(value = "待盘库sid")
+    @JsonProperty(value = "sid")
+    private String sid;
+
     @ApiModelProperty(value = "车架号")
     @JsonProperty(value = "vin")
     private String mainSid;
@@ -53,4 +57,12 @@ public class StayInventoryDto implements Dto {
     @JsonProperty(value = "remarks")
     private String remarks;
 
+    @ApiModelProperty(value = "当前登录人姓名")
+    @JsonProperty(value = "loginName")
+    private String loginName;
+
+    @ApiModelProperty(value = "当前登录人sid")
+    @JsonProperty(value = "loginSid")
+    private String loginSid;
+
 }

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

@@ -60,6 +60,12 @@ public class AppScmVehicleInventoryService {
     @Autowired
     ScmVehicleStayInventoryFeign scmVehicleStayInventoryFeign;
 
+    /**
+     * 手机端-判断是否生成盘库记录
+     *
+     * @param userSid
+     * @return
+     */
     public ResultBean getInventoryRecords(String userSid) {
         ResultBean resultBean = scmVehicleStayInventoryFeign.getInventoryRecords(userSid);
         return resultBean;