|
|
@@ -15,15 +15,10 @@
|
|
|
(SELECT GROUP_CONCAT(CONCAT(t3.`code`, "_", t2.product_name)) AS codeAPName
|
|
|
FROM pack_detail_product t2
|
|
|
LEFT JOIN contract t3 ON t2.contract_id = t3.id
|
|
|
- WHERE t2.pack_detail_id IN (GROUP_CONCAT(t1.id))) AS codeAPName,
|
|
|
- (SELECT GROUP_CONCAT(CONCAT(
|
|
|
- "{\"bomVolume\":",bom_volume,",",
|
|
|
- "\"boxLong\":",box_long,",",
|
|
|
- "\"boxWide\":",box_wide,",",
|
|
|
- "\"boxHigh\":",box_high,",",
|
|
|
- "\"roughWeight\":",rough_weight,",",
|
|
|
- "\"netWeight\":",net_weight,"}"
|
|
|
- )) FROM pack_detail WHERE id IN ( GROUP_CONCAT(t1.id)))AS dataJsonList,
|
|
|
+ WHERE FIND_IN_SET(t2.pack_detail_id,GROUP_CONCAT( t1.id ))) AS codeAPName,
|
|
|
+ (SELECT GROUP_CONCAT( CONCAT(
|
|
|
+ bom_volume, ",", box_long, ",", box_wide, ",", box_high, ",", rough_weight, ",", net_weight,",",pack_quantity,"_"
|
|
|
+ )) FROM pack_detail WHERE FIND_IN_SET(id,GROUP_CONCAT( t1.id )) ) AS dataJsonList,
|
|
|
sum(t1.pack_quantity) packQuantity,
|
|
|
sum(t1.net_weight) netWeight,
|
|
|
sum(t1.rough_weight) roughWeight,
|
caozj