盘库代码

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java

@@ -26,11 +26,14 @@
 package com.yxt.anrui.scm.api.scmvehiclegression;
 
 
+import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleGressionVo.java <br/>
@@ -66,6 +69,8 @@ public class AppScmVehicleGressionPageVo implements Vo {
     private String applyPrice;
     @ApiModelProperty("临时出门证下载")
     private String downloadUrl;
+    @ApiModelProperty("车架号")
+    private List<ScmVehicleGressionVehVo> scmVehicleGressionVehs;
 
     @ApiModelProperty("是否显示删除 流程未提交时 显示")
     private boolean showDetectBtn;

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

@@ -28,8 +28,8 @@ public class AppScmVehicleCarInventoryListPageQuery implements Query {
     @ApiModelProperty("存放地点sid")
     private String warehouseSid;
 
-    @ApiModelProperty("盘库状态 通过1 不通过 2")
-    private String state;
+//    @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/AppScmVehicleStayInventoryDto.java

@@ -90,7 +90,7 @@ public class AppScmVehicleStayInventoryDto implements Dto {
     @ApiModelProperty("见证材料")
     private List<String> images;
 
-    @ApiModelProperty(value = "状态 是否通过")
+    @ApiModelProperty(value = "状态(盘盈、盘损、盘亏、正常) ")
     @JsonProperty("InventoryState")
     private String InventoryState;
 

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

@@ -1,4 +1,4 @@
-package com.yxt.anrui.scm.api.scmvehiclestayinventory;
+package com.yxt.anrui.scm.api.scmvehicleinventory;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,4 +1,4 @@
-package com.yxt.anrui.scm.api.scmvehiclestayinventory;
+package com.yxt.anrui.scm.api.scmvehicleinventory;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,8 +27,5 @@ public class AppScmVehicleStayInventoryListPageVo implements Vo {
     @ApiModelProperty("上次盘库日期")
     private String inventoryDate;
 
-    @ApiModelProperty("合格证状态")
-    private String certificateState;
-
 
 }

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

@@ -51,29 +51,27 @@ public class ScmVehicleInventory extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("车架号")
-    private String mainSid; // 车架号
+    private String vinNo; // 车架号
+    @ApiModelProperty("月度盘库sid")
+    private String mainSid; // 月度盘库sid
     @ApiModelProperty("存放地点sid")
     private String locationSid; // 存放地点sid
     @ApiModelProperty("存放地点")
     private String location; // 存放地点
-    @ApiModelProperty("合格证（有/无）")
-    private String certificate; // 合格证（有/无）
-    @ApiModelProperty("合格证（有 1 /无 0）")
-    private String certificateKey;
     @ApiModelProperty("盘库日期")
     private String InventoryDate; // 盘库日期
     @ApiModelProperty("盘库人员")
     private String InventoryName; // 盘库人员
     @ApiModelProperty("盘库人员sid")
     private String InventorySid; // 盘库人员sid
-    @ApiModelProperty("盘库状态 通过/未通过")
+    @ApiModelProperty("盘库状态")
     private String InventoryState; // 盘库状态 通过/未通过
-    @ApiModelProperty("盘库状态 通过 1 /未通过 2")
+    @ApiModelProperty("盘库状态 ")
     private String InventoryStateKey;
     @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
     @ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
+    private String useOrgSid; // 使用组织
     @ApiModelProperty("备注")
     private String remarks; // 使用组织
     @ApiModelProperty("定位")

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

@@ -84,6 +84,11 @@ public interface ScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>> getCarInventoryList(@RequestBody PagerQuery<AppScmVehicleCarInventoryListPageQuery> pagerQuery);
 
+    @ApiOperation("手机端-获取待盘库列表")
+    @PostMapping("/getInventoryList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery);
+
     @ApiOperation("手机端-初始化盘库操作")
     @GetMapping("/getInventory/{recordSid}")
     @ResponseBody
@@ -109,4 +114,9 @@ public interface ScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<AppScmVehicleStayInventoryDetailedsVo> getInventoryInfo(@PathVariable("recordSid") String recordSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
 }

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

@@ -79,6 +79,11 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		return rb.setMsg("接口anrui_scm/scmvehicleinventory/getCarInventoryList无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
 		ResultBean rb = ResultBean.fireFail();
@@ -106,4 +111,9 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		return rb.setMsg("接口anrui_scm/scmvehicleinventory/getInventoryInfo无法访问");
 	}
 
+	@Override
+	public ResultBean<String> getToDoNum(String userSid) {
+		return null;
+	}
+
 }

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

@@ -77,19 +77,8 @@ public interface ScmVehicleStayInventoryFeign {
     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);
 
-    @ApiOperation("手机端-查询本分公司下代办数量")
-    @GetMapping("/getToDoNum/{userSid}")
-    @ResponseBody
-    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
 
 }

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

@@ -68,20 +68,5 @@ public class ScmVehicleStayInventoryFeignFallback implements ScmVehicleStayInven
 		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;
-	}
-
-	@Override
-	public ResultBean<String> getToDoNum(String userSid) {
-		return null;
-	}
-
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonth.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonth.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonth <br/>
+ * Description: 月度盘库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库", description = "月度盘库")
+@TableName("scm_veh_inventorymonth")
+public class ScmVehInventorymonth extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("编号（yyyyMMdd）")
+    private String billNo; // 编号（yyyyMMdd）
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthVo <br/>
+ * Description: 月度盘库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 视图数据详情", description = "月度盘库 视图数据详情")
+public class ScmVehInventorymonthDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("编号（yyyyMMdd）")
+    private String billNo; // 编号（yyyyMMdd）
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthDto <br/>
+ * Description: 月度盘库 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 数据传输对象", description = "月度盘库 数据传输对象")
+public class ScmVehInventorymonthDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("编号（yyyyMMdd）")
+    private String billNo; // 编号（yyyyMMdd）
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthFeign <br/>
+ * Description: 月度盘库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "月度盘库")
+@FeignClient(
+        contextId = "aaa-ScmVehInventorymonth",
+        name = "aaa",
+        path = "v1/scmvehinventorymonth",
+        fallback = ScmVehInventorymonthFeignFallback.class)
+public interface ScmVehInventorymonthFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehInventorymonthVo>> listPage(@RequestBody PagerQuery<ScmVehInventorymonthQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehInventorymonthDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehInventorymonthDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("手机端-生成盘库记录")
+    @GetMapping("/getInventoryRecords/{userSid}")
+    @ResponseBody
+    public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
+
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeignFallback.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+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;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthFeignFallback <br/>
+ * Description: 月度盘库. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehInventorymonthFeignFallback implements ScmVehInventorymonthFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehInventorymonthVo>> listPage(PagerQuery<ScmVehInventorymonthQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口aaa/scmvehinventorymonth/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehInventorymonthDto dto){
+		return ResultBean.fireFail().setMsg("接口aaa/scmvehinventorymonth/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口aaa/scmvehinventorymonth/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehInventorymonthDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口aaa/scmvehinventorymonth/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean getInventoryRecords(String userSid) {
+		return null;
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthQuery <br/>
+ * Description: 月度盘库 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 查询条件", description = "月度盘库 查询条件")
+public class ScmVehInventorymonthQuery implements Query {
+
+	@ApiModelProperty("编号（yyyyMMdd）")
+    private String billNo; // 编号（yyyyMMdd）
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventorymonth;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventorymonthVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventorymonth.ScmVehInventorymonthVo <br/>
+ * Description: 月度盘库 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "月度盘库 视图数据对象", description = "月度盘库 视图数据对象")
+public class ScmVehInventorymonthVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("编号（yyyyMMdd）")
+    private String billNo; // 编号（yyyyMMdd）
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织")
+    private String useOrgSid; // 使用组织
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreport.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreport <br/>
+ * Description: 盘库报告. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘库报告", description = "盘库报告")
+@TableName("scm_veh_inventoryreport")
+public class ScmVehInventoryreport extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("月度盘库sid")
+    private String mainSid; // 月度盘库sid
+	@ApiModelProperty("接收人sid")
+    private String receiverSids; // 接收人sid
+	@ApiModelProperty("接收人姓名")
+    private String receiverNames; // 接收人姓名
+	@ApiModelProperty("盘库报告内容")
+    private String reportContent; // 盘库报告内容
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDetailsVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreportVo <br/>
+ * Description: 盘库报告 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘库报告 视图数据详情", description = "盘库报告 视图数据详情")
+public class ScmVehInventoryreportDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("月度盘库sid")
+    private String mainSid; // 月度盘库sid
+	@ApiModelProperty("接收人sid")
+    private String receiverSids; // 接收人sid
+	@ApiModelProperty("接收人姓名")
+    private String receiverNames; // 接收人姓名
+	@ApiModelProperty("盘库报告内容")
+    private String reportContent; // 盘库报告内容
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreportDto <br/>
+ * Description: 盘库报告 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘库报告 数据传输对象", description = "盘库报告 数据传输对象")
+public class ScmVehInventoryreportDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("月度盘库sid")
+    private String mainSid; // 月度盘库sid
+	@ApiModelProperty("接收人sid")
+    private String receiverSids; // 接收人sid
+	@ApiModelProperty("接收人姓名")
+    private String receiverNames; // 接收人姓名
+	@ApiModelProperty("盘库报告内容")
+    private String reportContent; // 盘库报告内容
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreportFeign <br/>
+ * Description: 盘库报告. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "盘库报告")
+@FeignClient(
+        contextId = "aaa-ScmVehInventoryreport",
+        name = "aaa",
+        path = "v1/scmvehinventoryreport",
+        fallback = ScmVehInventoryreportFeignFallback.class)
+public interface ScmVehInventoryreportFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehInventoryreportVo>> listPage(@RequestBody PagerQuery<ScmVehInventoryreportQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehInventoryreportDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehInventoryreportDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+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;
+
+import java.util.List;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreportFeignFallback <br/>
+ * Description: 盘库报告. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehInventoryreportFeignFallback implements ScmVehInventoryreportFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehInventoryreportVo>> listPage(PagerQuery<ScmVehInventoryreportQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口aaa/scmvehinventoryreport/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehInventoryreportDto dto){
+		return ResultBean.fireFail().setMsg("接口aaa/scmvehinventoryreport/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口aaa/scmvehinventoryreport/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehInventoryreportDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口aaa/scmvehinventoryreport/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportQuery.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreportQuery <br/>
+ * Description: 盘库报告 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘库报告 查询条件", description = "盘库报告 查询条件")
+public class ScmVehInventoryreportQuery implements Query {
+
+	@ApiModelProperty("月度盘库sid")
+    private String mainSid; // 月度盘库sid
+	@ApiModelProperty("接收人sid")
+    private String receiverSids; // 接收人sid
+	@ApiModelProperty("接收人姓名")
+    private String receiverNames; // 接收人姓名
+	@ApiModelProperty("盘库报告内容")
+    private String reportContent; // 盘库报告内容
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: aaa(aaa) <br/>
+ * File: ScmVehInventoryreportVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.api.scmvehinventoryreport.ScmVehInventoryreportVo <br/>
+ * Description: 盘库报告 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-16 15:52:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘库报告 视图数据对象", description = "盘库报告 视图数据对象")
+public class ScmVehInventoryreportVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("月度盘库sid")
+    private String mainSid; // 月度盘库sid
+	@ApiModelProperty("接收人sid")
+    private String receiverSids; // 接收人sid
+	@ApiModelProperty("接收人姓名")
+    private String receiverNames; // 接收人姓名
+	@ApiModelProperty("盘库报告内容")
+    private String reportContent; // 盘库报告内容
+
+}

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

@@ -318,11 +318,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<AppScmVehicleGressionPageVo> records = iPage.getRecords();
         for (AppScmVehicleGressionPageVo record : records) {
 
-            List<String> vins = scmVehicleGressionVehService.fetchVoByMainSid(record.getSid());
-            int size = vins.size();
-            record.setVinNum(String.valueOf(size));
-            String vin = StringUtils.join(vins, ",");
-            record.setVin(vin);
+            List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
+//            int size = vins.size();
+//            record.setVinNum(String.valueOf(size));
+//            String vin = StringUtils.join(vins, ",");
+//            record.setVin(vin);
+            record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
 
             if ("已办结".equals(record.getState())) {
                 record.setShowDownloadBtn(true);

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

@@ -31,6 +31,9 @@ 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.*;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo;
+import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,8 +65,8 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
 
     List<ScmVehicleInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleInventory> qw);
 
-    @Select("select * from scm_vehicle_inventory")
-    List<ScmVehicleInventoryVo> selectListVo();
+    @Select("select * from scm_vehicle_inventory where isDelete = 0 and createOrgSid = #{orgSid}")
+    List<ScmVehicleInventoryVo> selectListVo(String orgSid);
 
     /**
      * 手机端-获取盘库记录列表
@@ -75,6 +78,17 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
      */
     IPage<AppScmVehicleCarInventoryListPageVo> getCarInventoryList(IPage<AppScmVehicleCarInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw, @Param("name") String name);
 
+    /**
+     * 手机端-获取待盘库列表
+     *
+     * @param page
+     * @param qw
+     * @param names
+     * @return
+     */
+    IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(IPage<AppScmVehicleStayInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw, @Param("names") String names);
+
+
     /**
      * 手机端-初始化盘库操作
      *
@@ -103,4 +117,12 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
     void updateState(@Param("sid") String sid, @Param("inventoryStateKey") String inventoryStateKey, @Param("inventoryState") String inventoryState, @Param("remarks") String remarks);
 
     List<ScmVehicleInventory> getByVinLastInFo(@Param("vin") String vin, @Param("id") String id);
+
+    @Select("SELECT count(*) FROM scm_vehicle_stay_inventory  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
+
+    @Select("select max(id) from scm_vehicle_stay_inventory svsi where svsi.mainSid = #{vin}")
+    String getVin(@Param("vin") String vin);
+
+    List<ScmVehicleStayInventoryVo> selInventory(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid);
 }

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

@@ -19,7 +19,7 @@
         sid,
         mainSid AS vin,
         certificateKey AS certificateState,
-        InventoryStateKey AS `state`,
+        InventoryState AS `state`,
         inventorySid,
         inventoryName,
         remarks,
@@ -37,6 +37,26 @@
         ORDER BY id DESC
     </select>
 
+    <select id="getInventoryList"
+            resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo">
+        SELECT
+        id,
+        sid,
+        vinNo AS vin,
+        location AS warehouse,
+        InventoryDate,
+        InventoryName
+        FROM
+        scm_vehicle_inventory svi
+        <where>
+            ${ew.sqlSegment}
+            <if test="names != '' and names != null ">
+                and concat(svi.vinNo,svi.InventoryName) LIKE concat('%', #{names}, '%')
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
     <select id="getInventory"
             resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryInfoVo">
         SELECT id,
@@ -52,12 +72,12 @@
     <select id="getInventoryInfo"
             resultType="com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryDetailedsVo">
         SELECT id,
-               mainSid           AS vin,
-               certificateKey    AS certificateState,
-               InventoryDate     AS `date`,
-               location          AS warehouse,
-               inventoryName     AS `name`,
-               InventoryStateKey AS state,
+               mainSid        AS vin,
+               certificateKey AS certificateState,
+               InventoryDate  AS `date`,
+               location       AS warehouse,
+               inventoryName  AS `name`,
+               InventoryState AS state,
                address,
                addressCode,
                remarks
@@ -94,4 +114,14 @@
         FROM scm_vehicle_inventory
         WHERE sid = #{recordSid}
     </select>
+    <select id="selInventory"
+            resultType="com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo">
+        select InventoryDate as lastDate,
+               InventoryName as lastName
+        from scm_vehicle_stay_inventory svsi
+        where svsi.mainSid = #{vin}
+          and svsi.id &lt; #{id}
+          and svsi.createOrgSid = #{useOrgSid}
+        ORDER BY id DESC
+    </select>
 </mapper>

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

@@ -27,6 +27,8 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -111,6 +113,18 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
         return new ResultBean<PagerVo<AppScmVehicleCarInventoryListPageVo>>().success().setData(pagerVo);
     }
 
+    @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 = scmVehicleInventoryService.getInventoryList(pagerQuery);
+        PagerVo<AppScmVehicleStayInventoryListPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>>().success().setData(pagerVo);
+    }
+
+
     @Override
     public ResultBean<AppScmVehicleStayInventoryInfoVo> getInventory(String recordSid) {
         ResultBean rb = ResultBean.fireFail();
@@ -141,4 +155,9 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
         AppScmVehicleStayInventoryDetailedsVo vo = scmVehicleInventoryService.getInventoryInfo(recordSid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehicleInventoryService.getToDoNum(userSid);
+    }
 }

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

@@ -28,7 +28,9 @@ 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.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
@@ -51,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -173,6 +176,33 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         return iPage;
     }
 
+    /**
+     * 手机端-获取待盘库列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        IPage<AppScmVehicleStayInventoryListPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw = new QueryWrapper<>();
+        qw.eq("isDelete", 0);
+        qw.eq("InventoryState", "无");
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
+            qw.eq("createOrgSid", pagerQuery.getParams().getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
+            qw.eq("locationSid", pagerQuery.getParams().getWarehouseSid());
+        }
+        AppScmVehicleStayInventoryListPageQuery params = pagerQuery.getParams();
+        IPage<AppScmVehicleStayInventoryListPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
+        return iPage;
+    }
+
+
+
     /**
      * 手机端-获取盘库记录列表 查询条件
      *
@@ -187,9 +217,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("svi.locationSid", query.getWarehouseSid());
         }
-        if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("svi.InventoryStateKey", query.getState());
-        }
         String inventStartDate = query.getInventStartDate();
         String inventEndDate = query.getInventEndDate();
         qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (InventoryDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
@@ -209,7 +236,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         List<String> images = new ArrayList<>();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid);
-        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = scmVehicleStayInventoryService.selInventory(vo.getVin(), vo.getId(), vo.getCreateOrgSid());
+        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selInventory(vo.getVin(), vo.getId(), vo.getCreateOrgSid());
         if (scmVehicleStayInventoryVos.size() <= 0) {
             vo.setLastData("无");
         } else {
@@ -241,8 +268,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         List<String> images = new ArrayList<>();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventoryByRecordSid(recordSid);
-        String id = scmVehicleStayInventoryService.getVin(vo.getVin());
-        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = scmVehicleStayInventoryService.selInventory(vo.getVin(), id, vo.getCreateOrgSid());
+        String id = baseMapper.getVin(vo.getVin());
+        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selInventory(vo.getVin(), id, vo.getCreateOrgSid());
         if (scmVehicleStayInventoryVos.size() <= 0) {
             vo.setLastData("无");
         } else {
@@ -277,22 +304,21 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData();
         String inventorySid = dto.getInventorySid();
         String inventoryName = dto.getInventoryName();
-        String inventoryState = dto.getInventoryState();
+        String inventoryStateKey = dto.getInventoryStateKey();
         String remarks = dto.getRemarks();
-        if ("2".equals(inventoryState) && StringUtils.isBlank(remarks)) {
-            return rb.setMsg("备注请填写不通过原因");
+        if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
+            return rb.setMsg("备注请填写盘损原因");
+        }
+        BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(dto.getMainSid()).getData();
+        if (data != null) {
+            return rb.setMsg("此车架号不允许盘盈");
         }
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
             return rb.setMsg("今日已盘车辆，请勿重复提交");
         }
-//        if (StringUtils.isBlank(inventoryName)) {
-//            return rb.setMsg("请选择盘库人员");
-//        }
-        String sid = dto.getSid();
         ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory();
         BeanUtil.copyProperties(dto, scmVehicleInventory, "sid");
-        scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
         String loginName = dto.getLoginName();
         String loginSid = dto.getLoginSid();
         if (StringUtils.isNotBlank(inventoryName)) {
@@ -307,6 +333,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         } else {
             scmVehicleInventory.setInventorySid(loginSid);
         }
+        scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
         scmVehicleInventory.setCreateOrgSid(loginSid);
         scmVehicleInventory.setCreateOrgSid(createOrgSid);
         scmVehicleInventory.setInventoryStateKey(dto.getInventoryStateKey());
@@ -329,10 +356,13 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
                 }
             }
         }
-        if (StringUtils.isBlank(dto.getInventoryName())) {
-            scmVehicleStayInventoryService.delBySid(sid, dto.getLoginName());
-        } else {
-            scmVehicleStayInventoryService.delBySid(sid, dto.getInventoryName());
+        String sid = dto.getSid();
+        if (StringUtils.isNotBlank(sid)) {
+            if (StringUtils.isBlank(dto.getInventoryName())) {
+                scmVehicleStayInventoryService.delBySid(sid, dto.getLoginName());
+            } else {
+                scmVehicleStayInventoryService.delBySid(sid, dto.getInventoryName());
+            }
         }
         save(scmVehicleInventory);
         return rb.success().setMsg("保存成功");
@@ -398,7 +428,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             lastInfo.setLastName(scmVehicleInventory.getInventoryName());
             lastInfo.setLastWarehouse(scmVehicleInventory.getLocation());
             lastInfo.setLastState(scmVehicleInventory.getInventoryState());
-            lastInfo.setLastCertificateState(scmVehicleInventory.getCertificate());
+//            lastInfo.setLastCertificateState(scmVehicleInventory.getCertificate());
             lastInfo.setLastRemarks(scmVehicleInventory.getRemarks());
             vo.setLastInfo(lastInfo);
         } else {
@@ -420,4 +450,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         baseMapper.updateState(sid, inventoryStateKey, inventoryState, remarks);
         return rb.success().setMsg("修改保存成功");
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

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

@@ -69,23 +69,13 @@ public interface ScmVehicleStayInventoryMapper extends BaseMapper<ScmVehicleStay
     @Select("select * from scm_vehicle_stay_inventory where isDelete = 0 and createOrgSid = #{orgSid}")
     List<ScmVehicleStayInventoryVo> selectListVo(String orgSid);
 
-    /**
-     * 手机端-获取盘库列表
-     *
-     * @param page
-     * @param qw
-     * @param names
-     * @return
-     */
-    IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(IPage<AppScmVehicleStayInventoryListPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayInventoryListPageVo> qw, @Param("names") String names);
-
-    List<ScmVehicleStayInventoryVo> selInventory(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid);
+
+
 
     @Update("update scm_vehicle_stay_inventory set isDelete = 1,InventoryDate = CURRENT_TIMESTAMP,InventoryName = #{inventoryName} where sid = #{sid}")
     void delBySid(@Param("sid") String sid, @Param("inventoryName") String inventoryName);
 
-    String getVin(@Param("vin") String vin);
 
-    @Select("SELECT count(*) FROM scm_vehicle_stay_inventory  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ")
-    int getToDoNum(@Param("useOrgSid") String useOrgSid);
+
+
 }

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

@@ -31,39 +31,4 @@
         SELECT * FROM scm_vehicle_stay_inventory
         <where>${ew.sqlSegment}</where>
     </select>
-
-    <select id="getInventoryList"
-            resultType="com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageVo">
-        SELECT
-        id,
-        sid,
-        mainSid AS vin,
-        location AS warehouse
-        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>
-    <select id="selInventory"
-            resultType="com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo">
-        select InventoryDate as lastDate,
-               InventoryName as lastName
-        from scm_vehicle_stay_inventory svsi
-        where svsi.mainSid = #{vin}
-          and svsi.id &lt; #{id}
-          and svsi.createOrgSid = #{useOrgSid}
-        ORDER BY id DESC
-    </select>
-
-    <select id="getVin" resultType="java.lang.String">
-        select max(id)
-        from scm_vehicle_stay_inventory svsi
-        where svsi.mainSid = #{vin}
-    </select>
-
 </mapper>

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

@@ -96,24 +96,8 @@ public class ScmVehicleStayInventoryRest implements ScmVehicleStayInventoryFeign
         return rb.success().setData(vo);
     }
 
-    @Override
-    public ResultBean getInventoryRecords(String userSid) {
-        return scmVehicleStayInventoryService.getInventoryRecords(userSid);
-    }
 
-    @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);
-    }
 
-    @Override
-    public ResultBean<String> getToDoNum(String userSid) {
-        return scmVehicleStayInventoryService.getToDoNum(userSid);
-    }
+
+
 }

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

@@ -134,112 +134,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         return vo;
     }
 
-    /**
-     * 保存所有库存车，信息
-     *
-     * @param userSid
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public ResultBean getInventoryRecords(String userSid) {
-        ResultBean rb = ResultBean.fireFail();
-        List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
-        ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-        String orgSid = pathSidByUserSid.getData();
-        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectListVo(orgSid);
-        if (scmVehicleStayInventoryVos.size() > 0) {
-            return rb.setMsg("生成盘库记录失败，请查看是否有未盘库的记录");
-        }
-        list.removeAll(Collections.singleton(null));
-        if (!list.isEmpty()) {
-            for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
-                ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
-                scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin());
-                scmVehicleStayInventory.setLocationSid(appScmInventoryRecordsVo.getWarehouseSid());
-                scmVehicleStayInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
-                scmVehicleStayInventory.setInventoryName("");
-                scmVehicleStayInventory.setInventoryDate("");
-                scmVehicleStayInventory.setCreateOrgSid(orgSid);
-                save(scmVehicleStayInventory);
-            }
-        } else {
-            return rb.setMsg("暂无需要盘库记录");
-        }
-        return rb.success();
-    }
-
-    /**
-     * 手机端-获取盘库列表
-     *
-     * @param pagerQuery
-     * @return
-     */
-    public IPage<AppScmVehicleStayInventoryListPageVo> getInventoryList(PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        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());
-        List<AppScmVehicleStayInventoryListPageVo> records = iPage.getRecords();
-        for (AppScmVehicleStayInventoryListPageVo record : records) {
-            // 查询上一次的盘库人,盘库时间
-            List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = selInventory(record.getVin(), record.getId(), useOrgSid);
-
-            if (scmVehicleStayInventoryVos.size() > 0) {
-
-                ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
-                if (scmVehicleStayInventoryVo.getLastDate() == null) {
-                    record.setInventoryDate("无");
-                } else {
-                    record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate()));
-                }
-                if (StringUtils.isBlank(scmVehicleStayInventoryVo.getLastName())) {
-                    record.setInventoryName("无");
-                } else {
-                    record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
-                }
-            }
-        }
-        return iPage;
-    }
-
-    public List<ScmVehicleStayInventoryVo> selInventory(String vin, String id, String useOrgSid) {
-        return baseMapper.selInventory(vin, id, useOrgSid);
-    }
-
-    /**
-     * 手机端-获取验车管理列表 查询条件
-     *
-     * @param query
-     * @return
-     */
-    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());
-        }
-        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
-            qw.eq("svsi.locationSid", query.getWarehouseSid());
-        }
-        return qw;
-    }
-
-
     public void delBySid(String sid, String inventoryName) {
         baseMapper.delBySid(sid, inventoryName);
     }
-
-    public String getVin(String vin) {
-        return baseMapper.getVin(vin);
-    }
-
-    public ResultBean<String> getToDoNum(String userSid) {
-        ResultBean rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        int count = baseMapper.getToDoNum(useOrgSid);
-        return rb.success().setData(String.valueOf(count));
-    }
 }

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

@@ -26,7 +26,6 @@
 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;
@@ -38,8 +37,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/>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java

@@ -116,4 +116,12 @@ public class AppGressionDetailsVo implements Vo {
     @ApiModelProperty("车架号")
     private List<VehicleGressionVehVo> scmVehicleGressionVehs;
 
+    @ApiModelProperty("调出方负责人名称")
+    @JsonProperty("personName")
+    private String staffName;
+
+    @ApiModelProperty("调出方负责人用户sid")
+    @JsonProperty("personSid")
+    private String personUserSid;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java

@@ -104,5 +104,13 @@ public class AppGressionInfoVo implements Vo {
     @ApiModelProperty("现场照片")
     private List<String> image;
 
+    @ApiModelProperty("调出方负责人名称")
+    @JsonProperty("personName")
+    private String staffName;
+
+    @ApiModelProperty("调出方负责人用户sid")
+    @JsonProperty("personSid")
+    private String personUserSid;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java

@@ -5,6 +5,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AppGressionPageVo implements Vo {
 
@@ -27,6 +29,9 @@ public class AppGressionPageVo implements Vo {
     @ApiModelProperty("临时出门证下载")
     private String downloadUrl;
 
+    @ApiModelProperty("车架号")
+    private List<VehicleGressionVehVo> scmVehicleGressionVehs;
+
     @ApiModelProperty("是否显示删除 流程未提交时 显示")
     private String showDetectBtn;
     @ApiModelProperty("是否显示办理 流程未提交时 显示")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/baseInfo/AppScmBaseInfoService.java

@@ -31,12 +31,12 @@ public class AppScmBaseInfoService {
         String inspectedCarNum = scmVehicleExamineFeign.getToDoNum(userSid).getData();
         String storageCarNum = scmVehicleEnterlibraryFeign.getToDoNum(userSid).getData();
         String moveCarNum = scmVehicleGressionFeign.getToDoNum(userSid).getData();
-        String inventoryCarNum = scmVehicleStayInventoryFeign.getToDoNum(userSid).getData();
+//        String inventoryCarNum = scmVehicleStayInventoryFeign.getToDoNum(userSid).getData();
         String inspectinoCarNum = scmVehicleStayPatrolinspectionFeign.getToDoNum(userSid).getData();
         appScmBaseInfoVo.setInspectedCarNum(inspectedCarNum);
         appScmBaseInfoVo.setStorageCarNum(storageCarNum);
         appScmBaseInfoVo.setMoveCarNum(moveCarNum);
-        appScmBaseInfoVo.setInventoryCarNum(inventoryCarNum);
+//        appScmBaseInfoVo.setInventoryCarNum(inventoryCarNum);
         appScmBaseInfoVo.setInspectinoCarNum(inspectinoCarNum);
         return rb.success().setData(appScmBaseInfoVo);
     }

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

@@ -27,8 +27,8 @@ package com.yxt.anrui.terminal.biz.supplychain.inventory;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageQuery;
-import com.yxt.anrui.scm.api.scmvehiclestayinventory.AppScmVehicleStayInventoryListPageVo;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery;
+import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign;
 import com.yxt.anrui.terminal.api.supplychain.inventory.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
@@ -67,8 +67,9 @@ public class AppScmVehicleInventoryService {
      * @return
      */
     public ResultBean getInventoryRecords(String userSid) {
-        ResultBean resultBean = scmVehicleStayInventoryFeign.getInventoryRecords(userSid);
-        return resultBean;
+//        ResultBean resultBean = scmVehicleStayInventoryFeign.getInventoryRecords(userSid);
+//        return resultBean;
+        return null;
     }
 
     /**
@@ -80,7 +81,7 @@ public class AppScmVehicleInventoryService {
     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);
+        ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> inspectionList = scmVehicleInventoryFeign.getInventoryList(pq);
         PagerVo<InventoryListPageVo> vo = CoverUtils.selectPagerVo(inspectionList.getData());
         return rb.success().setData(vo);
     }