diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index 46c4887817..ad3397d477 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -605,7 +605,7 @@ AND bv.modelConfigSid = bvc.configurationItemsSid and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入') AND bv.lockedState = #{lockedStateKey} - and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0') AS nowCarNum, + and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0' and length(bv.vinNo)>8) AS nowCarNum, (select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 55335e4c95..3719c0696c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -720,7 +720,7 @@ OR bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入') AND lockedState = #{lockedStateKey} - AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0') AS nowCarNum, + AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0' and length(bv.vinNo)>8) AS nowCarNum, (select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java index fda8426d21..f217bc2738 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java @@ -44,7 +44,7 @@ public class AppBusSalesOrderAllDto implements Dto { @NotBlank(message = "参数错误:客户sid不能为空") private String customerSid; @ApiModelProperty("挂靠公司类型 1 选择 0 手写") - @NotBlank(message = "参数错误:挂靠公司类型不能为空") +// @NotBlank(message = "参数错误:挂靠公司类型不能为空") private String affiliatedType; @ApiModelProperty("选择挂靠公司名称") private String affiliatedOrgNameChoose; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java index 6450d38edf..1b5100350a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java @@ -49,7 +49,7 @@ public class BusOrerSalesAllDto implements Dto { @NotBlank(message = "参数错误:客户sid不能为空") private String customerSid; @ApiModelProperty("挂靠公司类型 1 选择 0 手写") - @NotBlank(message = "参数错误:挂靠公司类型不能为空") +// @NotBlank(message = "参数错误:挂靠公司类型不能为空") private String affiliatedType; @ApiModelProperty("选择挂靠公司名称") private String affiliatedOrgNameChoose;