|
|
@ -41,14 +41,15 @@ |
|
|
|
s.billState, |
|
|
|
s.noticeState, |
|
|
|
( SELECT IFNULL( SUM( count ), 0 ) FROM sms_sales_bill_detail AS d WHERE d.billSid = s.sid ) goodsTotalCount, |
|
|
|
CONCAT( p.remarks, '/', s.remarks ) remarksOnlineSys, |
|
|
|
CONCAT(IFNULL(p.remarks,''),'/', IFNULL(s.remarks,'')) remarksOnlineSys, |
|
|
|
p.buyerMessage, |
|
|
|
s.warehouseName, |
|
|
|
l.deliveryTypeValue, |
|
|
|
l.logisticsName, |
|
|
|
l.logisticsCost, |
|
|
|
sp.buyserID, |
|
|
|
CONCAT( p.shipperName, p.shipperMob, p.deliveryProvince, p.deliveryCity, p.deliveryCounty, p.deliveryAddress ) deliveryAddress, |
|
|
|
CONCAT( IFNULL(p.shipperName,''), IFNULL(p.shipperMob,''), IFNULL(p.deliveryProvince,''), IFNULL(p.deliveryCity,''), |
|
|
|
IFNULL(p.deliveryCounty,''), IFNULL(p.deliveryAddress ,'')) as deliveryAddress, |
|
|
|
a.realPay, |
|
|
|
a.discountAmount, |
|
|
|
a.dueAmount, |
|
|
|