java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

车载计划搜索、到车计划搜索、运单勾选导出

visual
汤建军 5 months ago
parent
9d62f3eced
commit
4ddad81272
8 changed files with 91 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
  2. 66
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  3. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
  4. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
  5. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
  6. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
  7. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
  8. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

8
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
Unescape View File

@ -206,4 +206,12 @@ public class LoadCarsDTO implements Serializable {
private Long endWarehouseId;
private String driverName;
private String driverMobile;
private String carNumber;
private String endWarehouseNames;
private String arriveTime;
private String createUserName;
private String createTime;
}

66
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
Unescape View File

@ -82,6 +82,42 @@
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
<if test="param.driverName != null and param.driverName != ''">
and ltcl.driver_name like CONCAT('%',#{param.driverName},'%')
</if>
<if test="param.driverMobile != null and param.driverMobile != ''">
and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
</if>
<if test="param.driverMobile != null and param.driverMobile != ''">
and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
</if>
<if test="param.driverMobile != null and param.driverMobile != ''">
and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
</if>
<if test="param.driverMobile != null and param.driverMobile != ''">
and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
</if>
<if test="param.carNumber != null and 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},'%')
</if>
<if test="param.endWarehouseNames != null and param.endWarehouseNames != ''">
and ltcl.end_warehouse_names like CONCAT('%',#{param.endWarehouseNames},'%')
</if>
<if test="param.createUserName != null and param.createUserName != ''">
and ltcl.create_user_name like CONCAT('%',#{param.createUserName},'%')
</if>
<if test="param.arriveTime != null ">
and DATE_FORMAT(ltcl.arrive_time,'%y%d%m') = DATE_FORMAT(#{param.arriveTime},'%y%d%m')
</if>
<if test="param.startTime != null ">
and DATE_FORMAT(ltcl.start_time,'%y%d%m') = DATE_FORMAT(#{param.startTime},'%y%d%m')
</if>
<if test="param.createTime != null ">
and DATE_FORMAT(ltcl.create_time,'%y%d%m') = DATE_FORMAT(#{param.createTime},'%y%d%m')
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,
@ -170,6 +206,36 @@
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
<if test="param.driverName != null and param.driverName != ''">
and ltcl.driver_name like CONCAT('%',#{param.driverName},'%')
</if>
<if test="param.driverMobile != null and param.driverMobile != ''">
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},'%')
</if>
<if test="param.startWarehouseName != null and param.startWarehouseName != ''">
and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%')
</if>
<if test="param.endWarehouseNames != null and param.endWarehouseNames != ''">
and ltcl.end_warehouse_names like CONCAT('%',#{param.endWarehouseNames},'%')
</if>
<if test="param.createUserName != null and param.createUserName != ''">
and ltcl.create_user_name like CONCAT('%',#{param.createUserName},'%')
</if>
<if test="param.operator != null and param.operator != ''">
and ltcl.operator like CONCAT('%',#{param.operator},'%')
</if>
<if test="param.arriveTime != null ">
AND DATE_FORMAT(ltcl.arrive_time,'%y%d%m') = DATE_FORMAT(#{param.arriveTime},'%y%d%m')
</if>
<if test="param.startTime != null ">
AND DATE_FORMAT(ltcl.start_time,'%y%d%m') = DATE_FORMAT(#{param.startTime},'%y%d%m')
</if>
<if test="param.createTime != null ">
AND DATE_FORMAT(ltcl.create_time,'%y%d%m') = DATE_FORMAT(#{param.createTime},'%y%d%m')
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,

7
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
Unescape View File

@ -290,8 +290,13 @@ public class WarehouseWaybillController extends BladeController {
myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId()));
}
waybillDTO.setWarehouseIds(warehouseIds);
List<Long> idslist = new ArrayList<>();
if (!Objects.isNull(waybillDTO.getIds())){
List<Long> ids = Func.toLongList(",", waybillDTO.getIds());
idslist .addAll(ids) ;
}
List<ExportWarehouseWaybillVO> list = warehouseWaybillService.exportWaybillList(waybillDTO);
List<ExportWarehouseWaybillVO> list = warehouseWaybillService.exportWaybillList(waybillDTO,idslist);
fileNameStringBuffer.append(DateUtil.format(DateUtil.now(), DateUtil.PATTERN_DATE));
//导出ls

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
Unescape View File

@ -73,5 +73,6 @@ public class WarehouseWaybillDTO extends WarehouseWaybillEntity {
private String checkTimeEndStr;
private Date checkTimeStartDate;
private Date checkTimeEndDate;
private String ids;
}

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
Unescape View File

@ -69,7 +69,7 @@ public interface WarehouseWaybillMapper extends BaseMapper<WarehouseWaybillEntit
List<WarehouseWaybillEntity> findWaybillBilllByWaybillNos(@Param("waybillNos") List<String> waybillNos);
List<ExportWarehouseWaybillVO> exportWaybillList(@Param("param") WarehouseWaybillDTO waybillDTO);
List<ExportWarehouseWaybillVO> exportWaybillList(@Param("param") WarehouseWaybillDTO waybillDTO,@Param("idsList") List<Long> idsList);
void deleteByWaybillNo(@Param("waybillNo") String waybillNo);

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
Unescape View File

@ -1013,6 +1013,12 @@
#{item}
</foreach>
</if>
<if test="idsList != null">
and lww.id in
<foreach collection="idsList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
and (
lww.departure_warehouse_id in

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
Unescape View File

@ -81,7 +81,7 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
List<WarehouseWaybillEntity> findWaybillBilllByWaybillNos(List<String> waybillNos);
List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO);
List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO,List<Long> list);
void deleteByWaybillNo(String waybillNo);

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
Unescape View File

@ -888,7 +888,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
}
@Override
public List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO) {
public List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO,List<Long> idsList) {
waybillDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getDocumentMakingTimeStartStr()));
waybillDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getDocumentMakingTimeEndStr()));
@ -899,7 +899,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
List<ExportWarehouseWaybillVO> list = baseMapper.exportWaybillList(waybillDTO);
List<ExportWarehouseWaybillVO> list = baseMapper.exportWaybillList(waybillDTO,idsList);
list.forEach(item -> {
item.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, item.getPayType()));

Write Preview
Loading…
Cancel
Save