caozj пре 1 година
родитељ
комит
02620aed06

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackDetailVo.java

@@ -18,4 +18,9 @@ public class PackDetailVo extends PackDetail {
      * 合同编码+产品名称
      */
     private String codeAPName;
+
+    /**
+     * 装箱明细数据JSON
+     */
+    private String dataJsonList;
 }

+ 8 - 0
hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -16,6 +16,14 @@
                       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,
                      sum(t1.pack_quantity)                                 packQuantity,
                      sum(t1.net_weight)                                    netWeight,
                      sum(t1.rough_weight)                                  roughWeight,