diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 9c09812f4..194b86605 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -107,9 +107,6 @@
and lawo.first like concat('%', #{param.first },'%')
and lawo.secondary like concat('%', #{param.secondary },'%')
and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%')
-
and lawo.brand_name like concat('%', #{param.brandName },'%')
and date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d')
and date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d')
@@ -130,7 +127,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.customer_service_name like concat('%', #{param.customerServiceName },'%')
and lawo.waybill_mall_id = #{param.waybillMallId }
and lawo.problem_description = #{param.problemDescription}
- and lawo.warehouse_id = #{param.warehouseId}
+ and (lap.warehouse_id = #{param.warehouseId} OR lap.business_id = #{param.warehouseId})
and lawo.person_responsible = #{param.personResponsible }
and lawo.process_number = #{param.processNumber }
and lawo.reviewed_by = #{param.reviewedBy }
@@ -143,7 +140,11 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
- or 1=1
+ and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1')
+ and lawo.work_order_status in ('20') and lap.types_of = '2'
+ and lawo.work_order_status in (21,30) and lap.processing_status = '4'
+ and lap.types_of = '2'
+ and ((lawo.work_order_status in (80,100,70) OR lacr.warehouse_id=#{param.warehouseId}) AND lawo.warehouse_id =#{param.warehouseId} )
and lawo.work_order_type = #{param.workOrderType }
and lawo.discovery_node = #{param.discoveryNode }
and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')
@@ -153,15 +154,8 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.first like concat('%', #{param.first },'%')
and lawo.secondary like concat('%', #{param.secondary },'%')
and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%')
- and lap.business_id = #{param.warehouseId}
and lawo.work_order_status in ( #{param.workOrderStatus })
-
- and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1')
- and lawo.work_order_status in ('20') and lap.types_of = '2'
- and lap.types_of = '2'
- and lawo.work_order_status in (21,30) and lap.processing_status = '4'
- and lawo.work_order_status in (80,100,70) and lacr.warehouse_id=#{param.warehouseId}
- and lawo.work_order_status in ('10')
+ and lawo.work_order_status in ('10')
ORDER BY lawo.create_time DESC
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java
index eb179cee8..0f23e41c6 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java
@@ -83,14 +83,14 @@ public class BasicdataVehicleImportExcel implements Serializable {
/**
* 车长;单位（M）
*/
- @ColumnWidth(20)
+ @ColumnWidth(25)
@ExcelProperty(index = 6,value ="车长;单位（M）")
private BigDecimal vehicleCommander;
/**
* 外廓高
*/
- @ColumnWidth(20)
- @ExcelProperty(index = 7,value ="外廓高")
+ @ColumnWidth(25)
+ @ExcelProperty(index = 7,value ="外廓高;单位（M）")
private BigDecimal vehicleHeight;
/**
* 车牌颜色;1-黄色,2-蓝色,3-绿色,4-蓝绿色,5-其他
@@ -143,7 +143,7 @@ public class BasicdataVehicleImportExcel implements Serializable {
/**
* 核定体积
*/
- @ColumnWidth(20)
+ @ColumnWidth(30)
@ExcelProperty("核定体积;单位（方）")
private BigDecimal approvedVolume;
/**