diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java
new file mode 100644
index 0000000000..9b428fec90
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryCarWarehousingDto.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryDto.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryDto
+ * Description: 入库单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 数据传输对象", description = "入库单 数据传输对象")
+public class AppScmVehicleEnterlibraryCarWarehousingDto implements Dto {
+
+ @ApiModelProperty("车架号")
+ private String vinNo;
+
+ @ApiModelProperty("订单类型")
+ private String purchaseType;
+
+ @ApiModelProperty("订单类型")
+ private String purchaseTypeKey;
+
+ @ApiModelProperty("车型")
+ private String modelName;
+
+ @ApiModelProperty("发车日期")
+ private String departureDate;
+
+ @ApiModelProperty("验车日期")
+ private String inspectionDate;
+
+ @ApiModelProperty("验车人")
+ private String inspection;
+
+ @ApiModelProperty("入库状态")
+ private String inboundState;
+
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+
+ @ApiModelProperty("分公司名称")
+ private String useOrgName;
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryDetailsVo.java
new file mode 100644
index 0000000000..6f0d5e599b
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryDetailsVo.java
@@ -0,0 +1,51 @@
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppScmVehicleEnterlibraryDetailsVo implements Vo {
+
+ @ApiModelProperty("车架号")
+ private String vin;
+
+ @ApiModelProperty("订单类型")
+ private String type;
+
+ @ApiModelProperty("车型")
+ private String model;
+
+ @ApiModelProperty("验车日期")
+ private String dispatchedDate;
+
+ @ApiModelProperty("验车人")
+ private String inspectedName;
+
+ @ApiModelProperty("验车日期")
+ private String inspectedDate;
+
+ @ApiModelProperty("入库人")
+ private String name;
+
+ @ApiModelProperty("入库日期")
+ private String date;
+
+ @ApiModelProperty("仓库")
+ private String warehouse;
+
+ @ApiModelProperty("仓库管理员")
+ private String warehouseName;
+
+ @ApiModelProperty("车辆库位照片")
+ private List image;
+
+ @ApiModelProperty("入库状态")
+ private String warehousingState;
+
+ @ApiModelProperty("定位位置")
+ private String location;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryDto.java
new file mode 100644
index 0000000000..64fb5e73ba
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryDto.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm)
+ * File: ScmVehicleEnterlibraryDto.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryDto
+ * Description: 入库单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 数据传输对象", description = "入库单 数据传输对象")
+public class AppScmVehicleEnterlibraryDto implements Dto {
+
+ @ApiModelProperty("sid")
+ private String warehousingSid;
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+
+ @ApiModelProperty("入库时间")
+ private String date;
+
+ @ApiModelProperty("入库人")
+ private String name;
+
+ @ApiModelProperty("车架号")
+ private String vin;
+
+ @ApiModelProperty("库位")
+ private String warehouseKey;
+
+ @ApiModelProperty("库位")
+ private String warehouse;
+
+ @ApiModelProperty("定位地址")
+ private String address;
+
+ @ApiModelProperty("经纬度")
+ private String location;
+
+ @ApiModelProperty("车辆库位照片")
+ private List warehouseImage;
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryInfoVo.java
new file mode 100644
index 0000000000..ad8dbb9f82
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryInfoVo.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+
+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)
+ * File: ScmVehicleEnterlibraryVo.java
+ * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo
+ * Description: 入库单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "入库单 视图数据对象", description = "入库单 视图数据对象")
+public class AppScmVehicleEnterlibraryInfoVo implements Vo {
+
+ @ApiModelProperty("sid")
+ private String warehousingSid;
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+
+ @ApiModelProperty("入库日期")
+ private String date;
+
+ @ApiModelProperty("入库人")
+ private String name;
+
+ @ApiModelProperty("车架号")
+ private String vin;
+
+ @ApiModelProperty("库位")
+ private String warehouseKey;
+
+ @ApiModelProperty("库位")
+ private String warehouse;
+
+ @ApiModelProperty("定位地址")
+ private String address;
+
+ @ApiModelProperty("经纬度")
+ private String location;
+
+ @ApiModelProperty("库位照片")
+ private List warehouseImage;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageQuery.java
new file mode 100644
index 0000000000..25d55bb189
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageQuery.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleEnterlibraryPageQuery implements Query {
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+
+ @ApiModelProperty("类型 “”或null 全部 1待入库 2已入库")
+ private String type;
+
+ @ApiModelProperty("车架号、车型、订单类型")
+ private String names;
+
+ @ApiModelProperty("使用组织分公司sid")
+ private String useOrgSid;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageVo.java
new file mode 100644
index 0000000000..1b73197ffb
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageVo.java
@@ -0,0 +1,46 @@
+package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmVehicleEnterlibraryPageVo implements Vo {
+
+ @ApiModelProperty("车型")
+ private String model;
+
+ @ApiModelProperty("车架号")
+ private String vin;
+
+ @ApiModelProperty("验车人")
+ private String inspectedName;
+
+ @ApiModelProperty("验车时间")
+ private String inspectedDate;
+
+ @ApiModelProperty("订单类型")
+ private String purchaseType;
+
+ @ApiModelProperty("发车日期")
+ private String dispatchedDate;
+
+ @ApiModelProperty("是否显示入库按钮")
+ private boolean showWarehousingBtn;
+
+ @ApiModelProperty("入库日期")
+ private String warehousingDate;
+
+ @ApiModelProperty("库位地址")
+ private String address;
+
+ @ApiModelProperty("仓库管理员")
+ private String name;
+
+ @ApiModelProperty("sid")
+ private String warehousingSid;
+
+ @ApiModelProperty("入库状态")
+ private String inboundState;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java
index d934117d7e..006ca54df6 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibrary.java
@@ -86,5 +86,9 @@ public class ScmVehicleEnterlibrary extends BaseEntity {
private String addressCode; // 地址经纬度
@ApiModelProperty("入库状态（已入库，未入库）")
private String inboundState; // 入库状态（已入库，未入库）
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+ @ApiModelProperty("分公司名称")
+ private String useOrgName;
}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java
index 4efebf16ea..2d7425f7ea 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java
@@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@@ -51,7 +53,7 @@ import java.util.List;
@Api(tags = "入库单")
@FeignClient(
contextId = "scm-ScmVehicleEnterlibrary",
- name = "scm",
+ name = "anrui-scm",
path = "v1/scmvehicleenterlibrary",
fallback = ScmVehicleEnterlibraryFeignFallback.class)
public interface ScmVehicleEnterlibraryFeign {
@@ -65,14 +67,36 @@ public interface ScmVehicleEnterlibraryFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto);
-
+
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+ @ApiOperation("手机端-获取车辆入库列表")
+ @PostMapping("/getCarWarehousingList")
+ @ResponseBody
+ public ResultBean> getCarWarehousingList(@RequestBody PagerQuery pq);
+
+ @ApiOperation("手机端-初始化入库单信息")
+ @GetMapping("/getCarWarehousingInfo/{warehousingSid}/{userSid}")
+ @ResponseBody
+ public ResultBean getCarWarehousingInfo(@PathVariable("warehousingSid") String warehousingSid, @PathVariable("userSid") String userSid);
+
+ @ApiOperation("手机端-保存入库单")
+ @PostMapping("/saveCarWarehousingInfo")
+ @ResponseBody
+ public ResultBean saveCarWarehousingInfo(@RequestBody AppScmVehicleEnterlibraryDto dto);
+
+ @ApiOperation("手机端-入库详情")
+ @GetMapping("/getCarWarehousing/{warehousingSid}")
+ @ResponseBody
+ public ResultBean getCarWarehousing(@PathVariable("warehousingSid") String warehousingSid);
+
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java
index eb747a5314..6376713fcd 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java
@@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehicleenterlibrary;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -69,4 +71,24 @@ public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibra
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口scm/scmvehicleenterlibrary/fetchDetailsBySid无法访问");
}
+
+ @Override
+ public ResultBean> getCarWarehousingList(PagerQuery pq) {
+ return null;
+ }
+
+ @Override
+ public ResultBean getCarWarehousingInfo(String warehousingSid, String userSid) {
+ return null;
+ }
+
+ @Override
+ public ResultBean saveCarWarehousingInfo(AppScmVehicleEnterlibraryDto dto) {
+ return null;
+ }
+
+ @Override
+ public ResultBean getCarWarehousing(String warehousingSid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java
index 10e9a8afe8..c0987a09aa 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java
@@ -33,7 +33,7 @@ public class AppScmVehicleExaminePageVo implements Vo {
@ApiModelProperty("验车按钮 显示 只要通过了就不显示")
private boolean showInspectedBtn;
- @ApiModelProperty("是否验车 key 未验车 1 以验车2")
+ @ApiModelProperty("是否验车 未验车 1 以验车2")
private String inspectedType;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
index 1518c46f1c..a158884b63 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "验车单")
@FeignClient(
contextId = "scm-ScmVehicleExamine",
- name = "scm",
+ name = "anrui-scm",
path = "v1/scmvehicleexamine",
fallback = ScmVehicleExamineFeignFallback.class)
public interface ScmVehicleExamineFeign {
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
new file mode 100644
index 0000000000..d36cffae46
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java
@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+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)
+ * File: ScmVehicleGressionVo.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo
+ * Description: 移位单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 视图数据详情", description = "移位单 视图数据详情")
+public class AppScmVehicleGressionDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车辆sid")
+ private String vehicleSid; // 车辆sid
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("申请编号")
+ private String applicantNo; // 申请编号
+ @ApiModelProperty("申请人")
+ private String applicantName;
+ @ApiModelProperty("申请编日期")
+ private String applicantDate;
+ @ApiModelProperty("现存地点")
+ private String location; // 现存地点
+ @ApiModelProperty("现存地点")
+ private String locationSid;
+ @ApiModelProperty("现存地点")
+ private String locationKey;
+ @ApiModelProperty("目标地点")
+ private String targetLocation; // 目标地点
+ @ApiModelProperty("目标地点")
+ private String targetLocationSid;
+ @ApiModelProperty("目标地点")
+ private String targetLocationKey;
+ @ApiModelProperty("变更原因")
+ private String changeReason; // 变更原因
+ @ApiModelProperty("申请经费")
+ private String applicantFunds; // 申请经费
+ @ApiModelProperty("经办人")
+ private String operator; // 经办人
+ @ApiModelProperty("保险状态")
+ private String InsuranceState; // 保险状态
+ @ApiModelProperty("保险状态")
+ private String InsuranceStateKey;
+ @ApiModelProperty("临牌")
+ private String temporaryCard; // 临牌
+ @ApiModelProperty("审核状态")
+ private String nodeState;
+ @ApiModelProperty("用户sid")
+ private String userSid;
+ @ApiModelProperty("保单照片")
+ private List policyImage;
+ @ApiModelProperty("现场照片")
+ private List image;
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
new file mode 100644
index 0000000000..61009d081f
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: scm(scm)
+ * File: ScmVehicleGressionDto.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionDto
+ * Description: 移位单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 数据传输对象", description = "移位单 数据传输对象")
+public class AppScmVehicleGressionDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车辆sid")
+ private String vehicleSid; // 车辆sid
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("申请编号")
+ private String applicantNo; // 申请编号
+ @ApiModelProperty("现存地点")
+ private String location; // 现存地点
+ @ApiModelProperty("现存放地点")
+ private String locationKey;
+ @ApiModelProperty("现存放地点sid")
+ private String locationSid;
+ @ApiModelProperty("目标地点")
+ private String targetLocation; // 目标地点
+ @ApiModelProperty("目标库")
+ private String targetLocationKey;
+ @ApiModelProperty("目标库sid")
+ private String targetLocationSid;
+ @ApiModelProperty("变更原因")
+ private String changeReason; // 变更原因
+ @ApiModelProperty("申请经费")
+ private String applicantFunds; // 申请经费
+ @ApiModelProperty("经办人")
+ private String operator; // 经办人
+ @ApiModelProperty("保险状态")
+ private String InsuranceState; // 保险状态
+ @ApiModelProperty("保险状态")
+ private String InsuranceStateKey; // 保险状态
+ @ApiModelProperty("临牌")
+ private String temporaryCard; // 临牌
+ @ApiModelProperty("任务id")
+ private String taskId; // 任务id
+ @ApiModelProperty("流程实例id")
+ private String procInsId; // 流程实例id
+ @ApiModelProperty("保单照片")
+ private List policyImage;
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
new file mode 100644
index 0000000000..dee706f29a
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java
@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+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)
+ * File: ScmVehicleGressionVo.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo
+ * Description: 移位单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 视图数据对象", description = "移位单 视图数据对象")
+public class AppScmVehicleGressionInfoVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车辆sid")
+ private String vehicleSid; // 车辆sid
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("申请编号")
+ private String applicantNo; // 申请编号
+ @ApiModelProperty("申请人")
+ private String applicantName;
+ @ApiModelProperty("申请编日期")
+ private String applicantDate;
+ @ApiModelProperty("现存地点")
+ private String location; // 现存地点
+ @ApiModelProperty("现存地点")
+ private String locationSid;
+ @ApiModelProperty("现存地点")
+ private String locationKey;
+ @ApiModelProperty("目标地点")
+ private String targetLocation; // 目标地点
+ @ApiModelProperty("目标地点")
+ private String targetLocationSid;
+ @ApiModelProperty("目标地点")
+ private String targetLocationKey;
+ @ApiModelProperty("变更原因")
+ private String changeReason; // 变更原因
+ @ApiModelProperty("申请经费")
+ private String applicantFunds; // 申请经费
+ @ApiModelProperty("经办人")
+ private String operator; // 经办人
+ @ApiModelProperty("保险状态")
+ private String InsuranceState; // 保险状态
+ @ApiModelProperty("保险状态")
+ private String InsuranceStateKey;
+ @ApiModelProperty("临牌")
+ private String temporaryCard; // 临牌
+ @ApiModelProperty("审核状态")
+ private String nodeState;
+ @ApiModelProperty("用户sid")
+ private String userSid;
+ @ApiModelProperty("保单照片")
+ private List policyImage;
+ @ApiModelProperty("现场照片")
+ private List image;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java
new file mode 100644
index 0000000000..3e4bc5f6cf
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm)
+ * File: ScmVehicleGressionQuery.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionQuery
+ * Description: 移位单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 查询条件", description = "移位单 查询条件")
+public class AppScmVehicleGressionPageQuery implements Query {
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+
+ @ApiModelProperty(" 先 申请单编号 后 车架号 ")
+ private String names;
+
+ @ApiModelProperty(" “”或null 全部 1待办 2已办 ")
+ private String type;
+
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java
new file mode 100644
index 0000000000..a853ab7400
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehiclegression;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: scm(scm)
+ * File: ScmVehicleGressionVo.java
+ * Class: scm.api.scmvehiclegression.ScmVehicleGressionVo
+ * Description: 移位单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "移位单 视图数据对象", description = "移位单 视图数据对象")
+public class AppScmVehicleGressionPageVo implements Vo {
+
+ @ApiModelProperty("sid")
+ private String sid;
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("申请编号")
+ private String applicantNo;
+ @ApiModelProperty("状态")
+ private String InsuranceState;
+ @ApiModelProperty("申请人")
+ private String applicantName;
+ @ApiModelProperty("申请日期")
+ private String applicantDate;
+ @ApiModelProperty("申请费用")
+ private String applicantFunds;
+ @ApiModelProperty("临时出门证下载")
+ private String temporaryCard;
+ @ApiModelProperty("审核状态")
+ private String nodeState;
+
+ @ApiModelProperty("是否显示删除 流程未提交时 显示")
+ private boolean showDetectBtn;
+ @ApiModelProperty("是否显示办理 流程未提交时 显示")
+ private boolean showUpdateBtn;
+ @ApiModelProperty("是否显示上传 审批流程完成后并且未上传现场照片时显示")
+ private boolean showUploadBtn;
+ @ApiModelProperty("是否显示临时出门证按钮 审批流程完成后并且未上传现场照片时显示")
+ private boolean showDownloadBtn;
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
index 2e3da04320..0b48893cd7 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
@@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehiclegression;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@@ -51,7 +53,7 @@ import java.util.List;
@Api(tags = "移位单")
@FeignClient(
contextId = "scm-ScmVehicleGression",
- name = "scm",
+ name = "anrui-scm",
path = "v1/scmvehiclegression",
fallback = ScmVehicleGressionFeignFallback.class)
public interface ScmVehicleGressionFeign {
@@ -65,14 +67,39 @@ public interface ScmVehicleGressionFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehicleGressionDto dto);
-
+
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+
+ @ApiOperation("手机端-获取车辆移位列表")
+ @PostMapping("/getCarTransferList")
+ @ResponseBody
+ public ResultBean> getCarTransferList(@RequestBody PagerQuery pagerQuery);
+
+ @ApiOperation("手机端-保存车库移库信息")
+ @PostMapping("/saveCarTransferInfo")
+ @ResponseBody
+ public ResultBean saveCarTransferInfo(@RequestBody AppScmVehicleGressionDto dto);
+
+ @ApiOperation("手机端-初始化移库申请")
+ @GetMapping("/getCarTransferInfo/{sid}/{userSid}")
+ @ResponseBody
+ public ResultBean getCarTransferInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+
+ @ApiOperation("手机端-车库移库详情")
+ @GetMapping("/getCarTransfer/{sid}")
+ @ResponseBody
+ public ResultBean getCarTransfer(@PathVariable("sid") String sid);
+
+ @ApiOperation("手机端-删除车辆移库申请")
+ @DeleteMapping("/deleteCarTransfer/{sid}")
+ public ResultBean deleteCarTransfer(@PathVariable("sid") String sid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
index b5f7ff8908..756a64826d 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
@@ -48,25 +48,50 @@ import java.util.List;
@Component
public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign {
- @Override
- public ResultBean> listPage(PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问");
- }
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口scm/scmvehiclegression/listPage无法访问");
+ }
- @Override
- public ResultBean save(ScmVehicleGressionDto dto){
- return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/save无法访问");
- }
+ @Override
+ public ResultBean save(ScmVehicleGressionDto dto) {
+ return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/save无法访问");
+ }
- @Override
- public ResultBean delBySids( String[] sids){
- return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/delBySids无法访问");
- }
+ @Override
+ public ResultBean delBySids(String[] sids) {
+ return ResultBean.fireFail().setMsg("接口scm/scmvehiclegression/delBySids无法访问");
+ }
- @Override
- public ResultBean fetchDetailsBySid(String sid){
- ResultBean rb = ResultBean.fireFail();
- return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问");
- }
+ @Override
+ public ResultBean fetchDetailsBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口scm/scmvehiclegression/fetchDetailsBySid无法访问");
+ }
+
+ @Override
+ public ResultBean> getCarTransferList(PagerQuery pagerQuery) {
+ return null;
+ }
+
+ @Override
+ public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+ return null;
+ }
+
+ @Override
+ public ResultBean getCarTransferInfo(String sid, String userSid) {
+ return null;
+ }
+
+ @Override
+ public ResultBean getCarTransfer(String sid) {
+ return null;
+ }
+
+ @Override
+ public ResultBean deleteCarTransfer(String sid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java
new file mode 100644
index 0000000000..b036d5dabc
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.scm.api.scmwarehouse;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppScmWarehouseVo implements Vo {
+
+ @ApiModelProperty("仓库sid")
+ private String sid;
+ @ApiModelProperty("仓库key")
+ private String dictKey;
+ @ApiModelProperty("仓库value")
+ private String dictValue;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java
index 609b3c2f70..de2171ab9e 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java
@@ -47,20 +47,24 @@ public interface ScmWarehouseFeign {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmWarehouseDto dto);
-
+
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody ScmWarehouseDto dto, @PathVariable("sid") String sid);
-
+
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids);
-
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean fetchBySid(@PathVariable("sid") String sid);
@ApiOperation("根据分公司sid获取存放地点信息")
@GetMapping("/fetchByUseOrgSid")
- public ResultBean>> fetchByUseOrgSid(@RequestParam("sid") String sid);
+ public ResultBean>> fetchByUseOrgSid(@RequestParam("sid") String sid);
+
+ @ApiOperation("手机端-获取仓库")
+ @GetMapping("/selectWarehouseByUserSid/{userSid}")
+ public ResultBean> selectWarehouseByUserSid(@PathVariable("userSid") String userSid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java
index f84a25acf0..5cba54bef6 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java
@@ -68,4 +68,9 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
public ResultBean>> fetchByUseOrgSid(String sid) {
return null;
}
+
+ @Override
+ public ResultBean> selectWarehouseByUserSid(String userSid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java
index d26b15b986..8c0035fe9e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java
@@ -66,4 +66,7 @@ public interface ScmFileMapper extends BaseMapper {
@Select("select * from scm_file where linkSid = #{sid} and attachType = #{type}")
List selectByLinkSid(@Param("sid") String sid, @Param("type") String type);
+
+ @Select("delete from scm_file where linkSid = #{sid} and attachType = #{type}")
+ void deleteByLinkSidAndType(@Param("sid") String sid, @Param("type") String type);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java
index b8fbf92dd5..2cf666b45b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java
@@ -29,6 +29,7 @@ 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.scm.api.scmfile.*;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -115,4 +116,14 @@ public class ScmFileService extends MybatisBaseService {
List list = baseMapper.selectByLinkSid(sid, type);
return list;
}
+
+ /**
+ * 根据业务sid和附件类型删除附件
+ *
+ * @param sid
+ * @param type
+ */
+ public void deleteByLinkSidAndType(String sid, String type) {
+ baseMapper.deleteByLinkSidAndType(sid,type);
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java
index 50c43c4f42..92f36eb94e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java
@@ -26,11 +26,11 @@
package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibrary;
-import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryVo;
+import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -54,13 +54,40 @@ import java.util.List;
@Mapper
public interface ScmVehicleEnterlibraryMapper extends BaseMapper {
- //@Update("update scm_vehicle_enterlibrary set name=#{msg} where id=#{id}")
- //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
-
- IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
-
- List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
-
- @Select("select * from scm_vehicle_enterlibrary")
- List selectListVo();
+ //@Update("update scm_vehicle_enterlibrary set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from scm_vehicle_enterlibrary")
+ List selectListVo();
+
+ /**
+ * 手机端-获取车辆入库列表
+ *
+ * @param page
+ * @param qw
+ * @param names
+ * @return
+ */
+ IPage getCarWarehousingList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names);
+
+ /**
+ * 手机端-初始化入库单信息
+ *
+ * @param warehousingSid
+ * @param useOrgSid
+ * @return
+ */
+ AppScmVehicleEnterlibraryInfoVo getCarWarehousingInfo(@Param("warehousingSid") String warehousingSid, @Param("useOrgSid") String useOrgSid);
+
+ /**
+ * 手机端-入库详情
+ *
+ * @param warehousingSid
+ * @return
+ */
+ AppScmVehicleEnterlibraryDetailsVo getCarWarehousing(@Param("warehousingSid") String warehousingSid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml
index 6fbc90d91b..386d0e8a7a 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.xml
@@ -14,4 +14,60 @@
SELECT * FROM scm_vehicle_enterlibrary
${ew.sqlSegment}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java
index a49f86d239..003b7bb734 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java
@@ -25,7 +25,13 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineDto;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -54,42 +60,83 @@ import java.util.List;
@RequestMapping("v1/scmvehicleenterlibrary")
public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
- @Autowired
- private ScmVehicleEnterlibraryService scmVehicleEnterlibraryService;
+ @Autowired
+ private ScmVehicleEnterlibraryService scmVehicleEnterlibraryService;
- @Override
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = scmVehicleEnterlibraryService.listPageVo(pq);
- return rb.success().setData(pv);
- }
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = scmVehicleEnterlibraryService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
- @Override
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmVehicleEnterlibraryService.saveOrUpdateDto(dto);
- return rb.success();
- }
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody ScmVehicleEnterlibraryDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehicleEnterlibraryService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据sid批量删除")
+ @Override
+ @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- scmVehicleEnterlibraryService.delBySids(sids);
- return rb.success();
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehicleEnterlibraryService.delBySids(sids);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据SID获取一条记录")
+ @Override
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmVehicleEnterlibraryDetailsVo vo = scmVehicleEnterlibraryService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+
+ @Override
+ @ApiOperation("手机端-获取车辆入库列表")
+ @PostMapping("/getCarWarehousingList")
+ public ResultBean> getCarWarehousingList(PagerQuery pq) {
+ if (StringUtils.isBlank(pq.getParams().getUserSid())) {
+ new ResultBean<>().success().setMsg("用户sid不能为空");
+ }
+ PagerVo page = new PagerVo<>();
+ IPage iPage = scmVehicleEnterlibraryService.getCarWarehousingList(pq);
+ PagerVo pagerVo = PagerUtil.pageToVo(iPage, page);
+ return new ResultBean>().success().setData(pagerVo);
+ }
+
+ @Override
+ @ApiOperation("手机端-初始化入库单信息")
+ @GetMapping("/getCarWarehousingInfo/{warehousingSid}/{userSid}")
+ public ResultBean getCarWarehousingInfo(String warehousingSid, String userSid) {
+ ResultBean rb = ResultBean.fireFail();
+ AppScmVehicleEnterlibraryInfoVo vo = scmVehicleEnterlibraryService.getCarWarehousingInfo(warehousingSid, userSid);
+ return rb.success().setData(vo);
+ }
+
+ @Override
+ @ApiOperation("手机端-保存验车单")
+ @PostMapping("/saveCarWarehousingInfo")
+ public ResultBean saveCarWarehousingInfo(AppScmVehicleEnterlibraryDto dto) {
ResultBean rb = ResultBean.fireFail();
- ScmVehicleEnterlibraryDetailsVo vo = scmVehicleEnterlibraryService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
+ scmVehicleEnterlibraryService.saveCarWarehousingInfo(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("手机端-入库详情")
+ @GetMapping("/getCarWarehousing/{warehousingSid}")
+ public ResultBean getCarWarehousing(String warehousingSid) {
+ ResultBean rb = ResultBean.fireFail();
+ AppScmVehicleEnterlibraryDetailsVo vo = scmVehicleEnterlibraryService.getCarWarehousing(warehousingSid);
+ return rb.success().setData(vo);
+ }
}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
index 03093fcba0..2ae67843d9 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
@@ -28,7 +28,15 @@ package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
+import com.yxt.anrui.scm.api.scmvehicleexamine.*;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -37,8 +45,13 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -56,51 +69,204 @@ import java.util.List;
*/
@Service
public class ScmVehicleEnterlibraryService extends MybatisBaseService {
- private QueryWrapper createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
- // todo: 这里根据具体业务调整查询条件
- // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
- QueryWrapper qw = new QueryWrapper<>();
- return qw;
- }
-
- public PagerVo listPageVo(PagerQuery pq) {
- ScmVehicleEnterlibraryQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
-
- public void saveOrUpdateDto(ScmVehicleEnterlibraryDto dto){
+
+ @Autowired
+ SysUserFeign sysUserFeign;
+
+ @Autowired
+ SysOrganizationFeign sysOrganizationFeign;
+
+ @Autowired
+ ScmFileService scmFileService;
+
+ @Autowired
+ FileUploadComponent fileUploadComponent;
+
+ private QueryWrapper createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ ScmVehicleEnterlibraryQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(ScmVehicleEnterlibraryDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
- return;
- }
- this.updateByDto(dto);
- }
-
- public void insertByDto(ScmVehicleEnterlibraryDto dto){
- ScmVehicleEnterlibrary entity = new ScmVehicleEnterlibrary();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.insert(entity);
- }
-
- public void updateByDto(ScmVehicleEnterlibraryDto dto){
- String dtoSid = dto.getSid();
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(ScmVehicleEnterlibraryDto dto) {
+ ScmVehicleEnterlibrary entity = new ScmVehicleEnterlibrary();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(ScmVehicleEnterlibraryDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
- }
- ScmVehicleEnterlibrary entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public ScmVehicleEnterlibraryDetailsVo fetchDetailsVoBySid(String sid){
- ScmVehicleEnterlibrary entity = fetchBySid(sid);
- ScmVehicleEnterlibraryDetailsVo vo = new ScmVehicleEnterlibraryDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
+ }
+ ScmVehicleEnterlibrary entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public ScmVehicleEnterlibraryDetailsVo fetchDetailsVoBySid(String sid) {
+ ScmVehicleEnterlibrary entity = fetchBySid(sid);
+ ScmVehicleEnterlibraryDetailsVo vo = new ScmVehicleEnterlibraryDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ /**
+ * 手机端-获取车辆入库列表
+ *
+ * @param pq
+ * @return
+ */
+ public IPage getCarWarehousingList(PagerQuery pq) {
+ IPage page = PagerUtil.queryToPage(pq);
+ String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pq.getParams().getUserSid()).getData().getSid();
+ pq.getParams().setUseOrgSid(useOrgSid);
+ QueryWrapper qw = appQueryWrapper(pq.getParams());
+ AppScmVehicleEnterlibraryPageQuery params = pq.getParams();
+ IPage iPage = baseMapper.getCarWarehousingList(page, qw, params.getNames());
+ List records = iPage.getRecords();
+ for (AppScmVehicleEnterlibraryPageVo record : records) {
+ if ("1".equals(record.getInboundState())) {
+ record.setShowWarehousingBtn(true);
+ }
+ }
+ return iPage;
+ }
+
+ /**
+ * 手机端-获取车辆入库列表 查询条件
+ *
+ * @param query
+ * @return
+ */
+ private QueryWrapper appQueryWrapper(AppScmVehicleEnterlibraryPageQuery query) {
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+ qw.eq("sve.useOrgSid", query.getUseOrgSid());
+ }
+ if (StringUtils.isNotBlank(query.getType())) {
+ qw.eq("sve.inboundState", query.getType());
+ }
+ return qw;
+ }
+
+ /**
+ * 手机端-初始化验车单信息
+ *
+ * @param warehousingSid
+ * @param userSid
+ * @return
+ */
+ public AppScmVehicleEnterlibraryInfoVo getCarWarehousingInfo(String warehousingSid, String userSid) {
+ String type3 = "03"; // 车辆库位照片 03
+ List warehouseImage = new ArrayList<>();
+ String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+ AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
+ SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
+ AppScmVehicleEnterlibraryInfoVo vo = baseMapper.getCarWarehousingInfo(warehousingSid, useOrgSid);
+ vo.setName(data1.getName());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String date = simpleDateFormat.format(new Date());
+ vo.setDate(date);
+ List scmFiles = scmFileService.selectByLinkSid(vo.getWarehousingSid(), type3);
+ for (ScmFile scmFile : scmFiles) {
+ warehouseImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+ }
+ vo.setWarehouseImage(warehouseImage);
+ return vo;
+ }
+
+ /**
+ * 手机端-保存验车单
+ *
+ * @param dto
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean saveCarWarehousingInfo(AppScmVehicleEnterlibraryDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String s3 = "";
+ String type = "03"; //车辆库位的照片
+ if (StringUtils.isNotBlank(dto.getWarehousingSid())) {
+ ScmVehicleEnterlibrary scmVehicleEnterlibrary = fetchBySid(dto.getWarehousingSid());
+ if ("1".equals(scmVehicleEnterlibrary.getInboundState())) {
+ scmVehicleEnterlibrary.setInboundDate(dto.getDate());
+ scmVehicleEnterlibrary.setInbound(dto.getName());
+ scmVehicleEnterlibrary.setVinNo(dto.getVin());
+ scmVehicleEnterlibrary.setAddress(dto.getAddress());
+ scmVehicleEnterlibrary.setAddressCode(dto.getLocation());
+ scmVehicleEnterlibrary.setInboundState("2");
+ baseMapper.updateById(scmVehicleEnterlibrary);
+
+ scmFileService.deleteByLinkSidAndType(scmVehicleEnterlibrary.getSid(), type);
+ List warehouseImage = dto.getWarehouseImage();
+ for (String s : warehouseImage) {
+ if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ s3 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+ }
+ }
+ ScmFile scmFile1 = new ScmFile();
+ scmFile1.setAttachType(type);
+ scmFile1.setFileName("车辆库位的照片");
+ scmFile1.setFilePath(s3);
+ scmFile1.setLinkSid(dto.getWarehousingSid());
+ scmFileService.save(scmFile1);
+ } else if ("2".equals(scmVehicleEnterlibrary.getInboundState())) {
+ return rb.fail().setMsg("当前车辆已验车完成，请勿重复保存");
+ }
+ }
+ return rb.fail().setMsg("保存失败");
+ }
+
+ /**
+ * 手机端-入库详情
+ *
+ * @param warehousingSid
+ * @return
+ */
+ public AppScmVehicleEnterlibraryDetailsVo getCarWarehousing(String warehousingSid) {
+ String type3 = "03"; // 车辆库位照片 03
+ List warehouseImage = new ArrayList<>();
+ AppScmVehicleEnterlibraryDetailsVo vo = baseMapper.getCarWarehousing(warehousingSid);
+ List scmFiles = scmFileService.selectByLinkSid(warehousingSid, type3);
+ for (ScmFile scmFile : scmFiles) {
+ warehouseImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+ }
+ vo.setImage(warehouseImage);
+ return vo;
+ }
+
+ /**
+ * 验车单通过验车并保存未入库信息
+ *
+ * @param dto
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean saveCarWarehousing(AppScmVehicleEnterlibraryCarWarehousingDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmVehicleEnterlibrary entity = new ScmVehicleEnterlibrary();
+ BeanUtil.copyProperties(dto, entity);
+ save(entity);
+ return rb.success().setMsg("保存成功");
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
index f2c47bf321..8272555f1b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
@@ -23,9 +23,15 @@
sve.departureDate as dispatchedDate,
sve.purchaseType,
sve.inspection as inspectedName,
- sve.inspectionDate as inspectedDate
+ sve.inspectionDate as inspectedDate,
+ sve.inspectionResult as inspectedType
FROM scm_vehicle_examine sve
- ${ew.sqlSegment}
+
+ ${ew.sqlSegment}
+
+ and concat(sve.vinNo,sve.modelName,sve.purchaseType) LIKE concat('%', #{names}, '%')
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
index 8b68f25082..57a75650e2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
@@ -25,7 +25,11 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmvehiclegression;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
import com.yxt.anrui.scm.api.scmvehiclegression.*;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -55,42 +59,91 @@ import java.util.List;
@RequestMapping("v1/scmvehiclegression")
public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
- @Autowired
- private ScmVehicleGressionService scmVehicleGressionService;
+ @Autowired
+ private ScmVehicleGressionService scmVehicleGressionService;
- @Override
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = scmVehicleGressionService.listPageVo(pq);
- return rb.success().setData(pv);
- }
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = scmVehicleGressionService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
- @Override
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody ScmVehicleGressionDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmVehicleGressionService.saveOrUpdateDto(dto);
- return rb.success();
- }
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody ScmVehicleGressionDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehicleGressionService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据sid批量删除")
+ @Override
+ @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- scmVehicleGressionService.delBySids(sids);
- return rb.success();
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehicleGressionService.delBySids(sids);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据SID获取一条记录")
+ @Override
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- ScmVehicleGressionDetailsVo vo = scmVehicleGressionService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmVehicleGressionDetailsVo vo = scmVehicleGressionService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @Override
+ @ApiOperation("手机端-获取车辆移位列表")
+ @PostMapping("/getCarTransferList")
+ public ResultBean> getCarTransferList(PagerQuery pagerQuery) {
+ if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+ new ResultBean<>().success().setMsg("用户sid不能为空");
+ }
+ PagerVo page = new PagerVo<>();
+ IPage iPage = scmVehicleGressionService.getCarTransferList(pagerQuery);
+ PagerVo pagerVo = PagerUtil.pageToVo(iPage, page);
+ return new ResultBean>().success().setData(pagerVo);
+ }
+
+ @Override
+ @ApiOperation("手机端-保存车库移库信息")
+ @PostMapping("/saveCarTransferInfo")
+ public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehicleGressionService.saveCarTransferInfo(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("手机端-初始化移库申请")
+ @PostMapping("/getCarTransferInfo/{sid}")
+ public ResultBean getCarTransferInfo(String sid, String userSid) {
+ ResultBean rb = ResultBean.fireFail();
+ AppScmVehicleGressionInfoVo vo = scmVehicleGressionService.getCarTransferInfo(sid,userSid);
+ return rb.success().setData(vo);
+ }
+
+ @Override
+ @ApiOperation("手机端-车库移库详情")
+ @PostMapping("/getCarTransfer/{sid}")
+ public ResultBean getCarTransfer(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ AppScmVehicleGressionDetailsVo vo = scmVehicleGressionService.getCarTransfer(sid);
+ return rb.success().setData(vo);
+ }
+
+ @Override
+ @ApiOperation("手机端-删除车辆移库申请")
+ @DeleteMapping("/deleteCarTransfer/{sid}")
+ public ResultBean deleteCarTransfer(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ scmVehicleGressionService.deleteCarTransfer(sid);
+ return rb.success();
+ }
}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index 899f611a27..1db4aced9d 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -28,7 +28,16 @@ package com.yxt.anrui.scm.biz.scmvehiclegression;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
import com.yxt.anrui.scm.api.scmvehiclegression.*;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -37,8 +46,13 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -56,51 +70,218 @@ import java.util.List;
*/
@Service
public class ScmVehicleGressionService extends MybatisBaseService {
- private QueryWrapper createQueryWrapper(ScmVehicleGressionQuery query) {
- // todo: 这里根据具体业务调整查询条件
- // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
- QueryWrapper qw = new QueryWrapper<>();
- return qw;
- }
-
- public PagerVo listPageVo(PagerQuery pq) {
- ScmVehicleGressionQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
-
- public void saveOrUpdateDto(ScmVehicleGressionDto dto){
+
+ @Autowired
+ SysUserFeign sysUserFeign;
+
+ @Autowired
+ SysStaffOrgFeign sysStaffOrgFeign;
+
+ @Autowired
+ ScmFileService scmFileService;
+
+ @Autowired
+ FileUploadComponent fileUploadComponent;
+
+ private QueryWrapper createQueryWrapper(ScmVehicleGressionQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ ScmVehicleGressionQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(ScmVehicleGressionDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
- return;
- }
- this.updateByDto(dto);
- }
-
- public void insertByDto(ScmVehicleGressionDto dto){
- ScmVehicleGression entity = new ScmVehicleGression();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.insert(entity);
- }
-
- public void updateByDto(ScmVehicleGressionDto dto){
- String dtoSid = dto.getSid();
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(ScmVehicleGressionDto dto) {
+ ScmVehicleGression entity = new ScmVehicleGression();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(ScmVehicleGressionDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
- }
- ScmVehicleGression entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public ScmVehicleGressionDetailsVo fetchDetailsVoBySid(String sid){
- ScmVehicleGression entity = fetchBySid(sid);
- ScmVehicleGressionDetailsVo vo = new ScmVehicleGressionDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
+ }
+ ScmVehicleGression entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public ScmVehicleGressionDetailsVo fetchDetailsVoBySid(String sid) {
+ ScmVehicleGression entity = fetchBySid(sid);
+ ScmVehicleGressionDetailsVo vo = new ScmVehicleGressionDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ /**
+ * 手机端-获取车辆移位列表
+ *
+ * @param pagerQuery
+ * @return
+ */
+ public IPage getCarTransferList(PagerQuery pagerQuery) {
+ IPage page = PagerUtil.queryToPage(pagerQuery);
+ String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+ pagerQuery.getParams().setUseOrgSid(useOrgSid);
+ QueryWrapper qw = appQueryWrapper(pagerQuery.getParams());
+ AppScmVehicleGressionPageQuery params = pagerQuery.getParams();
+ IPage iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
+ List records = iPage.getRecords();
+ for (AppScmVehicleGressionPageVo record : records) {
+ if ("未提交".equals(record.getNodeState())) {
+ record.setShowDetectBtn(true);
+ record.setShowDownloadBtn(true);
+ }
+ if ("审批通过".equals(record.getNodeState())) {
+ record.setShowUpdateBtn(true);
+ record.setShowUploadBtn(true);
+ }
+ }
+ return iPage;
+ }
+
+ /**
+ * 手机端-获取车辆移位列表 查询条件
+ *
+ * @param query
+ * @return
+ */
+ private QueryWrapper appQueryWrapper(AppScmVehicleGressionPageQuery query) {
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+ qw.eq("svg.useOrgSid", query.getUseOrgSid());
+ }
+ if (StringUtils.isNotBlank(query.getType())) {
+ qw.eq("svg.handleState", query.getType());
+ }
+ return qw;
+ }
+
+ /**
+ * 手机端-保存车库移库信息
+ *
+ * @param dto
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean saveCarTransferInfo(AppScmVehicleGressionDto dto) {
+ String s1 = "";
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(dto.getSid())) {
+ ScmVehicleGression scmVehicleGression = new ScmVehicleGression();
+ BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
+ save(scmVehicleGression);
+ if ("0".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
+ List factoryImage = dto.getPolicyImage();
+ for (String s : factoryImage) {
+ if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+ }
+ }
+ ScmFile scmFile = new ScmFile();
+ scmFile.setAttachType("04");
+ scmFile.setFileName("保单照片");
+ scmFile.setFilePath(s1);
+ scmFile.setLinkSid(scmVehicleGression.getSid());
+ scmFileService.save(scmFile);
+ }
+ } else {
+ ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid());
+ if (scmVehicleGression == null) {
+ return rb.setMsg("该数据不存在");
+ }
+ BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
+ updateById(scmVehicleGression);
+ }
+ return rb.success().setMsg("保存成功");
+ }
+
+ /**
+ * 手机端-初始化移库申请
+ *
+ * @param sid
+ * @return
+ */
+ public AppScmVehicleGressionInfoVo getCarTransferInfo(String sid, String userSid) {
+ String type1 = "04"; //保单照片
+ List policyImage = new ArrayList<>();
+ String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+ AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
+ SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData();
+ AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid, useOrgSid);
+ vo.setApplicantName(data1.getName());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String format = simpleDateFormat.format(new Date());
+ vo.setApplicantDate(format);
+ vo.setUserSid(userSid);
+ List scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
+ for (ScmFile scmFile : scmFiles1) {
+ policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+ }
+ vo.setPolicyImage(policyImage);
+ return vo;
+ }
+
+ /**
+ * 手机端-车库移库详情
+ *
+ * @param sid
+ * @return
+ */
+ public AppScmVehicleGressionDetailsVo getCarTransfer(String sid) {
+ String type1 = "04"; //保单照片
+ String type2 = "05"; //现场照片
+ List policyImage = new ArrayList<>();
+ List image = new ArrayList<>();
+ AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid);
+ List scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
+ for (ScmFile scmFile : scmFiles1) {
+ policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+ }
+ vo.setPolicyImage(policyImage);
+
+ List scmFiles2 = scmFileService.selectByLinkSid(sid, type2);
+ for (ScmFile scmFile : scmFiles2) {
+ policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+ }
+ vo.setImage(image);
+ return vo;
+ }
+
+ /**
+ * 手机端-删除车辆移库申请
+ *
+ * @param sid
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean deleteCarTransfer(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmVehicleGression scmVehicleGression = fetchBySid(sid);
+ if (scmVehicleGression == null) {
+ return rb.setMsg("该数据已被删除");
+ }
+ int i = deleteBySid(sid);
+ if (i <= 0) {
+ return rb.setMsg("删除失败");
+ }
+ return rb.success().setMsg("删除成功");
+ }
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java
index 9f961cb2b3..d54f2d82cd 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.scmwarehouse.AppScmWarehouseVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -65,4 +66,6 @@ public interface ScmWarehouseMapper extends BaseMapper {
List selectListVo();
List> fetchByUseOrgSid(String sid);
+
+ List selectWarehouseByUserSid(@Param("useOrgSid") String useOrgSid);
}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml
index 72db8feb7b..cf1fea6748 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml
@@ -1,22 +1,30 @@
-
-
-
-
-
+
+
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java
index 9f5cc0cc72..f86465d0ab 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java
@@ -1,9 +1,6 @@
package com.yxt.anrui.scm.biz.scmwarehouse;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseDto;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseQuery;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
+import com.yxt.anrui.scm.api.scmwarehouse.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -33,74 +30,81 @@ import java.util.Map;
@RequestMapping("v1/scmwarehouse")
public class ScmWarehouseRest implements ScmWarehouseFeign {
- @Autowired
- private ScmWarehouseService scmWarehouseService;
+ @Autowired
+ private ScmWarehouseService scmWarehouseService;
- @Override
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = scmWarehouseService.listPageVo(pq);
- return rb.success().setData(pv);
- }
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = scmWarehouseService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
- @Override
- @ApiOperation("根据条件查询所有数据列表")
- @PostMapping("/listAll")
- public ResultBean> listAll(@RequestBody ScmWarehouseQuery query){
- ResultBean rb = ResultBean.fireFail();
- List list = scmWarehouseService.listAllVo(query);
- return rb.success().setData(list);
- }
+ @Override
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody ScmWarehouseQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = scmWarehouseService.listAllVo(query);
+ return rb.success().setData(list);
+ }
- @Override
- @ApiOperation("所有数据列表")
- @GetMapping("/list")
- public ResultBean> list(){
- ResultBean rb = ResultBean.fireFail();
- List list = scmWarehouseService.listVo();
- return rb.success().setData(list);
- }
+ @Override
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
+ public ResultBean> list() {
+ ResultBean rb = ResultBean.fireFail();
+ List list = scmWarehouseService.listVo();
+ return rb.success().setData(list);
+ }
- @Override
- @ApiOperation("新增保存")
- @PostMapping("/save")
- public ResultBean save(@RequestBody ScmWarehouseDto dto){
- ResultBean rb = ResultBean.fireFail();
- scmWarehouseService.saveOrUpdateDto(dto);
- return rb.success();
- }
+ @Override
+ @ApiOperation("新增保存")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody ScmWarehouseDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ scmWarehouseService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
- @Override
- @ApiOperation("修改保存")
- @PostMapping("/update/{sid}")
- public ResultBean update(@RequestBody ScmWarehouseDto dto, @PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- scmWarehouseService.updateBySid(dto.toMap(),sid);
- return rb.success();
- }
+ @Override
+ @ApiOperation("修改保存")
+ @PostMapping("/update/{sid}")
+ public ResultBean update(@RequestBody ScmWarehouseDto dto, @PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ scmWarehouseService.updateBySid(dto.toMap(), sid);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据sid批量删除")
+ @Override
+ @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- scmWarehouseService.delBySids(sids);
- return rb.success();
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ scmWarehouseService.delBySids(sids);
+ return rb.success();
+ }
- @Override
- @ApiOperation("根据SID获取一条记录")
+ @Override
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}")
- public ResultBean fetchBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- ScmWarehouseVo vo = scmWarehouseService.fetchBySidVo(sid);
- return rb.success().setData(vo);
- }
+ public ResultBean fetchBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ScmWarehouseVo vo = scmWarehouseService.fetchBySidVo(sid);
+ return rb.success().setData(vo);
+ }
- @Override
- public ResultBean>> fetchByUseOrgSid(String sid) {
- return scmWarehouseService.fetchByUseOrgSid(sid);
- }
+ @Override
+ public ResultBean>> fetchByUseOrgSid(String sid) {
+ return scmWarehouseService.fetchByUseOrgSid(sid);
+ }
+
+ @Override
+ @ApiOperation("手机端-获取仓库")
+ @GetMapping("/selectWarehouseByUserSid/{userSid}")
+ public ResultBean> selectWarehouseByUserSid(String userSid) {
+ return scmWarehouseService.selectWarehouseByUserSid(userSid);
+ }
}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
index 80454d27d4..7f9ce57032 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseDto;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseQuery;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@@ -37,106 +36,119 @@ import java.util.Map;
*/
@Service
public class ScmWarehouseService extends MybatisBaseService {
- @Autowired
- private SysOrganizationFeign sysOrganizationFeign;
-
- public PagerVo listPage(PagerQuery pq) {
- ScmWarehouseQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPage(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
- public List listAll(ScmWarehouseQuery query) {
- QueryWrapper qw = createQueryWrapper(query);
- return baseMapper.selectList(qw);
- }
- private QueryWrapper createQueryWrapper(ScmWarehouseQuery query) {
- // todo: 这里根据具体业务调整查询条件
- // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
- QueryWrapper qw = new QueryWrapper<>();
-
- if (StringUtils.isNotBlank(query.getUseOrgSid())) {
- qw.eq("useOrgSid", query.getUseOrgSid());
- }
-
- if (StringUtils.isNotBlank(query.getWarehouseCode())) {
- qw.eq("warehouseCode", query.getWarehouseCode());
- }
-
- if (StringUtils.isNotBlank(query.getWarehouseName())) {
- qw.like("warehouseName", query.getWarehouseName());
- }
-
- if (StringUtils.isNotBlank(query.getWarehouseAttribute())) {
- qw.like("warehouseAttribute", query.getWarehouseAttribute());
- }
-
- if (StringUtils.isNotBlank(query.getWarehouseContract())) {
- qw.like("warehouseContract", query.getWarehouseContract());
- }
-
- if (StringUtils.isNotBlank(query.getWarehouseGroup())) {
- qw.eq("warehouseGroup", query.getWarehouseGroup());
- }
- return qw;
- }
-
- public PagerVo listPageVo(PagerQuery pq) {
- ScmWarehouseQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
-
- public List listAllVo(ScmWarehouseQuery query) {
- QueryWrapper qw = createQueryWrapper(query);
- return baseMapper.selectListAllVo(qw);
- }
-
- public List listVo() {
- return baseMapper.selectListVo();
- }
-
- public void saveOrUpdateDto(ScmWarehouseDto dto){
- ScmWarehouse entity = new ScmWarehouse();
- dto.fillEntity(entity);
- this.saveOrUpdate(entity);
- }
-
- public ScmWarehouseVo fetchByIdVo(String id){
- ScmWarehouse entity = this.fetchById(id);
- ScmWarehouseVo vo = new ScmWarehouseVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
- public ScmWarehouseVo fetchBySidVo(String sid){
- ScmWarehouse entity = this.fetchBySid(sid);
- ScmWarehouseVo vo = new ScmWarehouseVo();
- BeanUtil.copyProperties(entity, vo);
- if (StringUtils.isNotBlank(entity.getUseOrgSid())) { //库存组织sid
- List list = Arrays.asList(entity.getUseOrgSid().split(","));
- String[][] s = new String[list.size()][];
- for (int i = 0; i < list.size(); i++) {
- String[] list1 = {};
- //根据使用组织查询上级
- ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i));
- if (resultBean.getSuccess()) {
- list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
- }
- s[i] = list1;
- }
- vo.setUseOrgSid(s);
- }
- return vo;
- }
-
- public ResultBean>> fetchByUseOrgSid(String sid) {
- ResultBean rb = ResultBean.fireFail();
- List> maps = baseMapper.fetchByUseOrgSid(sid);
- return rb.success().setData(maps);
- }
+ @Autowired
+ private SysOrganizationFeign sysOrganizationFeign;
+
+ @Autowired
+ private SysStaffOrgFeign sysStaffOrgFeign;
+
+ public PagerVo listPage(PagerQuery pq) {
+ ScmWarehouseQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPage(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public List listAll(ScmWarehouseQuery query) {
+ QueryWrapper qw = createQueryWrapper(query);
+ return baseMapper.selectList(qw);
+ }
+
+ private QueryWrapper createQueryWrapper(ScmWarehouseQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+
+ if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+ qw.eq("useOrgSid", query.getUseOrgSid());
+ }
+
+ if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+ qw.eq("warehouseCode", query.getWarehouseCode());
+ }
+
+ if (StringUtils.isNotBlank(query.getWarehouseName())) {
+ qw.like("warehouseName", query.getWarehouseName());
+ }
+
+ if (StringUtils.isNotBlank(query.getWarehouseAttribute())) {
+ qw.like("warehouseAttribute", query.getWarehouseAttribute());
+ }
+
+ if (StringUtils.isNotBlank(query.getWarehouseContract())) {
+ qw.like("warehouseContract", query.getWarehouseContract());
+ }
+
+ if (StringUtils.isNotBlank(query.getWarehouseGroup())) {
+ qw.eq("warehouseGroup", query.getWarehouseGroup());
+ }
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ ScmWarehouseQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public List listAllVo(ScmWarehouseQuery query) {
+ QueryWrapper qw = createQueryWrapper(query);
+ return baseMapper.selectListAllVo(qw);
+ }
+
+ public List listVo() {
+ return baseMapper.selectListVo();
+ }
+
+ public void saveOrUpdateDto(ScmWarehouseDto dto) {
+ ScmWarehouse entity = new ScmWarehouse();
+ dto.fillEntity(entity);
+ this.saveOrUpdate(entity);
+ }
+
+ public ScmWarehouseVo fetchByIdVo(String id) {
+ ScmWarehouse entity = this.fetchById(id);
+ ScmWarehouseVo vo = new ScmWarehouseVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public ScmWarehouseVo fetchBySidVo(String sid) {
+ ScmWarehouse entity = this.fetchBySid(sid);
+ ScmWarehouseVo vo = new ScmWarehouseVo();
+ BeanUtil.copyProperties(entity, vo);
+ if (StringUtils.isNotBlank(entity.getUseOrgSid())) { //库存组织sid
+ List list = Arrays.asList(entity.getUseOrgSid().split(","));
+ String[][] s = new String[list.size()][];
+ for (int i = 0; i < list.size(); i++) {
+ String[] list1 = {};
+ //根据使用组织查询上级
+ ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i));
+ if (resultBean.getSuccess()) {
+ list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
+ }
+ s[i] = list1;
+ }
+ vo.setUseOrgSid(s);
+ }
+ return vo;
+ }
+
+ public ResultBean>> fetchByUseOrgSid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ List> maps = baseMapper.fetchByUseOrgSid(sid);
+ return rb.success().setData(maps);
+ }
+
+ public ResultBean> selectWarehouseByUserSid(String userSid) {
+ String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+// String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+ List list = baseMapper.selectWarehouseByUserSid(useOrgSid);
+ return new ResultBean>().success().setData(list);
+ }
}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
index f027928225..ddf65bf766 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
@@ -65,16 +65,21 @@ public interface AppScmVehicleGressionFeign {
public ResultBean saveCarTransferInfo(@RequestBody AppGressionDto dto);
@ApiOperation("手机端-初始化移库申请")
- @PostMapping("/getCarTransferInfo/{sid}/{userSid}")
+ @GetMapping("/getCarTransferInfo/{sid}/{userSid}")
@ResponseBody
public ResultBean getCarTransferInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
@ApiOperation("手机端-车库移库详情")
- @PostMapping("/getCarTransfer/{sid}")
+ @GetMapping("/getCarTransfer/{sid}")
@ResponseBody
public ResultBean getCarTransfer(@PathVariable("sid") String sid);
@ApiOperation("手机端-删除车辆移库申请")
@DeleteMapping("/deleteCarTransfer/{sid}")
public ResultBean deleteCarTransfer(@PathVariable("sid") String sid);
+
+ @ApiOperation("手机端-保存车库移库信息")
+ @PostMapping("/saveCarTransferSiteImage")
+ @ResponseBody
+ public ResultBean saveCarTransferSiteImage(@RequestBody AppCarTransferSiteImageDto dto);
}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java
index 5becc8336b..7b11423c28 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java
@@ -71,4 +71,9 @@ public class AppScmVehicleGressionFeignFallback implements AppScmVehicleGression
public ResultBean deleteCarTransfer(String sid) {
return null;
}
+
+ @Override
+ public ResultBean saveCarTransferSiteImage(AppCarTransferSiteImageDto dto) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java
index 1f24165bd7..78e04200e6 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java
@@ -87,4 +87,9 @@ public class AppScmVehicleGressionRest implements AppScmVehicleGressionFeign {
return appScmVehicleGressionService.deleteCarTransfer(sid);
}
+
+ @Override
+ public ResultBean saveCarTransferSiteImage(AppCarTransferSiteImageDto dto) {
+ return null;
+ }
}