Browse Source

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

dist.1.2.0^2
pref_mail@163.com 5 months ago
parent
commit
526a1f776e
  1. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml

4
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml

@ -186,7 +186,7 @@
forklift_fee,
add_value_fee,
amountToFee,
createdTime created_time
created_time
from (select obj.pickup_batch,
lww.name as warehouse,
lww.id as warehouse_id,
@ -223,7 +223,7 @@
fee.addValueFee add_value_fee,
fee.collectPaymentFee + fee.transportFee + fee.storageFee + fee.forkliftFee +
fee.addValueFee amountToFee,
obj.pick_up_time createdTime
obj.pick_up_time created_time
from logpm_distrilbution_bill_lading obj
left join logpm_warehouse_warehouse lww on lww.id = obj.warehouse_id
left join logpm_distribution_stock_article ldsa on ldsa.id = obj.stock_article_id

Loading…
Cancel
Save