Merge remote-tracking branch 'origin/master'

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,6 +95,9 @@ public class BaseModelConfigVo implements Vo {
     private String suspension;
     @ApiModelProperty("货箱（重汽、欧曼）")
     private String packingCase;
+    @ApiModelProperty("货箱key（重汽、欧曼）")
+    private String packingCaseKey;
+
     /*  @ApiModelProperty("上装装置（欧曼）")
     private String installingDevice;*/
     @ApiModelProperty("座椅key")
@@ -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

@@ -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-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java

@@ -48,63 +48,67 @@ import lombok.Data;
 @Data
 public class BusVehicleOrderVo implements Vo {
 
+    private static final long serialVersionUID = 5581370535272361633L;
     @ApiModelProperty("采购订单sid")
-    private String sid; // 采购订单sid
+    private String sid;
     
 	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
+    private String createOrgSid;
 
     @ApiModelProperty("车型")
     private String modelName;
     
 	@ApiModelProperty("订单编号")
-    private String orderNo; // 订单编号
+    private String orderNo;
 
     @ApiModelProperty("订单类型key")
-    private String orderTypeKey; // 订单类型key
+    private String orderTypeKey;
 
     @ApiModelProperty("订单类型")
-    private String orderType; // 订单类型
+    private String orderType;
     
 	@ApiModelProperty("订单日期")
-    private String orderDate; // 订单日期
+    private String orderDate;
     
 	@ApiModelProperty("排产/采购申请sid")
-    private String purchaseRequisitionSid; // 排产/采购申请sid
+    private String purchaseRequisitionSid;
     
 	@ApiModelProperty("排产/采购申请中车型表sid")
-    private String purchaseApplyMediumModelSid; // 排产/采购申请中车型表sid
+    private String purchaseApplyMediumModelSid;
     
 	@ApiModelProperty("台数")
-    private String platformNo; // 台数
+    private String platformNo;
     
 	@ApiModelProperty("上装价格")
-    private String coatPrice; // 上装价格
+    private String coatPrice;
     
 	@ApiModelProperty("入库价格")
-    private String treasuryPrice; // 入库价格
+    private String treasuryPrice;
     
 	@ApiModelProperty("运费")
-    private String freight; // 运费
+    private String freight;
     
 	@ApiModelProperty("销售指导价")
-    private String salesGuidePrice; // 销售指导价
+    private String salesGuidePrice;
     
 	@ApiModelProperty("预计上线日期")
-    private String expectLaunchDate; // 预计上线日期
+    private String expectLaunchDate;
 
     @ApiModelProperty("上线日期")
-    private String launchDate; // 上线日期
+    private String launchDate;
 
     @ApiModelProperty("下线日期")
-    private String offlineDate; // 下线日期
+    private String offlineDate;
 
     @ApiModelProperty("排产申请编号")
     private String applicationCode;
     
 	@ApiModelProperty("订单状态")
-    private String orderStatus; // 订单状态
+    private String orderStatus;
 
     @ApiModelProperty("备注")
-    private String remarks; // 备注
+    private String remarks;
+
+    @ApiModelProperty(value = "锁定台数")
+    private String lockingNum;
 }

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<>();
+
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid);
+        if (baseVehmodelConfigVos.size() > 0){
+            for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
                 BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
-        BeanUtil.copyProperties(pcChooseBaseModelConfigVo, baseModelConfigVo);
-        baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVo != null ? 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) {
-        return baseVehmodelConfigService.checkRelieve(modelSid, configurationItemsSid);
+    public ResultBean checkRelieve(List<Map<String, String>> maps) {
+        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();
+        for (Map<String, String> map : maps) {
+            String modelSid = map.get("modelSid");
+            String configurationItemsSid = map.get("configurationItemsSid");
             BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
             if (vo == null) {
                 return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
             }
             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-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -180,7 +180,8 @@
                bvo.orderStatus,
                bvm.modelName,
                bva.applicationCode,
-               bvo.remarks
+               bvo.remarks,
+               bvo.lockingNum
         FROM bus_vehicle_order bvo
                  LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
                  LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -92,6 +92,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
     public ResultBean<BusVehicleOrderVo> fetchBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(sid);
+        if(vo == null){
+            return rb.setData(new BusVehicleOrderVo());
+        }
         return rb.success().setData(vo);
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderInitModelInfoVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderInitModelInfoVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppBusSaleOrderInitModelInfoVo implements Vo {
 
+    private static final long serialVersionUID = 342793087650993718L;
     @ApiModelProperty("")
     private AppOrderInfo orderInfo;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderStateVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSaleOrderStateVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,6 +6,7 @@ import lombok.Data;
 
 @Data
 public class AppBusSaleOrderStateVo implements Vo {
+    private static final long serialVersionUID = -7047192316492033608L;
 
     //0 未完善 1 已完善
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderAllDto.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderAllDto.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppBusSalesOrderAllDto implements Dto {
 
+    private static final long serialVersionUID = -1063289603093410032L;
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("手机号")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderBillInfoVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderBillInfoVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppBusSalesOrderBillInfoVo implements Vo {
 
+    private static final long serialVersionUID = 4786720071719311565L;
     @ApiModelProperty("客户名称")
     private String customerName;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderQuery.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderQuery.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 
 import com.yxt.common.core.query.Query;
@@ -49,6 +49,7 @@ import lombok.Data;
 public class AppBusSalesOrderQuery implements Query {
 
 
+    private static final long serialVersionUID = -3569921757656322272L;
     @ApiModelProperty("用户sid")
     private String userSid;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderVo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java

@@ -23,19 +23,15 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderVo.java <br/>
@@ -54,31 +50,72 @@ import java.util.List;
 public class AppBusSalesOrderVo implements Vo {
 
     private static final long serialVersionUID = -5570433499942792774L;
-
+    /**
+     * 销售订单sid
+     */
     @ApiModelProperty("销售订单sid")
+    @JsonProperty("customerImage")
     private String saleOrderSid;
+    /**
+     * 销售订单编号
+     */
     @ApiModelProperty("销售订单编号")
+    @JsonProperty("saleOrderId")
     private String saleOrderId;
+    /**
+     * 客户类型
+     */
     @ApiModelProperty("客户类型")
     private String customerType;
+    /**
+     * 客户sid
+     */
     @ApiModelProperty("客户sid")
     private String customerSid;
+    /**
+     * 客户名称
+     */
     @ApiModelProperty("客户名称")
     private String customerName;
+    /**
+     * 客户头像
+     */
     @ApiModelProperty("客户头像")
+    @JsonProperty("customerImage")
     private String customerImage;
+    /**
+     * 手机号
+     */
     @ApiModelProperty("手机号")
     private String mobile;
+    /**
+     * 购车方式
+     */
     @ApiModelProperty("购车方式")
     private String carPurchaseType;
+    /**
+     * 购车方式key
+     */
     @ApiModelProperty("购车方式key")
     private String carPurchaseKey;
+    /**
+     * 销售订单状态
+     */
     @ApiModelProperty("销售订单状态")
     private String saleOrderState;
+    /**
+     * 创建日期
+     */
     @ApiModelProperty("创建日期")
     private String createdDate;
+    /**
+     * 是否保险
+     */
     @ApiModelProperty("是否保险")
     private String insuranceInfo;
+    /**
+     * 订金
+     */
     @ApiModelProperty("订金")
     private String deposit;
     @ApiModelProperty("是否显示修改订单按钮")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppCarInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppCarInfo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +9,7 @@ import java.util.List;
 @Data
 public class AppCarInfo implements Vo {
 
+    private static final long serialVersionUID = 4029925477789404414L;
     @ApiModelProperty("销售订单-车型确认-现车")
     private List<AppNowCar> nowCar;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppModelInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCar.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCar.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppNowCar implements Vo {
 
+    private static final long serialVersionUID = -6377764723851635242L;
     @ApiModelProperty("车架号")
     private String vin;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCarList.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarList.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppNowCarList implements Vo {
 
+    private static final long serialVersionUID = 2686499164252521275L;
     @ApiModelProperty("车架号")
     private String vin;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppOrderInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +9,7 @@ import java.util.List;
 @Data
 public class AppOrderInfo implements Vo {
 
+    private static final long serialVersionUID = 360634636966708686L;
     @ApiModelProperty("提示")
     private String notice;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCar.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCar.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppReadyCar implements Vo {
 
+    private static final long serialVersionUID = -6797740135964430331L;
     @ApiModelProperty("排产订单编号")
     private String orderId;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCarList.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarList.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.buscenter.api.bussalesorder;
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppReadyCarList implements Vo {
 
+    private static final long serialVersionUID = 5257855685147744221L;
     @ApiModelProperty("排产订单编号")
     private String orderId;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDto.java

@@ -56,8 +56,6 @@ public class BusSalesVehicleOrderDto implements Dto {
     private String linkNo;
     @ApiModelProperty("采购订单日期")
     private String linkText;
-    @ApiModelProperty("可使用台数")
-    private Integer useNum;
     @ApiModelProperty("本次使用台数")
     private Integer usingNum;
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -31,6 +31,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -36,7 +36,7 @@
         where sid = #{businessSid}
     </update>
     <!--app查询销售订单列表-->
-    <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo">
+    <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo">
         SELECT bo.sid                                 AS saleOrderSid,
                bo.billNo                              AS saleOrderId,
                bo.customerClass                       AS customerType,
@@ -60,7 +60,7 @@
         </where>
     </select>
     <!--根据销售订单sid查询车型信息-->
-    <select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppModelInfo">
+    <select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfo">
         SELECT modelName  AS model,
                brandName  AS brand,
                guildPrice AS price
@@ -68,7 +68,7 @@
         where bm.salesOrderSid = #{saleOrderSid}
     </select>
     <!--App初始化销售订单单据信息-->
-    <select id="getBillInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderBillInfoVo">
+    <select id="getBillInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo">
         SELECT customerSid,
                customerName,
                mobile            AS customerMobile,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bussalesorder;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -41,9 +41,11 @@ import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
@@ -80,7 +82,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
-import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -217,10 +218,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         PagerVo<BusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
         List<BusSalesOrderVo> list = p.getRecords();
         for (BusSalesOrderVo vo : list) {
-            ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
-            if (resultBean.getSuccess() && resultBean.getData() != null) {
-                SysFormStateVo formState = resultBean.getData();
-                vo.setNodeState(formState.getNodeState());
+            if (StringUtils.isNotBlank(vo.getNodeState())) {
+                vo.setNodeState(vo.getNodeState());
             } else {
                 vo.setNodeState("待提交");
             }
@@ -352,9 +351,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (busSalesVehicleOrderList.size() > 0) {
                 for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
                     if (busSalesVehicleOrderList.get(i) != null) {
-                        if(busSalesVehicleOrderList.get(i).getUsingNum()>busSalesVehicleOrderList.get(i).getUseNum()){
+                        //根据采购订单sid查询采购订单的可使用台数
+                        ResultBean<BusVehicleOrderVo> busVehicleOrderVoResultBean = busVehicleOrderFeign.fetchBySid(busSalesVehicleOrderList.get(i).getLinkSid());
+                        if (busVehicleOrderVoResultBean.getSuccess()) {
+                            Integer useNum = 0;
+                            String platformNo = busVehicleOrderVoResultBean.getData().getPlatformNo();
+                            String lockingNum = busVehicleOrderVoResultBean.getData().getLockingNum();
+                            if (StringUtils.isNotBlank(platformNo)) {
+                                if (StringUtils.isNotBlank(lockingNum)) {
+                                    useNum = Integer.parseInt(platformNo) - Integer.parseInt(lockingNum);
+                                }else{
+                                    useNum = Integer.parseInt(platformNo);
+                                }
+                            }
+                            if (busSalesVehicleOrderList.get(i).getUsingNum() != null && useNum != 0) {
+                                if (busSalesVehicleOrderList.get(i).getUsingNum() > useNum) {
                                     return rb.setMsg("本次使用台数不允许大于可使用台数");
                                 }
+                            }
+                        }
+
+
                         vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
                     } else {
                         return rb.setMsg("请选择采购订单数据");
@@ -467,6 +484,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success();
     }
+
     @Transactional(rollbackFor = Exception.class)
     public void updateOrder(BusSalesOrderAllDto dto) {
         //主车车型信息
@@ -543,6 +561,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
 
     }
+
     @Transactional(rollbackFor = Exception.class)
     public String save(BusSalesOrderAllDto dto) {
         //主车车型信息
@@ -609,6 +628,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return sid;
 
     }
+
     @Transactional(rollbackFor = Exception.class)
     public ResultBean submit(BusSalesOrderAllDto dto) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -28,7 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 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.buscenter.api.bussalesorder.AppOrderInfo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -28,7 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 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.buscenter.api.bussalesorder.AppNowCarList;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppNowCarList;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -28,7 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
 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.buscenter.api.bussalesorder.AppReadyCarList;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppReadyCarList;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -18,7 +18,7 @@ public enum ProcDefEnum {
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", ""),//ToDo
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:3:252512"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:1:242504"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:1:232504"),
     ;
 

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

@@ -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);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -25,7 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
-import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -25,9 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
-import com.yxt.anrui.buscenter.api.bussalesorder.*;
-import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
-import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositPageQuery;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;