添加单票分析查询数据重复问题

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/FtmsorderbillscarsExcel.java

@@ -5,6 +5,9 @@ import com.ruoyi.common.annotation.Excel;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * 状态跟踪列表信息
+ */
 public class FtmsorderbillscarsExcel {
     private Long id;
 

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1703,6 +1703,7 @@
             w.f_qty fQty,
             w.f_cntval fCntval,
             w.f_planqty fPlanqty,
+            t.f_name fWarehouseName,
             w.f_planvolumn fPlanvolumn,
             w.f_plannetweight fPlannetweight,
             w.f_plangrossweight fPlangrossweight,
@@ -1777,10 +1778,10 @@
 
     <select id="selectSingleAnalysis" parameterType="com.ruoyi.reportManagement.domain.SingleAnalysisExcel" resultType="com.ruoyi.reportManagement.domain.SingleAnalysisExcel">
         SELECT
+        DISTINCT
             c.f_name corpName,
             #{fMblno} fMblno,
             w.f_product_name goodsName,
-            @ii := @ii + 1 lineNo,
             d.dict_label fBusinessType,
             w.f_cntval fCntval,
             IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' || item.f_billtype = 'CKDB', date_format( item.f_bsdate, '%Y-%m-%d' ), NULL ) inBsdate,
@@ -1809,8 +1810,7 @@
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
             LEFT JOIN t_corps c ON c.f_id = w.f_corpid
             LEFT JOIN t_warehouse ware ON ware.f_id = item.f_warehouselocid
-            LEFT JOIN sys_dict_data d ON d.dict_value = item.f_business_type,
-            ( SELECT @ii := 0 ) AS ii
+            LEFT JOIN sys_dict_data d ON d.dict_value = item.f_business_type
         WHERE
             w.f_corpid = #{fCorpid}
             AND item.f_mblno = #{fMblno}
@@ -1827,7 +1827,7 @@
 
     <select id="selectSingleAnalysisFees" parameterType="com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel" resultType="com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel">
         SELECT
-            @ii := @ii + 1 lineNo,
+        DISTINCT
             date_format( f.create_time, '%Y-%m-%d' ) createTime,
             d.dict_label fBusinessType,
             fee.f_name fFeeid,
@@ -1841,8 +1841,7 @@
             LEFT JOIN t_warehousebillsfees f ON f.f_pid = w.f_id
             LEFT JOIN t_fees fee ON fee.f_id = f.f_feeid
             LEFT JOIN t_warehouse ware ON ware.f_id = item.f_warehouselocid
-            LEFT JOIN sys_dict_data d ON d.dict_value = f.f_business_type,
-            ( SELECT @ii := 0 ) AS ii
+            LEFT JOIN sys_dict_data d ON d.dict_value = f.f_business_type
         WHERE
             item.f_mblno = #{fMblno}
             AND d.dict_type = 'st_in_type'