Skip to content

J
jiedao-api-boot-master
Commit 96f12926 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into dev

parents 87cfb3cf 75d16855
Expand all Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/resources/mapper/MakeBillOfLadingMapper.xml
View file @ 96f12926
......@@ -14,7 +14,7 @@
t.order_no as orderNo,
t.customs_type,
t.drawee as draweeCode,
(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type=1 and c.deleted=0) as specialPriceCount,
(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type in (1,31) and c.deleted=0) as specialPriceCount,
(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type=4 and c.deleted=0) as heavyDiscount,
t.is_cargo_control as isCargoControl,
t.sum_num as num,(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment