Browse Source

装箱报关单,报关委托书数量问题处理

yzc 1 year ago
parent
commit
b0f1908749

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

@@ -432,7 +432,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                     //各项净重
                     //各项净重
                     object.put("netWeight", "");//暂无
                     object.put("netWeight", "");//暂无
                     //成交数量
                     //成交数量
-                    object.put("quantity", product.getQuantity());
+                    object.put("quantity", product.getSumQuantity());
                     //成交单位
                     //成交单位
                     object.put("unit", product.getProductUnit());
                     object.put("unit", product.getProductUnit());
                     //原产国(地区)
                     //原产国(地区)

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

@@ -36,12 +36,28 @@
         WHERE t1.documents_id = #{documentId}
         WHERE t1.documents_id = #{documentId}
     </select>
     </select>
     <select id="getMaxMoneyData" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">
     <select id="getMaxMoneyData" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">
-        SELECT
-            *
-        FROM
-                ( SELECT *, price * quantity AS sumAmount FROM documents_product  WHERE documents_id = #{documentId}) t1
-        ORDER BY
-            t1.sumAmount DESC
-            LIMIT 1
+        SELECT *
+        FROM (SELECT dp.id,
+                     dp.tenant_id,
+                     dp.documents_id,
+                     dp.business_id,
+                     dp.describes,
+                     dp.sub_describe,
+                     dp.customs_code,
+                     dp.price,
+                     sum(dp.quantity)            AS quantity,
+                     dp.contract_code,
+                     dp.product_name,
+                     dp.type,
+                     dp.del_flag,
+                     dp.update_time,
+                     dp.update_user,
+                     dp.create_user,
+                     dp.create_time,
+                     sum(dp.price * dp.quantity) AS sumAmount
+              FROM documents_product dp
+              WHERE dp.documents_id = #{documentId}
+              GROUP BY dp.describes) t1
+        ORDER BY t1.sumAmount DESC LIMIT 1
     </select>
     </select>
 </mapper>
 </mapper>