Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -211,6 +211,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (null == baseVehicle)
                 baseVehicle = new BaseVehicle();
             baseVehicleService.copyToBean(baseVehicleDto, baseVehicle);
+
             //BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true));
             //更新车辆台账数据
             if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1995,8 +1995,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
         baseVehicle.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
         baseVehicle.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
-        //baseVehicle.setWitPinState(VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
-        //baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.UN_SHUNTING.getRemarks());
         if (save(baseVehicle)) {
             BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
             baseVehicleCertificate.setVinNo(baseVehicle.getVinNo());
@@ -2255,6 +2253,18 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getWitPinStateValue())) {
             baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         }
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemSid())){
+            baseVehicle.setPurchaseSystemSid(dto.getPurchaseSystemSid());
+        }
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemName())){
+            baseVehicle.setPurchaseSystemName(dto.getPurchaseSystemName());
+        }
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessSid())){
+            baseVehicle.setManufSaleAccessSid(dto.getManufSaleAccessSid());
+        }
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessName())){
+            baseVehicle.setManufSaleAccessName(dto.getManufSaleAccessName());
+        }
     }
 
     public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@@ -2369,6 +2379,18 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getWitPinStateValue())) {
             baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
         }
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemSid())){
+            baseVehicle.setPurchaseSystemSid(dto.getPurchaseSystemSid());
+        }
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemName())){
+            baseVehicle.setPurchaseSystemName(dto.getPurchaseSystemName());
+        }
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessSid())){
+            baseVehicle.setManufSaleAccessSid(dto.getManufSaleAccessSid());
+        }
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessName())){
+            baseVehicle.setManufSaleAccessName(dto.getManufSaleAccessName());
+        }
     }
 
     /**

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBank.java

@@ -52,6 +52,8 @@ public class FinManufacturerBank extends BaseEntity {
 
 	@ApiModelProperty("银行账号")
     private String bankAccount;
+    @ApiModelProperty("开户银行key")
+    private String depositBankKey;
 	@ApiModelProperty("开户银行")
     private String depositBank;
 	@ApiModelProperty("账户名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankDetailsVo.java

@@ -55,6 +55,8 @@ public class FinManufacturerBankDetailsVo implements Vo {
     private String dueBankKey;
     @ApiModelProperty("账户类型value")
     private String dueBankValue;
+    @ApiModelProperty("开户银行key")
+    private String depositBankKey;
     @ApiModelProperty("开户银行")
     private String depositBank;
     @ApiModelProperty("账户名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankDto.java

@@ -59,6 +59,8 @@ public class FinManufacturerBankDto implements Dto {
     @NotBlank(message = "账户类型不能为空")
     @ApiModelProperty("账户类型value")
     private String dueBankValue;
+    @ApiModelProperty("开户银行key")
+    private String depositBankKey;
     @ApiModelProperty("开户银行")
     @NotBlank(message = "开户银行不能为空")
     private String depositBank;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java

@@ -50,8 +50,8 @@ import lombok.Data;
 public class FinManufacturerBankQuery implements Query {
 
     private static final long serialVersionUID = -7604927750260631898L;
-    @ApiModelProperty("开户银行")
-    private String depositBank;
+    @ApiModelProperty("开户银行key")
+    private String depositBankKey;
     @ApiModelProperty("账户类型key")
     private String dueBankKey;
     @ApiModelProperty("用户sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankVo.java

@@ -55,6 +55,8 @@ public class FinManufacturerBankVo implements Vo {
     private String dueBankKey;
     @ApiModelProperty("账户类型value")
     private String dueBankValue;
+    @ApiModelProperty("开户银行key")
+    private String depositBankKey;
     @ApiModelProperty("开户银行")
     private String depositBank;
     @ApiModelProperty("银行账号")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml

@@ -5,11 +5,12 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo">
         SELECT sid,
-               dueBankKey,
-               dueBankValue,
-               depositBank,
-               bankAccount,
-               accountName
+        dueBankKey,
+        dueBankValue,
+        depositBankKey,
+        depositBank,
+        bankAccount,
+        accountName
         FROM fin_manufacturer_bank
         <where>
             ${ew.sqlSegment}
@@ -20,6 +21,7 @@
         SELECT sid,
                dueBankKey,
                dueBankValue,
+               depositBankKey,
                depositBank,
                bankAccount,
                accountName
@@ -40,7 +42,7 @@
         where bankAccount = #{bankAccount}
           and useOrgSid = #{useOrgSid}
           and sid
-            &lt;&gt;
+                &lt;&gt;
               #{sid}
     </select>
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -75,8 +75,8 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             if (StringUtils.isNotBlank(params.getDueBankKey())) {
                 qw.eq("dueBankKey", params.getDueBankKey());
             }
-            if (StringUtils.isNotBlank(params.getDepositBank())) {
-                qw.like("depositBank", params.getDepositBank());
+            if (StringUtils.isNotBlank(params.getDepositBankKey())) {
+                qw.like("depositBankKey", params.getDepositBankKey());
             }
         }
         qw.orderByDesc("id");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -502,6 +502,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             baseVehicleDto.setManufSaleAccessSid(aaodd.getActualSid());
             //厂家销售通路
             baseVehicleDto.setManufSaleAccessName(aaodd.getActualPay());
+            baseVehicleDto.setEngineNo(s.getEngineNo());
             baseVehicleDto.setVinNo(s.getVinNo());
             baseVehicleDto.setModelSid(booad.getModelSid());
             baseVehicleDto.setModelName(booad.getModelName());