From 4ddad81272451a9bf3c35d4443ed3fa5e431609f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 28 Oct 2024 18:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BD=BD=E8=AE=A1=E5=88=92=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E3=80=81=E5=88=B0=E8=BD=A6=E8=AE=A1=E5=88=92=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E3=80=81=E8=BF=90=E5=8D=95=E5=8B=BE=E9=80=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 8 +++ .../mapper/TrunklineCarsLoadMapper.xml | 66 +++++++++++++++++++ .../WarehouseWaybillController.java | 7 +- .../warehouse/dto/WarehouseWaybillDTO.java | 1 + .../mapper/WarehouseWaybillMapper.java | 2 +- .../mapper/WarehouseWaybillMapper.xml | 6 ++ .../service/IWarehouseWaybillService.java | 2 +- .../impl/WarehouseWaybillServiceImpl.java | 4 +- 8 files changed, 91 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 5755525d6..95c66d924 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -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; + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 585bd2db6..f0a22db02 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -82,6 +82,42 @@ and ltcl.arrive_time <= #{param.arriveTimeEnd} + + and ltcl.driver_name like CONCAT('%',#{param.driverName},'%') + + + and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%') + + + and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%') + + + and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%') + + + and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%') + + + and ltcl.car_number like CONCAT('%',#{param.carNumber},'%') + + + and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%') + + + and ltcl.end_warehouse_names like CONCAT('%',#{param.endWarehouseNames},'%') + + + and ltcl.create_user_name like CONCAT('%',#{param.createUserName},'%') + + + and DATE_FORMAT(ltcl.arrive_time,'%y%d%m') = DATE_FORMAT(#{param.arriveTime},'%y%d%m') + + + and DATE_FORMAT(ltcl.start_time,'%y%d%m') = DATE_FORMAT(#{param.startTime},'%y%d%m') + + + and DATE_FORMAT(ltcl.create_time,'%y%d%m') = DATE_FORMAT(#{param.createTime},'%y%d%m') + group by ltcl.id,ltcl.cars_no, ltcl.plan_loading_number, ltcl.real_loading_number, @@ -170,6 +206,36 @@ and ltcl.arrive_time <= #{param.arriveTimeEnd} + + and ltcl.driver_name like CONCAT('%',#{param.driverName},'%') + + + and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%') + + + and ltcl.driver_mobile like CONCAT('%',#{param.carNumber},'%') + + + and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%') + + + and ltcl.end_warehouse_names like CONCAT('%',#{param.endWarehouseNames},'%') + + + and ltcl.create_user_name like CONCAT('%',#{param.createUserName},'%') + + + and ltcl.operator like CONCAT('%',#{param.operator},'%') + + + AND DATE_FORMAT(ltcl.arrive_time,'%y%d%m') = DATE_FORMAT(#{param.arriveTime},'%y%d%m') + + + AND DATE_FORMAT(ltcl.start_time,'%y%d%m') = DATE_FORMAT(#{param.startTime},'%y%d%m') + + + AND DATE_FORMAT(ltcl.create_time,'%y%d%m') = DATE_FORMAT(#{param.createTime},'%y%d%m') + group by ltcl.id,ltcl.cars_no, ltcl.plan_loading_number, ltcl.real_loading_number, diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java index bc2667475..4b6bf7a4e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java @@ -290,8 +290,13 @@ public class WarehouseWaybillController extends BladeController { myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId())); } waybillDTO.setWarehouseIds(warehouseIds); + List idslist = new ArrayList<>(); + if (!Objects.isNull(waybillDTO.getIds())){ + List ids = Func.toLongList(",", waybillDTO.getIds()); + idslist .addAll(ids) ; + } - List list = warehouseWaybillService.exportWaybillList(waybillDTO); + List list = warehouseWaybillService.exportWaybillList(waybillDTO,idslist); fileNameStringBuffer.append(DateUtil.format(DateUtil.now(), DateUtil.PATTERN_DATE)); //导出ls diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java index 23cbcf63e..eac25f05b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java @@ -73,5 +73,6 @@ public class WarehouseWaybillDTO extends WarehouseWaybillEntity { private String checkTimeEndStr; private Date checkTimeStartDate; private Date checkTimeEndDate; + private String ids; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java index f9e2dc6ed..e0f0dabd6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java @@ -69,7 +69,7 @@ public interface WarehouseWaybillMapper extends BaseMapper findWaybillBilllByWaybillNos(@Param("waybillNos") List waybillNos); - List exportWaybillList(@Param("param") WarehouseWaybillDTO waybillDTO); + List exportWaybillList(@Param("param") WarehouseWaybillDTO waybillDTO,@Param("idsList") List idsList); void deleteByWaybillNo(@Param("waybillNo") String waybillNo); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index 04b414089..3b1f3d51a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -1013,6 +1013,12 @@ #{item} + + and lww.id in + + #{id} + + and ( lww.departure_warehouse_id in diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java index 8708a3d9d..cb9005bee 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java @@ -81,7 +81,7 @@ public interface IWarehouseWaybillService extends BaseService findWaybillBilllByWaybillNos(List waybillNos); - List exportWaybillList(WarehouseWaybillDTO waybillDTO); + List exportWaybillList(WarehouseWaybillDTO waybillDTO,List list); void deleteByWaybillNo(String waybillNo); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 57d989c4c..8027e8c2e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -888,7 +888,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl exportWaybillList(WarehouseWaybillDTO waybillDTO) { + public List exportWaybillList(WarehouseWaybillDTO waybillDTO,List idsList) { waybillDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getDocumentMakingTimeStartStr())); waybillDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getDocumentMakingTimeEndStr())); @@ -899,7 +899,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl list = baseMapper.exportWaybillList(waybillDTO); + List list = baseMapper.exportWaybillList(waybillDTO,idsList); list.forEach(item -> { item.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, item.getPayType()));