From c4b6ce937606c2456992ee6e63b47d1415a1d578 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 6 Jul 2022 18:11:04 +0800
Subject: [PATCH] 1

---
 .../BaseManufacturerRetwareVehFeign.java      | 12 +++++++++
 .../BaseManufacturerRetwareVehRest.java       | 25 +++++++++++++++++++
 .../anrui/flowable/api/utils/ProcDefEnum.java |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehFeign.java
index 74a9e3cb73..5ae61a673f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretwareveh/BaseManufacturerRetwareVehFeign.java
@@ -26,12 +26,14 @@
 package com.yxt.anrui.base.api.basemanufacturerretwareveh;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -75,4 +77,14 @@ public interface BaseManufacturerRetwareVehFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseManufacturerRetwareVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**
+     * 厂家退库车辆图片上传
+     *
+     * @return
+     */
+    @ApiOperation("厂家退库车辆图片上传")
+    @ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class)
+    @PostMapping("/pictureUpload")
+    public ResultBean pictureUpload(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehRest.java
index 3b880e85d9..10a682a17d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehRest.java
@@ -25,7 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.basemanufacturerretwareveh;
 
+import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
@@ -40,6 +45,7 @@ import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetware
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehFeign;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Project: anrui-base(厂家退库) <br/>
@@ -61,6 +67,10 @@ public class BaseManufacturerRetwareVehRest implements BaseManufacturerRetwareVe
 
 	@Autowired
 	private BaseManufacturerRetwareVehService baseManufacturerRetwareVehService;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private CommonAppendixService commonAppendixService;
 
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
@@ -97,4 +107,19 @@ public class BaseManufacturerRetwareVehRest implements BaseManufacturerRetwareVe
 		BaseManufacturerRetwareVehDetailsVo vo = baseManufacturerRetwareVehService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean pictureUpload(String sid, MultipartFile file) {
+		ResultBean rb = ResultBean.fireFail();
+		if (file == null || file.isEmpty()) {
+			return rb.setMsg("文件为空");
+		}
+		rb = fileUploadComponent.uploadFile(file);
+		FileUploadResult data = (FileUploadResult) rb.getData();
+		CommonAppendix commonAppendix = new CommonAppendix();
+		commonAppendix.setLinkSid(sid);
+		commonAppendix.setFilePath(data.getFilePath());
+		commonAppendixService.save(commonAppendix);
+		return rb.success().setMsg("上传成功");
+	}
 }
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 3bbf338ce0..8dbc81784f 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -23,7 +23,7 @@ public enum ProcDefEnum {
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:2:285004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
     BASEINTERNALPURCHASE("内购申请", "process_i6luw5xq:1:267504"),
-    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:1:270004"), //TODO
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:4:300008"), //TODO
     FINCOSTAPPLY("费用申请",""),
     FINPAYAPPLY("付款申请","")
     ;