Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java

@@ -50,6 +50,8 @@ public class BaseVehicleOutApplyQueryNew implements Query {
 
     @ApiModelProperty("物料编码")
     private String materialCode;
+    @ApiModelProperty("车架号")
+    private String vinNo;
     @ApiModelProperty("销售类型key")
     private String typeKey;
     @ApiModelProperty("销售日期开始时间")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1496,7 +1496,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     baseVehicleZSOutDto.setMaterialTypeKey("002");
                     baseVehicleZSOutDto.setMaterialTypeValue("挂车");
                     baseVehicleZSOutDto.setVinSid(baseTrailerVo.getVehSid());
-                    baseVehicleZSOutDto.setVinNo(baseTrailerVo.getZcvinNo());
+                    baseVehicleZSOutDto.setVinNo(baseTrailerVo.getVinNo());
                     gcOrSzDtos.add(baseVehicleZSOutDto);
                 }
             } else {
@@ -1510,7 +1510,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     baseVehicleZSOutDto.setMaterialTypeKey("003");
                     baseVehicleZSOutDto.setMaterialTypeValue("上装");
                     baseVehicleZSOutDto.setVinSid(dto.getVinSid());
-                    baseVehicleZSOutDto.setVinNo(dto.getMaterialCode());
                     gcOrSzDtos.add(baseVehicleZSOutDto);
                 }
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -10,7 +10,7 @@
         bvoa.`createOrgSid`,
         bv.configName AS modelConfig,
         bv.insideCode,
-        bvo.type,
+        bvoa.saleTypeValue AS `type`,
         bvo.manPurOrderTypeValue,
         bvoa.`saleDate`,
         bvo.`price`,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -72,10 +72,14 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 			} else if ("3".equals(orgLevelKey)) {
 				qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
 			}
-			//车架号
+			//物料编码
 			if (StringUtils.isNotBlank(params.getMaterialCode())) {
 				qw.like("bvo.materialCode", params.getMaterialCode());
 			}
+			//车架号
+			if (StringUtils.isNotBlank(params.getVinNo())) {
+				qw.like("bvo.vinNo", params.getVinNo());
+			}
 			//销售类型
 			if (StringUtils.isNotBlank(params.getTypeKey())) {
 				qw.eq("bvoa.saleTypeKey", params.getTypeKey());
@@ -107,6 +111,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 			if (StringUtils.isNotBlank(params.getOrgSid())) {
 				qw.eq("bvoa.createOrgSid", params.getOrgSid());
 			}
+			qw.orderByDesc("bvoa.saleDate");
 		}
 		return qw;
 	}
@@ -119,9 +124,6 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 		for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
 			String createOrgSid = record.getCreateOrgSid();
 			String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
-			if (StringUtils.isNotBlank(record.getMaterialCode())){
-				record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
-			}
 			record.setCreateOrgName(createorgName);
 		}
 		PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java

@@ -36,5 +36,8 @@ public class BusVehicleInformation extends BaseEntity {
     private Integer gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
     @ApiModelProperty("随车资料交接表sid")
     private String handoverSid; // 随车资料交接表sid
-
+    @ApiModelProperty("交接次数")
+    private Integer handoverNum; // 交接次数
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java

@@ -13,10 +13,6 @@ import lombok.Data;
 public class BusVehicleInformationDto implements Dto {
     @ApiModelProperty("车钥匙个数")
     private Integer vehicleKeyNum; // 车钥匙个数
-//    @ApiModelProperty("发票0无1有")
-//    private Integer invoice; // 发票
-//    @ApiModelProperty("合格证0无1有")
-//    private Integer credential; // 合格证0无1有
     @ApiModelProperty("一致性证书0无1有")
     private Integer certificate; // 一致性证书0无1有
     @ApiModelProperty("申请表0无1有")
@@ -31,4 +27,8 @@ public class BusVehicleInformationDto implements Dto {
     private Integer gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
     @ApiModelProperty("随车资料交接表sid")
     private String handoverSid; // 随车资料交接表sid
+    @ApiModelProperty("交接次数")
+    private Integer handoverNum; // 交接次数
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java

@@ -29,6 +29,8 @@ public class BusVehicleInformationHandover extends BaseEntity {
     private String customerName; // 客户名称
     @ApiModelProperty("车型名")
     private String model; // 车型名
+    @ApiModelProperty("车型sid")
+    private String modelSid;
     @ApiModelProperty("合同号")
     private String contractNo; // 合同号
     @ApiModelProperty("接收人")
@@ -43,4 +45,7 @@ public class BusVehicleInformationHandover extends BaseEntity {
     private String useOrgName;
     @ApiModelProperty("关联业务sid")
     private String busSid;
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java

@@ -31,6 +31,8 @@ public class BusVehicleInformationHandoverDto implements Dto {
     private String customerName; // 客户名称
     @ApiModelProperty("车型名")
     private String model; // 车型名
+    @ApiModelProperty("车型sid")
+    private String modelSid;
     @ApiModelProperty("合同号")
     private String contractNo; // 合同号
     @ApiModelProperty("接收人")
@@ -49,4 +51,6 @@ public class BusVehicleInformationHandoverDto implements Dto {
     private BusVehicleInformationDto busVehicleInformation;
     @ApiModelProperty("备注信息")
     private String remarks;
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
 }