From 4aa8851e73ebb6eee454cd2ae8aadb743dcce267 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 6 Apr 2022 14:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=85=A5=E5=BA=93=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scmvehicleinbound/ScmVehicleInboundDetailsVo.java    | 8 ++++++++
 .../biz/scmvehicleinbound/ScmVehicleInboundMapper.java   | 2 +-
 .../biz/scmvehicleinbound/ScmVehicleInboundMapper.xml    | 2 +-
 .../biz/scmvehicleinbound/ScmVehicleInboundService.java  | 9 ++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinbound/ScmVehicleInboundDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinbound/ScmVehicleInboundDetailsVo.java
index 4eed47991e..0d3a38783b 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinbound/ScmVehicleInboundDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinbound/ScmVehicleInboundDetailsVo.java
@@ -14,5 +14,13 @@ public class ScmVehicleInboundDetailsVo implements Vo {
     private static final long serialVersionUID = 6836808201591951508L;
     @ApiModelProperty(value = "入库日期")
     private String inboundDate;
+    @ApiModelProperty(value = "入库人")
     private String inbound;
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty(value = "库位")
+    private String warehouseCode;
+    @ApiModelProperty(value = "附件")
+    private String inboundPhoto;
+
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.java
index 7bfa599fc2..6648e62f98 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.java
@@ -33,5 +33,5 @@ public interface ScmVehicleInboundMapper extends BaseMapper<ScmVehicleInbound> {
      * @param sid 车辆入库管理sid
      * @return
      */
-    ScmVehicleInboundDetailsVo details(@Param("sid") String sid, @Param("path") String path);
+    ScmVehicleInboundDetailsVo details(@Param("sid") String sid);
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml
index c49fa772b9..26eaf5c95e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml
@@ -22,7 +22,7 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.scm.api.scmvehicleinbound.ScmVehicleInboundDetailsVo">
-        select si.inboundDate, si.inbound, si.vinNo, si.warehouseCode, concat(#{path}, si.inboundPhoto)
+        select si.inboundDate, si.inbound, si.vinNo, si.warehouseCode, si.inboundPhoto
         from scm_vehicle_inbound si
         where si.sid = #{sid}
     </select>
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundService.java
index 3ad6a1946d..a738fc261f 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundService.java
@@ -87,7 +87,14 @@ public class ScmVehicleInboundService extends MybatisBaseService<ScmVehicleInbou
             return rb.setMsg("该数据不存在");
         }
         String path = fileUploadComponent.getUrlPrefix();
-        ScmVehicleInboundDetailsVo vo = baseMapper.details(sid, path);
+        ScmVehicleInboundDetailsVo vo = baseMapper.details(sid);
+        if (vo != null) {
+            if (StringUtils.isNotBlank(vo.getInboundPhoto())) {
+                if (!vo.getInboundPhoto().contains(path)) {
+                    vo.setInboundPhoto(path + vo.getInboundPhoto());
+                }
+            }
+        }
         return rb.success().setData(vo);
     }