Browse Source

修复仓储费详情页提单号检索不准确

Sun 3 năm trước cách đây
mục cha
commit
95af0c7429

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWareHouseExcelItems.java

@@ -77,7 +77,7 @@ public class TWareHouseExcelItems {
     private String  remark;
 
     /** 计费日期 */
-    @Excel(name = "计费日期")
+    @Excel(name = "计费详情")
     private String  priceDateRemarks;
 
     public String getPriceDateRemarks() {

+ 3 - 3
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -533,7 +533,7 @@
                 item.f_billstatus = 6)
             <if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and item.f_goodsid = #{warehouse.fGoodsid}</if>
             <if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and ware.f_warehouseid = #{warehouse.fWarehouseid}</if>
-            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and ware.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
+            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and item.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
         </where>
     </select>
 
@@ -575,7 +575,7 @@
                 item.f_billstatus = 6)
             <if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and item.f_goodsid = #{warehouse.fGoodsid}</if>
             <if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and ware.f_warehouseid = #{warehouse.fWarehouseid}</if>
-            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and ware.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
+            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and item.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
         </where>
     </select>
 
@@ -952,4 +952,4 @@
         WHERE f_pid = #{pId}
     </update>
 
-</mapper>
+</mapper>