Browse Source

运单导出、到车计划搜索BUG修复

visual
汤建军 4 months ago
parent
commit
1ac0188d8c
  1. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  2. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@ -213,7 +213,7 @@
and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
</if>
<if test="param.carNumber != null and param.carNumber != ''">
and ltcl.driver_mobile like CONCAT('%',#{param.carNumber},'%')
and ltcl.car_number like CONCAT('%',#{param.carNumber},'%')
</if>
<if test="param.startWarehouseName != null and param.startWarehouseName != ''">
and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%')

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

@ -290,8 +290,9 @@ public class WarehouseWaybillController extends BladeController {
myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId()));
}
waybillDTO.setWarehouseIds(warehouseIds);
List<Long> idslist = new ArrayList<>();
List<Long> idslist = null;
if (!Objects.isNull(waybillDTO.getIds())){
idslist= new ArrayList<>();
List<Long> ids = Func.toLongList(",", waybillDTO.getIds());
idslist .addAll(ids) ;
}

Loading…
Cancel
Save