Browse Source

2023年5月17日15:16:27 仓储分析合计重量双倍问题

纪新园 2 years ago
parent
commit
a32b23e9bd

+ 3 - 3
ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -763,11 +763,11 @@
             </foreach>
         </if>
         ) TWBI ON TWBI.f_mblno = TW.f_mblno
-        LEFT JOIN t_warehousebills TWB ON TWB.f_mblno = TW.f_mblno
-        LEFT JOIN t_warehousebillsitems TWBI ON TWBI.f_pid = TWB.f_id
+
         <where>
             TW.del_flag = '0'
-            AND (TWB.f_ifpledge != 0 or TWB.f_ifpledge IS NULL)
+            and TW.f_netweightblc != 0
+            AND (TWBI.f_ifpledge != 0 or TWBI.f_ifpledge IS NULL)
             <if test="ownerName != null and ownerName != ''">
                 and TC.f_name = #{ownerName}
             </if>

+ 1 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsNewMapper.xml

@@ -56,6 +56,7 @@
     <select id="selectWarehouseBillItemsList" parameterType="TWarehousebillsitemsNew" resultMap="TWarehousebillsitemsNewResult">
         <include refid="selectTWarehousebillsitemsNewVo"/>
         <where>
+            b.f_netweight != 0
             <if test="fBilltype != null ">and a.f_billtype = #{fBilltype}</if>
             <if test="isCalculateStorageFees != null ">and a.is_calculate_storage_fees = #{isCalculateStorageFees}</if>
             <if test="fCorpid != null">and b.f_corpid = #{fCorpid}</if>