装箱单证数量问题处理

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/DocumentsProduct.java

@@ -1,13 +1,13 @@
 package com.fjhx.sale.entity.documents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 单证-产品表
@@ -97,4 +97,16 @@ public class DocumentsProduct extends BasePo {
     @TableField(exist = false)
     private Long packDetailId;
 
+    /**
+     * 装箱数
+     */
+    @TableField(exist = false)
+    private BigDecimal packQuantity;
+
+    /**
+     * 单证数量
+     */
+    @TableField(exist = false)
+    private BigDecimal sumQuantity;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -256,10 +256,6 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                 sumNetWeight = sumNetWeight.add(p.getNetWeight().multiply(p.getPackQuantity()));
                 sumBomVolume = sumBomVolume.add(p.getBomVolume().multiply(p.getPackQuantity()));
             }
-//            sumPackQuantity = packDetailList.stream().map(PackDetail::getPackQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
-//            sumRoughWeight = packDetailList.stream().map(PackDetail::getRoughWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
-//            sumNetWeight = packDetailList.stream().map(PackDetail::getNetWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
-//            sumBomVolume = packDetailList.stream().map(PackDetail::getBomVolume).reduce(BigDecimal.ZERO, BigDecimal::add);
 
             //查询收费项目
             String packDetailId = Arrays.asList(packShipment.getPackDetailIds().split(",")).get(0);

hx-sale/src/main/resources/mapper/documents/DocumentsProductMapper.xml

@@ -22,14 +22,17 @@
     </select>
 
     <select id="getDpList" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">
-        SELECT IFNULL(t2.quantity, t3.quantity)             as quantity,
+        SELECT IFNULL(t2.quantity, t3.quantity)             AS quantity,
                t1.*,
                t2.product_id                                   productId,
                IFNULL(t2.pack_detail_id, t3.pack_detail_id) AS packDetailId,
-               t3.unit                                      AS productUnit
+               t3.unit                                      AS productUnit,
+               pd.pack_quantity,
+               t1.quantity                                  as sumQuantity
         FROM documents_product t1
                  LEFT JOIN pack_detail_product t2 ON t1.business_id = t2.id
                  LEFT JOIN pack_detail_goods t3 ON t1.business_id = t3.id
+                 left join pack_detail pd on pd.id = IFNULL(t2.pack_detail_id, t3.pack_detail_id)
         WHERE t1.documents_id = #{documentId}
     </select>
     <select id="getMaxMoneyData" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">