|
|
@@ -705,12 +705,14 @@
|
|
|
TW.f_mblno AS warehouseSerialNumber,
|
|
|
TW.f_originalbilldate AS originalWarehousingDate,
|
|
|
TG.f_name AS cargoName,
|
|
|
- (CASE
|
|
|
- TWBI.f_business_type
|
|
|
- WHEN '2' THEN
|
|
|
- TWBI.f_marks ELSE ''
|
|
|
- END) AS cargoModel,
|
|
|
- TG.f_specs AS cargoSpec,
|
|
|
+ TW.f_marks AS cargoModel,
|
|
|
+ (
|
|
|
+ CASE
|
|
|
+ TWBI.f_business_type
|
|
|
+ WHEN '2' THEN
|
|
|
+ TWBI.f_marks
|
|
|
+ ELSE '' END
|
|
|
+ ) AS cargoSpec,
|
|
|
SUM( TW.f_qtyblc ) AS cargoQuantity,
|
|
|
IFNULL( ROUND( SUM( TW.f_netweightblc ) / 1000, 2 ), 0 ) AS netWeight,
|
|
|
IFNULL( ROUND( SUM( TW.f_grossweightblc ) / 1000, 2 ), 0 ) AS grossWeight,
|
|
|
@@ -733,7 +735,7 @@
|
|
|
TG.f_packagespecs AS packing,
|
|
|
'' AS country,
|
|
|
'' AS process,
|
|
|
- TWH.f_warehouse_information AS location
|
|
|
+ TWBI.f_warehouse_information AS location
|
|
|
FROM t_whgenleg TW
|
|
|
LEFT JOIN t_goods TG ON TG.f_id = TW.f_goodsid
|
|
|
LEFT JOIN t_warehouse TWH ON TW.f_warehouseid = TWH.f_id
|
wangzhuo