移动端采购退库详情添加车型页面信息

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java

@@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "合同表")
 @FeignClient(
-        contextId = "anrui-base-CommonContract",
-        name = "anrui-base",
+        contextId = "anrui-terminal-CommonContract",
+        name = "anrui-terminal",
         path = "/autoservice/v1/contract",
         fallback = CommonContractFeignFallback.class)
 public interface AppCommonContractFeign {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/ScmReturnVersionVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.supplychain.purchaseReturn;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/31 9:29
+ * @Description
+ */
+@Data
+public class ScmReturnVersionVo implements Vo {
+    private static final long serialVersionUID = -2293970651117088165L;
+
+    @ApiModelProperty("版本编码")
+    private Integer moduleVersion;
+
+    @ApiModelProperty("apk下载地址")
+    private String path;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
+
+    private String json;
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailssVo.java

@@ -34,4 +34,7 @@ public class VehicleReturnDetailssVo implements Vo {
     @JsonProperty("reason")
     private String costRemarks;
 
+
+    private ScmReturnVersionVo carDetailPage;
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java

@@ -2,9 +2,11 @@ package com.yxt.anrui.terminal.biz.supplychain.purchaseReturn;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -22,7 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -41,6 +45,8 @@ public class AppScmVehicleReturnService {
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private AppSubsetVersionFeign appSubsetVersionFeign;
 
     /**
      * 获取采购退库详情
@@ -55,6 +61,8 @@ public class AppScmVehicleReturnService {
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
+        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.selectLast();
+        AppSubVersionVo appSubVersionVo = voResultBean.getData();
         ScmVehicleReturnDetailsVo scmVehicleReturnDetailsVo = resultBean.getData();
         BeanUtil.copyProperties(scmVehicleReturnDetailsVo, vo);
         List<VehicleReturnDetailssVo> records = vo.getVoList();
@@ -63,6 +71,16 @@ public class AppScmVehicleReturnService {
             BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, vo.getCreateOrgSid()).getData();
             record.setModelSid(data.getModelSid());
             record.setConfigSid(data.getModelConfigSid());
+            ScmReturnVersionVo appVehicleVersionVo = new ScmReturnVersionVo();
+            String modelSid = data.getModelSid();
+            String configSid = data.getModelConfigSid();
+            Map<String, Object> map = new HashMap<>();
+            map.put("modelSid", modelSid);
+            map.put("configSid", configSid);
+            map.put("selectType", 0);
+            appSubVersionVo.setJson(JSONObject.toJSONString(map));
+            BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
+            record.setCarDetailPage(appVehicleVersionVo);
         }
         return rb.success().setData(vo);
     }