供应链问题修复

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java

@@ -131,6 +131,9 @@ public class BaseModelConfig extends BaseEntity {
     @ApiModelProperty("货箱（重汽、欧曼）")
     private String packingCase;
 
+    @ApiModelProperty("货箱key（重汽、欧曼）")
+    private String packingCaseKey;
+
   /*  @ApiModelProperty("上装装置（欧曼）")
     private String installingDevice;*/
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java

@@ -130,6 +130,9 @@ public class BaseModelConfigDto implements Dto {
     @ApiModelProperty("货箱（重汽、欧曼）")
     private String packingCase;
 
+    @ApiModelProperty("货箱key（重汽、欧曼）")
+    private String packingCaseKey;
+
   /*  @ApiModelProperty("上装装置（欧曼）")
     private String installingDevice;*/
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java

@@ -95,7 +95,10 @@ public class BaseModelConfigVo implements Vo {
     private String suspension;
     @ApiModelProperty("货箱（重汽、欧曼）")
     private String packingCase;
-  /*  @ApiModelProperty("上装装置（欧曼）")
+    @ApiModelProperty("货箱key（重汽、欧曼）")
+    private String packingCaseKey;
+
+    /*  @ApiModelProperty("上装装置（欧曼）")
     private String installingDevice;*/
     @ApiModelProperty("座椅key")
     private String seatKey;
@@ -125,6 +128,12 @@ public class BaseModelConfigVo implements Vo {
     private String configName;
     @ApiModelProperty(value = "备注")
     private String remarks;
+    @ApiModelProperty(value = "关联状态（1已关联，0未关联）")
+    private Integer isRelationState;
+    @ApiModelProperty(value = "使用状态（1已使用，0未使用）")
+    private Integer isUseState;
+    @ApiModelProperty(value = "销售指导价")
+    private String guidedPrice;
 /*    @ApiModelProperty(value = "车型名称")
     private String modelName;
     @ApiModelProperty(value = "发动机型号")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java

@@ -7,6 +7,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author dimengzhe
  * @date 2021/9/29 8:53
@@ -63,10 +65,6 @@ public class BaseVehicleModelDetailsVo implements Vo {
     private String engineType;
     @ApiModelProperty(value = "发动机型号value")
     private String engineTypeValue;
-    @ApiModelProperty("系列key")
-    private String series;
-    @ApiModelProperty("系列value")
-    private String seriesValue;
 /*    @ApiModelProperty(value = "悬架key")
     private String suspension;
     @ApiModelProperty(value = "悬架value值")
@@ -109,9 +107,15 @@ public class BaseVehicleModelDetailsVo implements Vo {
     @ApiModelProperty(value = "内部编码（欧曼特有）")
     private String insideCode;
 
-    @ApiModelProperty(value = "系别（欧曼特有）")
+    @ApiModelProperty(value = "车型编码")
+    private String vehicleTypeCode;
+
+    @ApiModelProperty(value = "系别key（欧曼特有）")
     private String department;
 
+    @ApiModelProperty(value = "系别value（欧曼特有）")
+    private String departmentValue;
+
     /*@ApiModelProperty(value = "是否常用车型")
     private Integer isCommonModel;*/
 
@@ -119,5 +123,5 @@ public class BaseVehicleModelDetailsVo implements Vo {
     private Integer isDel;
 
     @ApiModelProperty("简述配置信息")
-    private BaseModelConfigVo baseModelConfigVo;
+    private List<BaseModelConfigVo> baseModelConfigVo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -74,7 +74,7 @@ public interface BaseVehicleModelFeign {
     @ApiOperation("车型图片上传")
     @ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class)
     @PostMapping("/pictureUpload")
-    public ResultBean pictureUpload (@RequestParam("modelSid") String modelSid, @RequestParam(value = "file") MultipartFile file);
+    public ResultBean pictureUpload(@RequestParam("modelSid") String modelSid, @RequestParam(value = "file") MultipartFile file);
 
     /**
      * 删除、批量删除
@@ -108,7 +108,6 @@ public interface BaseVehicleModelFeign {
     public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid);
 
 
-
     /**
      * 车型列表导出
      *
@@ -194,4 +193,14 @@ public interface BaseVehicleModelFeign {
     @ApiOperation("新增意向车型选择车型查询车型列表")
     @PostMapping("/listPageByVehmodel")
     public ResultBean<PagerVo<VehModelVo>> listPageByVehmodel(@RequestBody PagerQuery<VehModelQuery> pq);
+
+    /**
+     * 根据常用配置sid查询关联车型
+     *
+     * @return
+     */
+    @ApiOperation("根据常用配置sid查询关联车型")
+    @PostMapping("/selectVehModelByConfigSid")
+    public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -108,6 +108,12 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(PagerQuery<BaseVehicleModelQuery> pagerQuery) {
+        return null;
+    }
+
+
     /*@Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java

@@ -23,6 +23,10 @@ import lombok.Data;
 @Data
 public class BaseVehicleModelQuery implements Query {
 
+    @ApiModelProperty(value = "常用配置sid")
+    private String configSid;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
     @ApiModelProperty(value = "品牌sid")
     private String carBrand;
     @ApiModelProperty(value = "功能key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@@ -28,6 +28,8 @@ public class BaseVehicleModelVo implements Vo {
 
     @ApiModelProperty(value = "车型sid")
     private String sid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
     @ApiModelProperty(value = "品牌名称")
     private String brandName;
     @ApiModelProperty(value = "车辆类型(牵引车、挂车等)")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -34,6 +34,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: anrui-base(车型信息) <br/>
  * File: BaseVehmodelConfigFeign.java <br/>
@@ -69,7 +73,7 @@ public interface BaseVehmodelConfigFeign {
 
     @ApiOperation("车型与常用配置解除关联关系")
     @DeleteMapping("/checkRelieve")
-    public ResultBean checkRelieve(@RequestParam("modelSid") String modelSid, @RequestParam("configurationItemsSid") String configurationItemsSid);
+    public ResultBean checkRelieve(@RequestBody List<Map<String, String>> maps);
 
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@@ -31,6 +31,9 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: anrui-base(车型信息) <br/>
  * File: BaseVehmodelConfigFeignFallback.java <br/>
@@ -64,7 +67,7 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
     }
 
     @Override
-    public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
+    public ResultBean checkRelieve(List<Map<String, String>> maps) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -44,12 +46,26 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     private BaseModelConfigService baseModelConfigService;
     @Autowired
     private BaseVehicleModelService baseVehicleModelService;
+    @Autowired
+    private BaseVehmodelConfigService baseVehmodelConfigService;
 
 
     @Override
     public ResultBean<PagerVo<BaseModelConfigVo>> pagerList(PagerQuery<BaseModelConfigQuery> pagerQuery) {
         ResultBean<PagerVo<BaseModelConfigVo>> rb = ResultBean.fireFail();
         IPage<BaseModelConfigVo> page = baseModelConfigService.pagerList(pagerQuery);
+        List<BaseModelConfigVo> records = page.getRecords();
+        for (BaseModelConfigVo record : records) {
+            String sid = record.getSid();
+            List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(sid);
+            if (baseVehmodelConfigVos.size() > 0){
+                record.setIsRelationState(1);
+                record.setIsUseState(1);
+            }else {
+                record.setIsRelationState(0);
+                record.setIsUseState(0);
+            }
+        }
         PagerVo<BaseModelConfigVo> pv = new PagerVo<>();
         PagerVo<BaseModelConfigVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -147,4 +147,5 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
 
     IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page,@Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -159,17 +159,13 @@
     <select id="getPcChooseListByModelSid"
             resultType="com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo">
         SELECT bvm.sid,
-               bov.`VINNo`,
-               bov.`vehicleCode`,
                bvm.`gearboxTypeValue`,
                bvm.`emissionStandardValue`,
                bvm.`driveFormValue`,
                bvm.`powerValue`,
-               bov.`vehicleColor`,
                bmc.`specification`,
                bmc.`fuelTank`
         FROM anrui_base.base_vehicle_model bvm
-                     LEFT JOIN anrui_buscenter.`bus_order_vehicle` bov ON bvm.sid = bov.`vehicleSid`
                      LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
                      LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvm.sid = #{vehicleSid} LIMIT 1
@@ -283,6 +279,9 @@
         bvm.specifications,
         <!--内部编码（欧曼特有）-->
         bvm.insideCode,
+        <!--系列-->
+        bvm.productLine,
+        bvm.productLineValue,
         <!--系别（欧曼特有）-->
         bvm.department,
         bvm.departmentValue,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -250,6 +250,15 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
+        ResultBean<PagerVo<BaseVehicleModelVo>> rb = ResultBean.fireFail();
+        IPage<BaseVehicleModelVo> page = baseVehicleModelService.selectVehModelByConfigSid(pagerQuery);
+        PagerVo<BaseVehicleModelVo> pv = new PagerVo<>();
+        PagerVo<BaseVehicleModelVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
+
 
 //    @Override
 //    public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -3,6 +3,9 @@ package com.yxt.anrui.base.biz.basevehiclemodel;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo;
 import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo;
 import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo;
@@ -12,9 +15,12 @@ import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
+import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand;
 import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@@ -34,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -57,13 +64,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
-    private BaseModelSzconfigService baseModelSzconfigService;
-    @Autowired
-    private BaseTrailerService baseTrailerService;
-    @Autowired
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
+    @Autowired
+    private BaseVehmodelConfigService baseVehmodelConfigService;
+    @Autowired
+    private BaseModelConfigService baseModelConfigService;
 
     /**
      * 车型信息分页列表
@@ -87,6 +94,12 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         QueryWrapper<BaseVehicleModelVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
             qw.eq("bvm.isDelete", "0");
+            if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
+                qw.eq("bvm.sid", pagerQuery.getModelSid());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
+                qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
+            }
             if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
                 qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
             }
@@ -154,10 +167,20 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             }
             baseVehicleModelDetailsVo.setUseOrg(s);
         }
-        PcChooseBaseModelConfigVo pcChooseBaseModelConfigVo = this.getPcChooseListByModelSid(sid);
+        List<BaseModelConfigVo> baseModelConfigVos = new ArrayList<>();
-        BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
+
-        BeanUtil.copyProperties(pcChooseBaseModelConfigVo, baseModelConfigVo);
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid);
-        baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVo != null ? baseModelConfigVo : new BaseModelConfigVo());
+        if (baseVehmodelConfigVos.size() > 0){
+            for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
+                BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
+                String configurationItemsSid = baseVehmodelConfigVo.getConfigurationItemsSid();
+                BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(configurationItemsSid);
+                BeanUtil.copyProperties(baseModelConfig, baseModelConfigVo);
+                baseModelConfigVo.setGuidedPrice(baseVehmodelConfigVo.getGuidedPrice());
+                baseModelConfigVos.add(baseModelConfigVo);
+            }
+            baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVos);
+        }
         return baseVehicleModelDetailsVo;
     }
 
@@ -549,4 +572,30 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         return qw;
     }
+
+    public IPage<BaseVehicleModelVo> selectVehModelByConfigSid(PagerQuery<BaseVehicleModelQuery> pagerQuery) {
+        List<BaseVehicleModelVo> baseVehicleModelVos = new ArrayList<>();
+        IPage<BaseVehicleModelVo> baseVehicleModelVo  = new Page<>();
+        BaseVehicleModelQuery params = pagerQuery.getParams();
+        IPage<BaseVehicleModelQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(params);
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(params.getConfigSid());
+        for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
+            String modelSid = baseVehmodelConfigVo.getModelSid();
+            params.setModelSid(modelSid);
+            IPage<BaseVehicleModelVo> baseVehicleModelVoIPage = baseMapper.pagerList(page, qw);
+            List<BaseVehicleModelVo> records = baseVehicleModelVoIPage.getRecords();
+            for (BaseVehicleModelVo record : records) {
+                record.setConfigSid(params.getConfigSid());
+                baseVehicleModelVos.add(record);
+            }
+            baseVehicleModelVo.setPages(baseVehicleModelVoIPage.getPages());
+            baseVehicleModelVo.setCurrent(baseVehicleModelVoIPage.getCurrent());
+            baseVehicleModelVo.setSize(baseVehicleModelVoIPage.getSize());
+            baseVehicleModelVo.setTotal(baseVehicleModelVoIPage.getTotal());
+            baseVehicleModelVo.setRecords(baseVehicleModelVos);
+        }
+
+        return baseVehicleModelVo;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -120,4 +120,8 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid);
+
+    List<BaseVehmodelConfigVo> getListByConfigSid(String sid);
+
+    List<BaseVehmodelConfigVo> getVehModByModelSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -251,4 +251,12 @@
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid LIKE concat('%', #{orgSid}, '%')
     </select>
+
+    <select id="getListByConfigSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
+        SELECT * FROM base_vehmodel_config WHERE configurationItemsSid = #{sid}
+    </select>
+
+    <select id="getVehModByModelSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
+        SELECT * FROM base_vehmodel_config WHERE modelSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -37,6 +37,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Project: anrui-base(车型信息) <br/>
  * File: BaseVehmodelConfigFeignFallback.java <br/>
@@ -84,8 +88,8 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
     }
 
     @Override
-    public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
+    public ResultBean checkRelieve(List<Map<String, String>> maps) {
-        return baseVehmodelConfigService.checkRelieve(modelSid, configurationItemsSid);
+        return baseVehmodelConfigService.checkRelieve(maps);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -46,7 +46,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -415,14 +417,18 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return rb.success().setMsg("关联成功");
     }
 
-    public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
+    public ResultBean checkRelieve(List<Map<String, String>> maps) {
         ResultBean rb = ResultBean.fireFail();
-        BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
+        for (Map<String, String> map : maps) {
-        if (vo == null) {
+            String modelSid = map.get("modelSid");
-            return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
+            String configurationItemsSid = map.get("configurationItemsSid");
+            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
+            if (vo == null) {
+                return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
+            }
+            String sid = vo.getSid();
+            deleteBySid(sid);
         }
-        String sid = vo.getSid();
-        deleteBySid(sid);
         return rb.success().setMsg("解除成功");
     }
 
@@ -510,4 +516,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         vo.setMoreConfig(appModelConfigListVo.getOtherConfig());
         return vo;
     }
+
+    public List<BaseVehmodelConfigVo> getListByConfigSid(String sid) {
+        return baseMapper.getListByConfigSid(sid);
+    }
+
+    public List<BaseVehmodelConfigVo> getVehModByModelSid(String sid) {
+        return baseMapper.getVehModByModelSid(sid);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java

@@ -17,7 +17,8 @@ public class ScmMaterialDetailsVo implements Vo {
     private static final long serialVersionUID = -501888339245178616L;
 
     @ApiModelProperty("使用组织sid全路径")
-    private String[][] useOrgSid;
+    private String useOrgSid;
+
     @ApiModelProperty(value = "使用组织名称")
     private String useOrg;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java

@@ -74,7 +74,7 @@ public class ScmRealTimeInventoryVo implements Vo {
     private String availableQuantity; // 可用量（主单位）
 
 	@ApiModelProperty("库存组织sid")
-	private String[][] stockOrgNameSid; // 库存组织sid
+	private String stockOrgNameSid; // 库存组织sid
 
 	@ApiModelProperty("库存组织")
     private String stockOrgName; // 库存组织

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java

@@ -78,7 +78,7 @@ public class ScmReturnVo implements Vo {
     private String returnCustomer; // 退货客户
 
     @ApiModelProperty("库存组织sid")
-    private String[][] stockOrgSid; // 库存组织sid
+    private String stockOrgSid; // 库存组织sid
 
     @ApiModelProperty("库存组织")
     private String stockOrgName; // 库存组织
@@ -117,7 +117,7 @@ public class ScmReturnVo implements Vo {
     private String warehouseKeeperName; // 仓管员
 
     @ApiModelProperty("销售组织sid")
-    private String[][] salesOrgSid; // 销售组织sid
+    private String salesOrgSid; // 销售组织sid
 
     @ApiModelProperty("销售组织")
     private String salesOrgName; // 销售组织

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml

@@ -53,6 +53,7 @@
         SELECT sid,
         <!--使用组织名称-->
         useOrg,
+        useOrgSid,
         createOrg,
         createOrgSid,
         remarks,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java

@@ -165,23 +165,7 @@ public class ScmMaterialService extends MybatisBaseService<ScmMaterialMapper, Sc
      * @return
      */
     public ScmMaterialDetailsVo selectBySid(String sid) {
-        ScmMaterial scmMaterial = fetchBySid(sid);
         ScmMaterialDetailsVo scmMaterialDetailsVo = baseMapper.selectBySid(sid);
-        if (StringUtils.isNotBlank(scmMaterial.getUseOrgSid())) {//使用组织sid
-            //将string类型转换为List类型
-            List<String> list = Arrays.asList(scmMaterial.getUseOrgSid().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            scmMaterialDetailsVo.setUseOrgSid(s);
-        }
         return scmMaterialDetailsVo;
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java

@@ -182,7 +182,7 @@ public class ScmRealTimeInventoryService extends MybatisBaseService<ScmRealTimeI
 		ScmRealTimeInventory entity = this.fetchBySid(sid);
 		ScmRealTimeInventoryVo vo = new ScmRealTimeInventoryVo();
 		BeanUtil.copyProperties(entity, vo);
-		if (StringUtils.isNotBlank(entity.getStockOrgNameSid())) { //领料部门sid
+		/*if (StringUtils.isNotBlank(entity.getStockOrgNameSid())) { //领料部门sid
 			List<String> list = Arrays.asList(entity.getStockOrgNameSid().split(","));
 			String[][] s = new String[list.size()][];
 			for (int i = 0; i < list.size(); i++) {
@@ -195,7 +195,7 @@ public class ScmRealTimeInventoryService extends MybatisBaseService<ScmRealTimeI
 				s[i] = list1;
 			}
 			vo.setStockOrgNameSid(s);
-		}
+		}*/
 		return vo;
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmreturn/ScmReturnService.java

@@ -204,7 +204,7 @@ public class ScmReturnService extends MybatisBaseService<ScmReturnMapper, ScmRet
         entity.setMakeListName(scmReturnSaveEchoVo.getStaffName());
         entity.setCreateTime(scmReturnSaveEchoVo.getCreateTime());
         boolean save = scmReturnService.save(entity);
-        if (save) {
+            if (save) {
             //新增明细信息
             List<ScmReturnDetailDto> list = dto.getList();
             for (ScmReturnDetailDto scmReturnDetailDto : list) {
@@ -352,20 +352,6 @@ public class ScmReturnService extends MybatisBaseService<ScmReturnMapper, ScmRet
             List<ScmReturnDetailVo> list = scmReturnDetailService.details(sid);
             scmReturnVo.setList(list);
         }
-        if (StringUtils.isNotBlank(scmReturn.getStockOrgSid())) { //库存组织sid
-            List<String> list = Arrays.asList(scmReturn.getStockOrgSid().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            scmReturnVo.setStockOrgSid(s);
-        }
         if (StringUtils.isNotBlank(scmReturn.getStockDepSid())) { //库存部门sid
             List<String> list = Arrays.asList(scmReturn.getStockDepSid().split(","));
             String[][] s = new String[list.size()][];
@@ -380,20 +366,6 @@ public class ScmReturnService extends MybatisBaseService<ScmReturnMapper, ScmRet
             }
             scmReturnVo.setStockDepSid(s);
         }
-        if (StringUtils.isNotBlank(scmReturn.getSalesOrgSid())) { //销售组织sid
-            List<String> list = Arrays.asList(scmReturn.getSalesOrgSid().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            scmReturnVo.setSalesOrgSid(s);
-        }
         return rb.success().setData(scmReturnVo);
     }