Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java

@@ -12,6 +12,10 @@ import lombok.Data;
 @Data
 public class BaseManufacturerListQuery implements Query {
     private static final long serialVersionUID = -8298971718012436562L;
-    @ApiModelProperty("车型sid")
-    private String modelSid;
+//    @ApiModelProperty("车型sid")
+//    private String modelSid; 作废
+
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -37,5 +37,8 @@ public class BaseVehicleActualSales extends BaseEntity {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
-
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java

@@ -45,4 +45,9 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
     private String useOrgName;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -50,5 +50,8 @@ public class BaseVehicleActualSalesDto implements Dto {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
-
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
 }

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

@@ -60,4 +60,7 @@ public class BaseVehmodelConfigQuerys implements Query {
     private String configName;
     @ApiModelProperty(value = "调入分公司sid")
     private String buyerOrgSid;
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -72,4 +72,9 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty("采购部门sid")
     private String orgDeptSid;
 
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@@ -62,4 +62,9 @@ public class BusVehicleApplyDetailsVo implements Vo {
     private String orgDeptName;
     @ApiModelProperty("采购部门sid")
     private String orgDeptSid;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -72,4 +72,9 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty("采购部门sid")
     private String orgDeptSid;
 
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrandSid;
+    @ApiModelProperty(value = "品牌名称")
+    private String carBrandName;
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -118,7 +118,7 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     List<Map<String, String>> bankNamesDown(String manufacturerSid);
 
-    List<BaseManufacturerListVo> selectNameByOrg(@Param("modelSid") String modelSid);
+    List<BaseManufacturerListVo> selectNameByOrg(@Param("carBrandSid") String carBrandSid);
 
     BaseManufacturer fetchByManBankSid(String s);
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -169,13 +169,25 @@
           AND isDelete = 0
     </select>
 
+<!--    <select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">-->
+<!--        select bmb.sid, bmb.actualPay name-->
+<!--        from base_manufacturer_bank bmb-->
+<!--                 left join base_manufacturer bm on bm.sid = bmb.manufacturerSid-->
+<!--                 left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid-->
+<!--                 left join base_vehicle_model bvm on bvm.carBrand = bvb.sid-->
+<!--        where bvm.sid = #{modelSid}-->
+<!--          and bmb.dueBankValue = '回款账户'-->
+<!--          and bmb.isDelete = 0-->
+<!--          AND bm.isDelete = 0-->
+<!--          AND bmb.actualPay != ""-->
+<!--    </select>-->
+
     <select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
         select bmb.sid, bmb.actualPay name
         from base_manufacturer_bank bmb
                  left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
                  left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
-                 left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
-        where bvm.sid = #{modelSid}
+        where bvb.sid = #{carBrandSid}
           and bmb.dueBankValue = '回款账户'
           and bmb.isDelete = 0
           AND bm.isDelete = 0

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -455,7 +455,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
 //        String useOrgSid = query.getUseOrgSid();
 //        String supplierTypeValue = "主机厂";
-        String sid = query.getModelSid();
+        String sid = query.getCarBrandSid();
         List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(sid);
         return rb.success().setData(list);
     }

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

@@ -643,6 +643,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         if (StringUtils.isNotBlank(query.getConfigName())) {
             qw.like("bmc.configName", query.getConfigName());
         }
+        if (StringUtils.isNotBlank(query.getCarBrandSid())){
+            qw.like("bmc.brandSid", query.getCarBrandSid());
+        }
         qw.eq("bvm.isDelete", 0);
         qw.eq("bmc.isDelete", 0);
         IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -25,14 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordervehicle;
 
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderVehicleFeign.java <br/>
@@ -54,5 +54,10 @@ import org.springframework.web.bind.annotation.*;
         fallback = BusSalesOrderVehicleFeignFallback.class)
 public interface BusSalesOrderVehicleFeign {
 
-   
+
+    @ApiOperation("根据销售订单sid查询现车车架号集合")
+    @GetMapping("/selectList/{sid}")
+    @ResponseBody
+    public ResultBean<List<String>> selectList(@PathVariable("sid") String sid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -30,6 +30,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderVehicleFeignFallback.java <br/>
@@ -45,5 +47,10 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFeign {
-    
+
+    @Override
+    public ResultBean<List<String>> selectList(String sid) {
+        return null;
+    }
+
 }

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

@@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderVehicleFeignFallback.java <br/>
@@ -52,5 +54,15 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesordervehicle")
 public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
 
+    @Autowired
+    BusSalesOrderVehicleService busSalesOrderVehicleService;
+
+    @Override
+    public ResultBean<List<String>> selectList(String sid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> list = busSalesOrderVehicleService.selectList(sid);
+        return rb.success().setData(list);
+    }
+
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -621,6 +621,15 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         scmVehicleGression.setLocationCode(dto.getLocationCode());
         scmVehicleGression.setTemporaryCard(dto.getProCard());
         updateById(scmVehicleGression);
+        //推送车辆台账数据
+        VehicleGression vehicleGression = new VehicleGression();
+        List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
+        vehicleGression.setVin(list);
+        vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
+        vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
+        baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
+        //删除申请状态
+        baseVehicleTempstateFeign.delByBusSid(scmVehicleGression.getSid());
         return rb.success().setMsg("保存成功");
     }
 
@@ -881,15 +890,15 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 
             } else {
-                //推送车辆台账数据
-                VehicleGression vehicleGression = new VehicleGression();
-                List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
-                vehicleGression.setVin(list);
-                vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
-                vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
-                baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
-                //删除申请状态
-                baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
+//                //推送车辆台账数据
+//                VehicleGression vehicleGression = new VehicleGression();
+//                List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
+//                vehicleGression.setVin(list);
+//                vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
+//                vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
+//                baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
+//                //删除申请状态
+//                baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
                 //推送调拨单
                 List<String> vinList = scmVehicleGressionVehService.fetchVoByMainSid(bv.getBusinessSid());
                 if (vinList.size() > 0) {
@@ -902,7 +911,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                         List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
                         StkTransferDirect stkTransferDirect = new StkTransferDirect();
 //                        stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
-                       // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
+                        // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
 //                        stkTransferDirect.setFStockOrgId("101"); //调入库存组织
                         stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
                         stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期