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

Merge remote-tracking branch 'origin/dev' into pre-production

pre-production
zhenghaoyu 2 months ago
parent
c4303d6411 a4868cd393
commit
5ed2bcfde0
21 changed files with 795 additions and 132 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. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java
  2. 1
      blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
  3. 4
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java
  4. 202
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
  5. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
  6. 9
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
  7. 8
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  8. 52
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  9. 12
      blade-service/logpm-trunkline/src/main/resources/luascript/resubmit.lua
  10. 27
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
  11. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java
  12. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.java
  13. 226
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.xml
  14. 15
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillDetailAbolishMapper.xml
  15. 242
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
  16. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailAbolishService.java
  17. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java
  18. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
  19. 10
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java
  20. 70
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java
  21. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java
Unescape View File

@ -10,7 +10,7 @@ public enum IncomingTypeEnum {
LINE_INCOMING(3, "直接入库"),
CARS_NO_INCOMING(4, "按车次号入库"),
ORDER_CODE_INCOMING(5, "按订单号入库"),
PACKAGE_INCOMING(6, "按件入库"),
PACKAGE_INCOMING(6, "卸车入库"),
BATCH_INCOMING(7, "批量卸车入库"),
UNLOAD_TRAY_INCOMING(8, "托盘卸车入库"),
UNLOAD_TRAY_ONE(9, "卸分一体"),

1
blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
Unescape View File

@ -16,6 +16,7 @@ public enum WorkNodeEnums implements Serializable {
DELETE_DATA_ENTRY(100000, "删除数据"),
INITIAL_DATA_ENTRY(101010, "数据入库"),
INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"),
UNLOAD_WAREHOUSE_ENTRY(101021, "卸车并入库"),
OPEN_ORDER(102010, "开单"),
CHANGE_ORDER(102020, "改单"),

4
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java
Unescape View File

@ -15,6 +15,10 @@ public class TrunklineLoadSignOrderVO extends TrunklineLoadSignOrderEntity {
private String carsLineName;
private String carNumber;
private String driverMobile;
private String mallName;
private String mallPerson;
private String mallMobile;
private String mallAddress;
private List<TrunklineLoadSignPhotoEntity> signPhotoList;

202
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
Unescape View File

@ -803,51 +803,46 @@
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.brand brand,
count(lww.id) waybillNum,
sum(lww.total_count) openNum,
sum(IFNULL(t.totalNum,0)) arriveNum,
sum(lww.total_count)-sum(IFNULL(t.totalNum,0)) noArriveNum,
IFNULL(round(sum(IFNULL(t.totalNum,0))/sum(lww.total_count)*100,2),'0.00') arriveRate,
round(sum(t.timeSecond)/sum(IFNULL(t.totalNum,0))/3600/24,1) avgTime,
sum(IFNULL(t.onTimeNum,0)) onTimeArriveNum,
IFNULL(round(sum(IFNULL(t.onTimeNum,0))/sum(lww.total_count)*100,2),'0.00') onTimeArriveRate,
sum(IFNULL(t.oneNum,0)) oneArriveNum,
IFNULL(round(sum(IFNULL(t.oneNum,0))/sum(lww.total_count)*100,2),'0.00') oneArriveRate,
sum(IFNULL(t.twoNum,0)) twoArriveNum,
IFNULL(round(sum(IFNULL(t.twoNum,0))/sum(lww.total_count)*100,2),'0.00') twoArriveRate,
sum(IFNULL(t.threeNum,0)) threeArriveNum,
IFNULL(round(sum(IFNULL(t.threeNum,0))/sum(lww.total_count)*100,2),'0.00') threeArriveRate,
sum(IFNULL(t.fourNum,0)) fourArriveNum,
IFNULL(round(sum(IFNULL(t.fourNum,0))/sum(lww.total_count)*100,2),'0.00') fourArriveRate,
sum(IFNULL(t.fiveNum,0)) fiveArriveNum,
IFNULL(round(sum(IFNULL(t.fiveNum,0))/sum(lww.total_count)*100,2),'0.00') fiveArriveRate,
sum(IFNULL(t.sixNum,0)) sixArriveNum,
IFNULL(round(sum(IFNULL(t.sixNum,0))/sum(lww.total_count)*100,2),'0.00') sixArriveRate,
sum(IFNULL(t.sevenNum,0)) sevenArriveNum,
IFNULL(round(sum(IFNULL(t.sevenNum,0))/sum(lww.total_count)*100,2),'0.00') sevenArriveRate,
sum(IFNULL(t.sevenToTenNum,0)) sevenToTenArriveNum,
IFNULL(round(sum(IFNULL(t.sevenToTenNum,0))/sum(lww.total_count)*100,2),'0.00') sevenToTenArriveRate,
sum(IFNULL(t.moreTenNum,0)) moreTenArriveNum,
IFNULL(round(sum(IFNULL(t.moreTenNum,0))/sum(lww.total_count)*100,2),'0.00') moreTenArriveRate
from (select ldpl.waybill_id,
sum(ldpl.quantity) totalNum,
sum(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time )) timeSecond,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL IFNULL(lrat.hours_time,#{param.hoursTime}) HOUR ),1,0)) onTimeNum,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ),1,0)) oneNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ),1,0)) twoNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 48 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ),1,0)) threeNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 72 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ),1,0)) fourNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 96 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ),1,0)) fiveNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 120 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ),1,0)) sixNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 144 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ),1,0)) sevenNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 168 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 240 HOUR ),1,0)) sevenToTenNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 240 HOUR )&lt;ldpl.create_time,1,0)) moreTenNum
from logpm_distribution_parcel_list ldpl
left join logpm_trunkline_advance_detail ltad on ltad.order_package_code = ldpl.order_package_code
IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime,
count(DISTINCT ltad.waybill_id) waybillNum,
count(ltad.id) openNum,
IFNULL(sum(ldpl.quantity),0) arriveNum,
count(ltad.id)-IFNULL(sum(ldpl.quantity),0) noArriveNum,
IFNULL(round(IFNULL(sum(ldpl.quantity),0)/count(ltad.id)*100,2),'0.00') arriveRate,
round(sum(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time ))/sum(ldpl.quantity)/3600/24,1) avgTime,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL IFNULL(lrat.hours_time,#{param.hoursTime}) HOUR ),1,0)) onTimeArriveNum,
IFNULL(round(sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL IFNULL(lrat.hours_time,0) HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') onTimeArriveRate,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ),1,0)) oneArriveNum,
IFNULL(round(sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') oneArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ),1,0)) twoArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') twoArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 48 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ),1,0)) threeArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') threeArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 72 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ),1,0)) fourArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') fourArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 96 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ),1,0)) fiveArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') fiveArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 120 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ),1,0)) sixArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') sixArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 144 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ),1,0)) sevenArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') sevenArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 168 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 240 HOUR ),1,0)) sevenToTenArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 240 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'0.00') sevenToTenArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 240 HOUR )&lt;ldpl.create_time,1,0)) moreTenArriveNum,
IFNULL(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 240 HOUR )&lt;ldpl.create_time,1,0))/sum(ldpl.quantity)*100,2),'0.00') moreTenArriveRate
from logpm_trunkline_advance_detail ltad
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
left join logpm_distribution_parcel_list ldpl on ltad.order_package_code = ldpl.order_package_code and ldpl.warehouse_id = lww.destination_warehouse_id
left join logpm_reportconfig_all_trunkline lrat on lrat.departure_warehouse_id = ldpl.send_warehouse_id and lrat.destination_warehouse_id = ldpl.accept_warehouse_id and lrat.is_deleted=0
where ldpl.conditions != 3
and ldpl.send_warehouse_id != ldpl.accept_warehouse_id
and ltad.create_time > '2024-10-22 00:00:00'
where 1=1
and lww.departure_warehouse_id != lww.destination_warehouse_id
<if test="param.businessLineList != null and param.businessLineList.size() > 0">
and waw.business_line in
<foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.startTime != null ">
and ltad.create_time &gt;= #{param.startTime}
</if>
@ -855,35 +850,23 @@
and ltad.create_time &lt;= #{param.endTime}
</if>
<if test="param.brandList != null and param.brandList.size() > 0">
and ltad.brand in
and lww.brand in
<foreach collection="param.brandList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
and ldpl.send_warehouse_id in
and lww.departure_warehouse_id in
<foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
and ldpl.accept_warehouse_id in
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and ldpl.warehouse_id = ldpl.accept_warehouse_id
and ldpl.warehouse_id != ldpl.send_warehouse_id
group by ldpl.waybill_id) t
left join logpm_warehouse_waybill lww on lww.id = t.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
where 1=1
<if test="param.businessLineList != null and param.businessLineList.size() > 0">
and waw.business_line in
<foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
group by waw.business_line,
lww.departure_warehouse_name,
lww.destination_warehouse_name,
@ -896,51 +879,46 @@
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.brand brand,
count(lww.id) waybillNum,
sum(lww.total_count) openNum,
sum(IFNULL(t.totalNum,0)) arriveNum,
sum(lww.total_count)-sum(IFNULL(t.totalNum,0)) noArriveNum,
IFNULL(concat(round(sum(IFNULL(t.totalNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') arriveRate,
round(sum(t.timeSecond)/sum(IFNULL(t.totalNum,0))/3600/24,1) avgTime,
sum(IFNULL(t.onTimeNum,0)) onTimeArriveNum,
IFNULL(concat(round(sum(IFNULL(t.onTimeNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') onTimeArriveRate,
sum(IFNULL(t.oneNum,0)) oneArriveNum,
IFNULL(concat(round(sum(IFNULL(t.oneNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') oneArriveRate,
sum(IFNULL(t.twoNum,0)) twoArriveNum,
IFNULL(concat(round(sum(IFNULL(t.twoNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') twoArriveRate,
sum(IFNULL(t.threeNum,0)) threeArriveNum,
IFNULL(concat(round(sum(IFNULL(t.threeNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') threeArriveRate,
sum(IFNULL(t.fourNum,0)) fourArriveNum,
IFNULL(concat(round(sum(IFNULL(t.fourNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') fourArriveRate,
sum(IFNULL(t.fiveNum,0)) fiveArriveNum,
IFNULL(concat(round(sum(IFNULL(t.fiveNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') fiveArriveRate,
sum(IFNULL(t.sixNum,0)) sixArriveNum,
IFNULL(concat(round(sum(IFNULL(t.sixNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') sixArriveRate,
sum(IFNULL(t.sevenNum,0)) sevenArriveNum,
IFNULL(concat(round(sum(IFNULL(t.sevenNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') sevenArriveRate,
sum(IFNULL(t.sevenToTenNum,0)) sevenToTenArriveNum,
IFNULL(concat(round(sum(IFNULL(t.sevenToTenNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') sevenToTenArriveRate,
sum(IFNULL(t.moreTenNum,0)) moreTenArriveNum,
IFNULL(concat(round(sum(IFNULL(t.moreTenNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') moreTenArriveRate
from (select ldpl.waybill_id,
sum(ldpl.quantity) totalNum,
sum(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time )) timeSecond,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL IFNULL(lrat.hours_time,#{param.hoursTime}) HOUR ),1,0)) onTimeNum,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ),1,0)) oneNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ),1,0)) twoNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 48 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ),1,0)) threeNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 72 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ),1,0)) fourNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 96 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ),1,0)) fiveNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 120 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ),1,0)) sixNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 144 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ),1,0)) sevenNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 168 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 240 HOUR ),1,0)) sevenToTenNum,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 240 HOUR )&lt;ldpl.create_time,1,0)) moreTenNum
from logpm_distribution_parcel_list ldpl
left join logpm_trunkline_advance_detail ltad on ltad.order_package_code = ldpl.order_package_code
IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime,
count(DISTINCT ltad.waybill_id) waybillNum,
count(ltad.id) openNum,
IFNULL(sum(ldpl.quantity),0) arriveNum,
count(ltad.id)-IFNULL(sum(ldpl.quantity),0) noArriveNum,
IFNULL(concat(round(IFNULL(sum(ldpl.quantity),0)/count(ltad.id)*100,2),'%'),'0.00%') arriveRate,
round(sum(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time ))/sum(ldpl.quantity)/3600/24,1) avgTime,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL IFNULL(lrat.hours_time,#{param.hoursTime}) HOUR ),1,0)) onTimeArriveNum,
IFNULL(concat(round(sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL IFNULL(lrat.hours_time,0) HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') onTimeArriveRate,
sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ),1,0)) oneArriveNum,
IFNULL(concat(round(sum(if(ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') oneArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ),1,0)) twoArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 24 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') twoArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 48 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ),1,0)) threeArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 48 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') threeArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 72 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ),1,0)) fourArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 72 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') fourArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 96 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ),1,0)) fiveArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 96 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') fiveArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 120 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ),1,0)) sixArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 120 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') sixArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 144 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ),1,0)) sevenArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 144 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') sevenArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 168 HOUR )&lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 240 HOUR ),1,0)) sevenToTenArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 168 HOUR ) &lt;ldpl.create_time and ldpl.create_time &lt;= DATE_ADD( ltad.create_time, INTERVAL 240 HOUR ),1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') sevenToTenArriveRate,
sum(if(DATE_ADD( ltad.create_time, INTERVAL 240 HOUR )&lt;ldpl.create_time,1,0)) moreTenArriveNum,
IFNULL(concat(round(sum(if(DATE_ADD( ltad.create_time, INTERVAL 240 HOUR )&lt;ldpl.create_time,1,0))/sum(ldpl.quantity)*100,2),'%'),'0.00%') moreTenArriveRate
from logpm_trunkline_advance_detail ltad
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
left join logpm_distribution_parcel_list ldpl on ltad.order_package_code = ldpl.order_package_code and ldpl.warehouse_id = lww.destination_warehouse_id
left join logpm_reportconfig_all_trunkline lrat on lrat.departure_warehouse_id = ldpl.send_warehouse_id and lrat.destination_warehouse_id = ldpl.accept_warehouse_id and lrat.is_deleted=0
where ldpl.conditions != 3
and ldpl.send_warehouse_id != ldpl.accept_warehouse_id
and ltad.create_time > '2024-10-22 00:00:00'
where 1=1
and lww.departure_warehouse_id != lww.destination_warehouse_id
<if test="param.businessLineList != null and param.businessLineList.size() > 0">
and waw.business_line in
<foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.startTime != null ">
and ltad.create_time &gt;= #{param.startTime}
</if>
@ -948,35 +926,23 @@
and ltad.create_time &lt;= #{param.endTime}
</if>
<if test="param.brandList != null and param.brandList.size() > 0">
and ltad.brand in
and lww.brand in
<foreach collection="param.brandList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
and ldpl.send_warehouse_id in
and lww.departure_warehouse_id in
<foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
and ldpl.accept_warehouse_id in
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and ldpl.warehouse_id = ldpl.accept_warehouse_id
and ldpl.warehouse_id != ldpl.send_warehouse_id
group by ldpl.waybill_id) t
left join logpm_warehouse_waybill lww on lww.id = t.waybill_id
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
where 1=1
<if test="param.businessLineList != null and param.businessLineList.size() > 0">
and waw.business_line in
<foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
group by waw.business_line,
lww.departure_warehouse_name,
lww.destination_warehouse_name,

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

@ -66,6 +66,10 @@
ltlso.plan_num planNum,
ltlso.load_sign_code loadSignCode,
ltlso.sign_num signNum,
ltlso.mall_name mallName,
ltlso.mall_person mallPerson,
ltlso.mall_mobile mallMobile,
ltlso.mall_address mallAddress,
ltcl.driver_name driverName,
ltcl.driver_mobile driverMobile,
ltcl.car_number carNumber,

9
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
Unescape View File

@ -333,8 +333,15 @@ public class InComingServiceImpl implements IInComingService {
//
// List<String> orderPackageCodes = new ArrayList<>();
// orderPackageCodes.add(orderPackageCode);
Integer c = WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode();
if(incomingType.equals(IncomingTypeEnum.PACKAGE_INCOMING.getCode())){
c = WorkNodeEnums.UNLOAD_WAREHOUSE_ENTRY.getCode();
}
//存入日志
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, finalWarehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType));
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, finalWarehouseName, c, "包件" + IncomingTypeEnum.getValue(incomingType));
//2.判断包件和订单是否已经存入在库订单

8
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -691,9 +691,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setStockCount(advanceDetailStockNumVO.getStockNum());
waybillEntity.setStockWeight(advanceDetailStockNumVO.getStockWeight());
waybillEntity.setStockVolume(advanceDetailStockNumVO.getStockVolume());
List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);
// List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);
//把billladingPackageList中的所有num累加
waybillEntity.setBillladingNum(billladingPackageList.stream().mapToInt(BillladingPackageVO::getNum).sum());
waybillEntity.setBillladingNum(0);
waybillEntity.setTotalFreight(openOrderDTO.getTotalFreight());
waybillEntity.setDeliveryFee(openOrderDTO.getDeliveryFee());
@ -1127,7 +1127,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String goodsName = waybillDetailDTO.getGoodsName();
if (Objects.isNull(goodsId)) {
//如果品名id没有就先通过goodsName查寻，没有就新增
BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
if(StringUtil.isNotBlank(goodsName)){
BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName.trim());
if (Objects.isNull(basicdataCategoryEntity)) {
basicdataCategoryEntity = new BasicdataCategoryEntity();
basicdataCategoryEntity.setName(goodsName);
@ -1137,6 +1138,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
goodsId = basicdataCategoryEntity.getId();
}
}
}
warehouseWayBillDetail.setProductId(goodsId);
warehouseWayBillDetail.setProductName(goodsName);
warehouseWayBillDetail.setNum(waybillDetailDTO.getNum());

52
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -68,6 +68,9 @@ import org.springblade.system.cache.DictBizCache;
import org.springblade.system.entity.DictBiz;
import org.springframework.amqp.rabbit.connection.CorrelationData;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.scripting.support.ResourceScriptSource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -11544,6 +11547,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
public R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
log.info("#############unloadPackage: 卸车包件");
String key = "unloadPackage:"+orderPackageCode;
String value = "1";
Long expireTime = 5L;
DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("luascript/resubmit.lua")));
redisScript.setResultType(Long.class);
List<String> keys = Collections.singletonList(key);
List<Object> args = Arrays.asList(value, expireTime);
log.info("Keys: {}", keys);
log.info("Args: {}", args);
Long result = bladeRedis.getRedisTemplate().execute(redisScript, keys, args.toArray());
if (result == 1) {
log.warn("#########orderScanOrderPackageCode: 包件正在卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
return R.fail(405, "包件正在卸车，请重试");
}
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
if (Objects.isNull(basicdataWarehouseEntity)) {
log.warn("##############unloadPackage: 仓库信息不存在");
@ -12357,6 +12382,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
// audio.append("异常卸车").append(abnormalUnloadNum).append("件");
// }
bladeRedis.del(key);
if (isData == 0) {
return Resp.scanFail(4005,"系统无编码","系统无编码");
}
@ -12370,6 +12398,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
public R unloadPackageNoXz(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
log.info("#############unloadPackageNoXz: 卸车包件");
String key = "unloadPackage:"+orderPackageCode;
String value = "1";
Long expireTime = 5L;
DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("luascript/resubmit.lua")));
redisScript.setResultType(Long.class);
List<String> keys = Collections.singletonList(key);
List<Object> args = Arrays.asList(value, expireTime);
log.info("Keys: {}", keys);
log.info("Args: {}", args);
Long result = bladeRedis.getRedisTemplate().execute(redisScript, keys, args.toArray());
if (result == 1) {
log.warn("#########orderScanOrderPackageCode: 包件正在卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
return R.fail(405, "包件正在卸车，请重试");
}
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
if (Objects.isNull(basicdataWarehouseEntity)) {
log.warn("##############unloadPackageNoXz: 仓库信息不存在");
@ -13136,6 +13186,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//TODO 暂时注释
// carsLoadAsyncService.sendReportPackageUnloadData(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,carsLoadEntity,orderPackageCodeList);
bladeRedis.del(key);
if (isData == 0) {
return Resp.scanSuccess("卸车成功", "系统无编码");
}

12
blade-service/logpm-trunkline/src/main/resources/luascript/resubmit.lua
Unescape View File

@ -0,0 +1,12 @@
local key = KEYS[1]
local value = ARGV[1]
local expireTime = ARGV[2]
local exists = redis.call("EXISTS", key)
if exists == 1 then
return 1
end
redis.call("SETEX", key, expireTime, value)
return 0

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

@ -28,6 +28,7 @@ import com.logpm.warehouse.dto.SplitOrderDTO;
import com.logpm.warehouse.dto.WarehouseWaybillDTO;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
import com.logpm.warehouse.excel.WarehouseWaybillExcel;
import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
import com.logpm.warehouse.service.IWarehouseWaybillService;
import com.logpm.warehouse.vo.ExportWarehouseWaybillVO;
import com.logpm.warehouse.vo.FinanceWaybillExportVO;
@ -81,6 +82,8 @@ public class WarehouseWaybillController extends BladeController {
private final IDictBizClient dictBizClient;
private final IWarehouseWaybillAbolishService warehouseWaybillAbolishService;
/**
* 运单表 详情
*/
@ -452,5 +455,29 @@ public class WarehouseWaybillController extends BladeController {
}
@ResponseBody
@PostMapping("/pageAbolishWaybillList")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "分页查询作废运单", notes = "传入waybillDTO")
public R pageAbolishWaybillList(@RequestBody WarehouseWaybillDTO waybillDTO) {
String method = "############pageWaybillList: ";
log.info(method + "请求参数{}", waybillDTO);
try{
//当前登录人选择的仓库
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
waybillDTO.setWarehouseIds(warehouseIds);
IPage<WarehouseWaybillVO> pages = warehouseWaybillAbolishService.pageAbolishWaybillList(waybillDTO);
return R.data(pages);
}catch (CustomerException e){
log.error(e.message,e);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error("############sendOrders: 系统异常",e);
return R.fail(500,"############sendOrders: 系统异常");
}
}
}

7
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java
Unescape View File

@ -1,9 +1,16 @@
package com.logpm.warehouse.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.logpm.warehouse.entity.WarehouseWayBillDetail;
import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface WarehouseWayBillDetailAbolishMapper extends BaseMapper<WarehouseWayBillDetailAbolish> {
List<WarehouseWayBillDetail> findByWaybillIds(@Param("ids") List<Long> ids);
}

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

@ -1,9 +1,15 @@
package com.logpm.warehouse.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.warehouse.dto.WarehouseWaybillDTO;
import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface WarehouseWaybillAbolishMapper extends BaseMapper<WarehouseWaybillAbolishEntity> {
IPage<WarehouseWaybillVO> pageAbolishWaybillList(IPage<Object> page, @Param("param") WarehouseWaybillDTO waybillDTO);
}

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

@ -0,0 +1,226 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper">
<select id="pageAbolishWaybillList" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
select lww.id id,
lww.brand brand,
lww.waybill_no waybillNo,
lww.order_no orderNo,
lww.consignee consignee,
lww.consignee_name consigneeName,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.destination destination,
lww.complete_destination completeDestination,
lww.departure departure,
lww.complete_departure completeDeparture,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.delivery_way deliveryWay,
lww.customer_train customerTrain,
IFNULL(lww.return_status,0) returnStatus,
lww.remark remark,
lww.pay_type payType,
lww.pay_way payWay,
lww.x_pay xPay,
lww.d_pay dPay,
lww.h_pay hPay,
lww.y_pay yPay,
lww.service_type serviceType,
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
lww.waybill_status waybillStatus,
lww.agent agent,
lww.waybill_type waybillType,
lww.document_making_time documentMakingTime,
lww.create_time createTime,
lww.total_count totalCount,
lww.cost_piece costPiece,
lww.cost_zhang costZhang,
lww.cost_num costNum,
lww.total_freight totalFreight,
lww.delivery_fee deliveryFee,
lww.pickup_fee pickupFee,
lww.storage_fee storageFee,
lww.warehouse_management_fee warehouseManagementFee,
lww.sorting_fee sortingFee,
lww.handling_fee handlingFee,
lww.claiming_value claimingValue,
lww.rebate rebate,
lww.urgency urgency,
lww.receipt_num receiptNum,
lww.receipt receipt,
lww.transport_type transportType,
lww.third_operation_fee thirdOperationFee,
lww.pickup_complete_or_not pickupCompleteOrNot,
lww.trunkline_complete_or_not trunklineCompleteOrNot,
lww.freeze_status freezeStatus,
lww.freeze_user_name freezeUserName,
lww.freeze_time freezeTime,
lww.abolish_status abolishStatus,
lww.abolish_user_name abolishUserName,
lww.abolish_time abolishTime,
lww.sign_num signNum,
lww.sign_user_name signUserName,
lww.sign_time signTime,
lww.sign_check_user_name signCheckUserName,
lww.sign_check_time signCheckTime,
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime
from logpm_warehouse_waybill_abolish lww
where lww.is_deleted = 0
and lww.abolish_status = 0
<if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
and lww.departure_warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNoList != null">
and lww.waybill_no in
<foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and Locate(#{param.waybillNo},lww.waybill_no) > 0
</if>
<if test="param.orderNo != null and param.orderNo != ''">
and Locate(#{param.orderNo},lww.order_no) > 0
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0
</if>
<if test="param.customerTrain != null and param.customerTrain != ''">
and Locate(#{param.customerTrain},lww.customer_train) > 0
</if>
<if test="param.brand != null and param.brand != ''">
and Locate(#{param.brand},lww.brand) > 0
</if>
<if test="param.shipper != null and param.shipper != ''">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
<if test="param.shipperName != null and param.shipperName != ''">
and Locate(#{param.shipperName},lww.shipper_name) > 0
</if>
<if test="param.shipperMobile != null and param.shipperMobile != ''">
and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0
</if>
<if test="param.consignee != null and param.consignee != ''">
and Locate(#{param.consignee},lww.consignee) > 0
</if>
<if test="param.consigneeName != null and param.consigneeName != ''">
and Locate(#{param.consigneeName},lww.consignee_name) > 0
</if>
<if test="param.consigneeMobile != null and param.consigneeMobile != ''">
and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
</if>
<if test="param.destination != null and param.destination != ''">
and Locate(#{param.destination},lww.destination) > 0
</if>
<if test="param.completeDestination != null and param.completeDestination != ''">
and Locate(#{param.completeDestination},lww.complete_destination) > 0
</if>
<if test="param.departure != null and param.departure != ''">
and Locate(#{param.departure},lww.departure) > 0
</if>
<if test="param.completeDeparture != null and param.completeDeparture != ''">
and Locate(#{param.completeDeparture},lww.complete_departure) > 0
</if>
<if test="param.payType != null">
and lww.pay_type = #{param.payType}
</if>
<if test="param.payWay != null">
and lww.pay_way = #{param.payWay}
</if>
<if test="param.deliveryWay != null">
and lww.delivery_way = #{param.deliveryWay}
</if>
<if test="param.urgency != null">
and lww.urgency = #{param.urgency}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
</if>
<if test="param.waybillStatus != null">
and lww.waybill_status = #{param.waybillStatus}
</if>
<if test="param.pickupCompleteOrNot != null">
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
</if>
<if test="param.trunklineCompleteOrNot != null">
and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot}
</if>
<if test="param.documentMakingTimeStartDate != null">
and lww.document_making_time &gt;= #{param.documentMakingTimeStartDate}
</if>
<if test="param.documentMakingTimeEndDate != null">
and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
</if>
<if test="param.createTimeStartDate != null">
and lww.create_time &gt;= #{param.createTimeStartDate}
</if>
<if test="param.createTimeEndDate != null">
and lww.create_time &lt;= #{param.createTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and Locate(#{param.agent},lww.agent) > 0
</if>
<if test="param.goodsName != null and param.goodsName != ''">
and Locate(#{param.goodsName},lww.goods_name) > 0
</if>
<if test="param.freezeStatus != null">
and lww.freeze_status = #{param.freezeStatus}
</if>
<if test="param.abolishStatus != null">
and lww.abolish_status = #{param.abolishStatus}
</if>
<if test="param.remark != null and param.remark != ''">
and Locate(#{param.remark},lww.remark) > 0
</if>
<if test="param.consigneeAddress != null and param.consigneeAddress != ''">
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
</if>
<if test="param.totalCount != null">
and lww.total_count = #{param.totalCount}
</if>
<if test="param.totalWeight != null">
and lww.total_weight = #{param.totalWeight}
</if>
<if test="param.totalVolume != null">
and lww.total_volume = #{param.totalVolume}
</if>
<if test="param.abolishTimeStartDate != null">
and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
</if>
<if test="param.abolishTimeEndDate != null">
and lww.abolish_time &lt;= #{param.abolishTimeEndDate}
</if>
<if test="param.freezeTimeStartDate != null">
and lww.freeze_time &gt;= #{param.freezeTimeStartDate}
</if>
<if test="param.freezeTimeEndDate != null">
and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
</if>
<if test="param.checkStatus != null">
and IFNULL(lww.check_status,0) = #{param.checkStatus}
</if>
order by lww.create_time desc
</select>
</mapper>

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

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.logpm.warehouse.mapper.WarehouseWayBillDetailAbolishMapper">
<select id="findByWaybillIds" resultType="com.logpm.warehouse.entity.WarehouseWayBillDetail">
select *
from logpm_warehouse_waybill_detail_abolish
where waybill_id in
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and is_deleted = 0
</select>
</mapper>

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

@ -1290,4 +1290,246 @@
update logpm_warehouse_waybill set service_type = #{serviceType} where id = #{waybillId}
</update>
<select id="pageAbolishWaybillList" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
select lww.id id,
lww.brand brand,
lww.waybill_no waybillNo,
lww.order_no orderNo,
lww.consignee consignee,
lww.consignee_name consigneeName,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.destination destination,
lww.complete_destination completeDestination,
lww.departure departure,
lww.complete_departure completeDeparture,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.delivery_way deliveryWay,
lww.customer_train customerTrain,
IFNULL(lww.return_status,0) returnStatus,
lww.remark remark,
lww.pay_type payType,
lww.pay_way payWay,
lww.x_pay xPay,
lww.d_pay dPay,
lww.h_pay hPay,
lww.y_pay yPay,
lww.service_type serviceType,
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
lww.waybill_status waybillStatus,
lww.agent agent,
lww.waybill_type waybillType,
lww.document_making_time documentMakingTime,
lww.create_time createTime,
lww.total_count totalCount,
lww.cost_piece costPiece,
lww.cost_zhang costZhang,
lww.cost_num costNum,
lww.total_freight totalFreight,
lww.delivery_fee deliveryFee,
lww.pickup_fee pickupFee,
lww.storage_fee storageFee,
lww.warehouse_management_fee warehouseManagementFee,
lww.sorting_fee sortingFee,
lww.handling_fee handlingFee,
lww.claiming_value claimingValue,
lww.rebate rebate,
lww.urgency urgency,
lww.receipt_num receiptNum,
lww.receipt receipt,
lww.transport_type transportType,
lww.third_operation_fee thirdOperationFee,
lww.pickup_complete_or_not pickupCompleteOrNot,
lww.trunkline_complete_or_not trunklineCompleteOrNot,
lww.freeze_status freezeStatus,
lww.freeze_user_name freezeUserName,
lww.freeze_time freezeTime,
lww.abolish_status abolishStatus,
lww.abolish_user_name abolishUserName,
lww.abolish_time abolishTime,
lww.sign_num signNum,
lww.sign_user_name signUserName,
lww.sign_time signTime,
lww.sign_check_user_name signCheckUserName,
lww.sign_check_time signCheckTime,
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime
from logpm_warehouse_waybill lww
where lww.is_deleted = 0
and lww.abolish_status = 0
<if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
and lww.id in (select l.id
from logpm_warehouse_waybill l
left join logpm_trunkline_waybill_track wt on wt.waybill_id = l.id
where (l.departure_warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
or l.destination_warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
or wt.warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>)
group by l.id)
</if>
<if test="param.waybillNoList != null">
and lww.waybill_no in
<foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and Locate(#{param.waybillNo},lww.waybill_no) > 0
</if>
<if test="param.orderNo != null and param.orderNo != ''">
and Locate(#{param.orderNo},lww.order_no) > 0
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0
</if>
<if test="param.customerTrain != null and param.customerTrain != ''">
and Locate(#{param.customerTrain},lww.customer_train) > 0
</if>
<if test="param.brand != null and param.brand != ''">
and Locate(#{param.brand},lww.brand) > 0
</if>
<if test="param.shipper != null and param.shipper != ''">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
<if test="param.shipperName != null and param.shipperName != ''">
and Locate(#{param.shipperName},lww.shipper_name) > 0
</if>
<if test="param.shipperMobile != null and param.shipperMobile != ''">
and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0
</if>
<if test="param.consignee != null and param.consignee != ''">
and Locate(#{param.consignee},lww.consignee) > 0
</if>
<if test="param.consigneeName != null and param.consigneeName != ''">
and Locate(#{param.consigneeName},lww.consignee_name) > 0
</if>
<if test="param.consigneeMobile != null and param.consigneeMobile != ''">
and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
</if>
<if test="param.destination != null and param.destination != ''">
and Locate(#{param.destination},lww.destination) > 0
</if>
<if test="param.completeDestination != null and param.completeDestination != ''">
and Locate(#{param.completeDestination},lww.complete_destination) > 0
</if>
<if test="param.departure != null and param.departure != ''">
and Locate(#{param.departure},lww.departure) > 0
</if>
<if test="param.completeDeparture != null and param.completeDeparture != ''">
and Locate(#{param.completeDeparture},lww.complete_departure) > 0
</if>
<if test="param.payType != null">
and lww.pay_type = #{param.payType}
</if>
<if test="param.payWay != null">
and lww.pay_way = #{param.payWay}
</if>
<if test="param.deliveryWay != null">
and lww.delivery_way = #{param.deliveryWay}
</if>
<if test="param.urgency != null">
and lww.urgency = #{param.urgency}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
</if>
<if test="param.waybillStatus != null">
and lww.waybill_status = #{param.waybillStatus}
</if>
<if test="param.pickupCompleteOrNot != null">
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
</if>
<if test="param.trunklineCompleteOrNot != null">
and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot}
</if>
<if test="param.documentMakingTimeStartDate != null">
and lww.document_making_time &gt;= #{param.documentMakingTimeStartDate}
</if>
<if test="param.documentMakingTimeEndDate != null">
and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
</if>
<if test="param.createTimeStartDate != null">
and lww.create_time &gt;= #{param.createTimeStartDate}
</if>
<if test="param.createTimeEndDate != null">
and lww.create_time &lt;= #{param.createTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and Locate(#{param.agent},lww.agent) > 0
</if>
<if test="param.goodsName != null and param.goodsName != ''">
and Locate(#{param.goodsName},lww.goods_name) > 0
</if>
<if test="param.freezeStatus != null">
and lww.freeze_status = #{param.freezeStatus}
</if>
<if test="param.abolishStatus != null">
and lww.abolish_status = #{param.abolishStatus}
</if>
<if test="param.remark != null and param.remark != ''">
and Locate(#{param.remark},lww.remark) > 0
</if>
<if test="param.consigneeAddress != null and param.consigneeAddress != ''">
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
</if>
<if test="param.totalCount != null">
and lww.total_count = #{param.totalCount}
</if>
<if test="param.totalWeight != null">
and lww.total_weight = #{param.totalWeight}
</if>
<if test="param.totalVolume != null">
and lww.total_volume = #{param.totalVolume}
</if>
<if test="param.abolishTimeStartDate != null">
and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
</if>
<if test="param.abolishTimeEndDate != null">
and lww.abolish_time &lt;= #{param.abolishTimeEndDate}
</if>
<if test="param.freezeTimeStartDate != null">
and lww.freeze_time &gt;= #{param.freezeTimeStartDate}
</if>
<if test="param.freezeTimeEndDate != null">
and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
</if>
<if test="param.checkStatus != null">
and IFNULL(lww.check_status,0) = #{param.checkStatus}
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
order by lww.create_time desc
</select>
</mapper>

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

@ -1,8 +1,12 @@
package com.logpm.warehouse.service;
import com.logpm.warehouse.entity.WarehouseWayBillDetail;
import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
public interface IWarehouseWayBillDetailAbolishService extends BaseService<WarehouseWayBillDetailAbolish> {
List<WarehouseWayBillDetail> findByWaybillIds(List<Long> ids);
}

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java
Unescape View File

@ -1,7 +1,13 @@
package com.logpm.warehouse.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.warehouse.dto.WarehouseWaybillDTO;
import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import org.springblade.core.mp.base.BaseService;
public interface IWarehouseWaybillAbolishService extends BaseService<WarehouseWaybillAbolishEntity> {
IPage<WarehouseWaybillVO> pageAbolishWaybillList(WarehouseWaybillDTO waybillDTO);
}

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

@ -97,4 +97,5 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
List<WarehouseWaybillEntity> findWaybillVOByOrderCode(String orderCode);
R updateWaybillTypeService(WarehouseWaybillDTO waybillDTO);
}

10
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.warehouse.service.impl;
import com.logpm.warehouse.entity.WarehouseWayBillDetail;
import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
import com.logpm.warehouse.mapper.WarehouseWayBillDetailAbolishMapper;
import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService;
@ -8,11 +9,16 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
@Slf4j
@AllArgsConstructor
@Service
public class WarehouseWayBillDetailAbolishServiceImpl extends BaseServiceImpl<WarehouseWayBillDetailAbolishMapper, WarehouseWayBillDetailAbolish> implements IWarehouseWayBillDetailAbolishService {
@Override
public List<WarehouseWayBillDetail> findByWaybillIds(List<Long> ids) {
return baseMapper.findByWaybillIds(ids);
}
}

70
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java
Unescape View File

@ -1,15 +1,85 @@
package com.logpm.warehouse.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.warehouse.dto.WarehouseWaybillDTO;
import com.logpm.warehouse.entity.WarehouseWayBillDetail;
import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
import com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper;
import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService;
import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.utils.CommonUtil;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@Slf4j
public class WarehouseWaybillAbolishServiceImpl extends BaseServiceImpl<WarehouseWaybillAbolishMapper, WarehouseWaybillAbolishEntity> implements IWarehouseWaybillAbolishService {
private final IWarehouseWayBillDetailAbolishService warehouseWayBillDetailAbolishService;
@Override
public IPage<WarehouseWaybillVO> pageAbolishWaybillList(WarehouseWaybillDTO waybillDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(waybillDTO.getPageNum());
page.setSize(waybillDTO.getPageSize());
waybillDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getDocumentMakingTimeStartStr()));
waybillDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getDocumentMakingTimeEndStr()));
waybillDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCreateTimeStartStr()));
waybillDTO.setCreateTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCreateTimeEndStr()));
waybillDTO.setAbolishTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getAbolishTimeStartStr()));
waybillDTO.setAbolishTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getAbolishTimeEndStr()));
waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
IPage<WarehouseWaybillVO> pageList = baseMapper.pageAbolishWaybillList(page, waybillDTO);
List<WarehouseWaybillVO> records = pageList.getRecords();
if (!records.isEmpty()) {
//把records中的id取出作为一个集合
List<Long> ids = records.stream().map(WarehouseWaybillVO::getId).collect(Collectors.toList());
List<WarehouseWayBillDetail> wayBillDetailList = warehouseWayBillDetailAbolishService.findByWaybillIds(ids);
//把wayBillDetailList通过waibillId分组
Map<Long, List<WarehouseWayBillDetail>> map = wayBillDetailList.stream().collect(Collectors.groupingBy(WarehouseWayBillDetail::getWaybillId));
for (WarehouseWaybillVO record : records) {
Long waybillId = record.getId();
if (!Objects.isNull(map.get(waybillId))){
List<WarehouseWayBillDetail> warehouseWayBillDetails = map.get(waybillId);
// 将集合 warehouseWayBillDetails 中的productName 按照， 进行拼接
String productNames = warehouseWayBillDetails.stream().filter(s -> StringUtil.isNotBlank(s.getProductName())).map(WarehouseWayBillDetail::getProductName).collect(Collectors.joining(","));
record.setGoodsName(productNames);
String productNum = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getNum())).map(s -> s.getNum().toString()).collect(Collectors.joining(","));
record.setProductNum(productNum);
String productPrice = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getPrice())).map(s -> s.getPrice().toString()).collect(Collectors.joining(","));
record.setProductPrice(productPrice);
// 对集合中的weight 进行求和
BigDecimal sumWeight = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getWeight())).map(WarehouseWayBillDetail::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
record.setTotalWeight(sumWeight);
BigDecimal productVolume = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getVolume())).map(WarehouseWayBillDetail::getVolume).reduce(BigDecimal.ZERO, BigDecimal::add);
record.setTotalVolume(productVolume);
record.setDetailList(warehouseWayBillDetails);
}
}
pageList.setRecords(records);
}
return pageList;
}
}

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

@ -37,6 +37,7 @@ import com.logpm.warehouse.entity.WarehouseWaybillEntity;
import com.logpm.warehouse.excel.WarehouseWaybillExcel;
import com.logpm.warehouse.mapper.WarehouseWaybillMapper;
import com.logpm.warehouse.service.IWarehouseWayBillDetailService;
import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
import com.logpm.warehouse.service.IWarehouseWaybillService;
import com.logpm.warehouse.vo.ExportWarehouseWaybillVO;
import com.logpm.warehouse.vo.FinanceWaybillExportVO;
@ -93,6 +94,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
private final IBasicPrintTemplateClient basicPrintTemplateClient;
private final IWarehouseWaybillAbolishService warehouseWaybillAbolishService;
@Override
public IPage<WarehouseWaybillVO> selectWarehouseWaybillPage(IPage<WarehouseWaybillVO> page, WarehouseWaybillVO warehouseWaybill) {
return page.setRecords(baseMapper.selectWarehouseWaybillPage(page, warehouseWaybill));
@ -1256,4 +1260,5 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
return R.success("修改成功");
}
}

Write Preview
Loading…
Cancel
Save