1.仓储业务：入、出、货转、调拨、通关、直装、仓储费，增加当前登录用户比对，传递isCreate参数，方便实现谁创建，谁删除，非超级管理员无法删除非自己创建的数据

2.调整单票分析导出逻辑

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWhgenlegController.java

@@ -127,21 +127,22 @@ public class TWhgenlegController extends BaseController {
      */
     @GetMapping(value = "/exportSingleAnalysis")
     public AjaxResult exportSingleAnalysis(SingleAnalysisExcel singleAnalysisExcel) {
-        if (StringUtils.isNull(singleAnalysisExcel.getfCorpid()) || StringUtils.isEmpty(singleAnalysisExcel.getfMblno())) {
+        if (StringUtils.isNotNull(singleAnalysisExcel.getfCorpid()) || StringUtils.isNotNull(singleAnalysisExcel.getfMblno()) || StringUtils.isNotNull(singleAnalysisExcel.getfEmblno())) {
+            List<SingleAnalysisExcel> list = tWhgenlegService.selectSingleAnalysis(singleAnalysisExcel);
+            if (StringUtils.isEmpty(list)) {
+                return AjaxResult.error("数据为空");
+            }
+            Map<String, Object> map = new HashMap<>();
+            if (StringUtils.isNotEmpty(list)) {
+                map.put("mblno", list.get(0).getfMblno());
+                map.put("corpName", list.get(0).getCorpName());
+                map.put("goodsName", list.get(0).getGoodsName());
+            }
+            ExcelUtil<SingleAnalysisExcel> util = new ExcelUtil<SingleAnalysisExcel>(SingleAnalysisExcel.class);
+            return util.singleAnalysisExportExcel(list, map, "单票分析");
+        } else {
             return AjaxResult.error("未找到查询条件信息");
         }
-        List<SingleAnalysisExcel> list = tWhgenlegService.selectSingleAnalysis(singleAnalysisExcel);
-        if (StringUtils.isEmpty(list)) {
-            return AjaxResult.error("数据为空");
-        }
-        Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotEmpty(list)) {
-            map.put("mblno", list.get(0).getfMblno());
-            map.put("corpName", list.get(0).getCorpName());
-            map.put("goodsName", list.get(0).getGoodsName());
-        }
-        ExcelUtil<SingleAnalysisExcel> util = new ExcelUtil<SingleAnalysisExcel>(SingleAnalysisExcel.class);
-        return util.singleAnalysisExportExcel(list, map, "单票分析");
     }
 
     /**
@@ -149,15 +150,16 @@ public class TWhgenlegController extends BaseController {
      */
     @GetMapping(value = "/exportSingleAnalysisFees")
     public AjaxResult exportSingleAnalysisFees(SingleAnalysisExcel singleAnalysisExcel) {
-        if (StringUtils.isNull(singleAnalysisExcel.getfCorpid()) || StringUtils.isEmpty(singleAnalysisExcel.getfMblno())) {
+        if (StringUtils.isNotNull(singleAnalysisExcel.getfCorpid()) || StringUtils.isNotNull(singleAnalysisExcel.getfMblno()) || StringUtils.isNotNull(singleAnalysisExcel.getfEmblno())) {
+            List<SingleAnalysisFeesExcel> list = tWhgenlegService.selectSingleAnalysisFees(singleAnalysisExcel);
+            if (StringUtils.isEmpty(list)) {
+                return AjaxResult.error("数据为空");
+            }
+            ExcelUtil<SingleAnalysisFeesExcel> util = new ExcelUtil<SingleAnalysisFeesExcel>(SingleAnalysisFeesExcel.class);
+            return util.singleAnalysisFeesExportExcel(list, "单票分析费用");
+        } else {
             return AjaxResult.error("未找到查询条件信息");
         }
-        List<SingleAnalysisFeesExcel> list = tWhgenlegService.selectSingleAnalysisFees(singleAnalysisExcel);
-        if (StringUtils.isEmpty(list)) {
-            return AjaxResult.error("数据为空");
-        }
-        ExcelUtil<SingleAnalysisFeesExcel> util = new ExcelUtil<SingleAnalysisFeesExcel>(SingleAnalysisFeesExcel.class);
-        return util.singleAnalysisFeesExportExcel(list, "单票分析费用");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TStorageFeeCalculationController.java

@@ -50,7 +50,9 @@ public class TStorageFeeCalculationController extends BaseController {
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
         tWarehouseBills.setfBilltype("JSCCF");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        // 获取登录用户数据
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessListAddUser(tWarehouseBills,loginUser);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -46,7 +46,9 @@ public class TWarehouseGoodsTransferController extends BaseController {
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
         tWarehouseBills.setfBilltype("HQZY");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        // 获取登录用户数据
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessListAddUser(tWarehouseBills,loginUser);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInAndOutStockController.java

@@ -45,7 +45,9 @@ public class TWarehouseInAndOutStockController extends BaseController {
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
         tWarehouseBills.setfBilltype("CDZZ");//场地直装的单据类型编码
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        // 获取登录用户数据
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessListAddUser(tWarehouseBills,loginUser);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -75,7 +75,9 @@ public class TWarehouseInStockController extends BaseController {
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
         tWarehouseBills.setfBilltype("SJRK");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        // 获取登录用户数据
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessListAddUser(tWarehouseBills,loginUser);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -46,7 +46,9 @@ public class TWarehouseOutStockController extends BaseController {
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
         startPage();
         tWarehouseBills.setfBilltype("SJCK");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        // 获取登录用户数据
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessListAddUser(tWarehouseBills,loginUser);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -49,7 +49,9 @@ public class TWarehouseStockTransferController extends BaseController {
         }else{
             tWarehouseBills.setfBilltype("HWTG");
         }
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        // 获取登录用户数据
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessListAddUser(tWarehouseBills,loginUser);
         return getDataTable(list);
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -57,6 +57,14 @@ public interface ITWarehouseBillsService {
     public List<Map<String, Object>> selectWarehouseBusinessList(TWarehouseBills tWarehousebills);
 
     /**
+     * 查询详情主表列表 为其加入 当前登入用户，用于比对
+     * @param tWarehousebills 详情主表
+     * @param user 当前登录的用户
+     * @return
+     */
+    public List<Map<String, Object>> selectWarehouseBusinessListAddUser(TWarehouseBills tWarehousebills,LoginUser user);
+
+    /**
      * 查询详情主表列表
      *
      * @param tWarehousebills 详情主表

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -216,8 +216,8 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
     /**
      * 新增
      *
-     * @param agreement
-     * @param agreementitems
+     * @param agreement 仓储费对象
+     * @param agreementitems 仓储费明细表对象
      * @param loginUser
      * @return
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -481,6 +481,107 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
     }
 
+    @Override
+    public List<Map<String, Object>> selectWarehouseBusinessListAddUser(TWarehouseBills tWarehousebills, LoginUser user) {
+        if (tWarehousebills.getfBilltype().equals(WarehouseTypeEnum.JSCCF.getType())) {
+            List<Map<String, Object>> mapList = tWarehouseBillsMapper.selecStorageFeeList(tWarehousebills);
+            if (CollectionUtils.isNotEmpty(mapList)) {
+                mapList.forEach(li -> {
+                    li.put("fBillstatus", WarehouseTypeEnum.fromTypeAndBusinessType(li.get("fBillstatus").toString(), "storageStatus").getName());
+                });
+            }
+            for (Map<String,Object> map : mapList) {
+                // 获取该数据创建人
+                String createBy = (String) map.get("createBy");
+                // 获取当前登录人用户名
+                String userName = user.getUser().getUserName();
+                // 如果当前登录者是超级管理员
+                if ("admin".equals(userName)) {
+                    map.put("isCreate",0);// 设置状态为 0
+                } else { // 非超级管理员
+                    // 比对，如果当前数据发布者与登录人一致
+                    if (userName.equals(createBy)) {
+                        map.put("isCreate",1);// 状态设为 1
+                    } else { // 不一致，则为 2
+                        map.put("isCreate",2);
+                    }
+                }
+            }
+            return mapList;
+        } else if (tWarehousebills.getfBilltype().equals(WarehouseTypeEnum.HQZY.getType())) {
+            List<Map<String,Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList1(tWarehousebills);
+            for (Map<String,Object> map : list) {
+                // 获取该数据创建人
+                String createBy = (String) map.get("createBy");
+                // 获取当前登录人用户名
+                String userName = user.getUser().getUserName();
+                // 如果当前登录者是超级管理员
+                if ("admin".equals(userName)) {
+                    map.put("isCreate",0);// 设置状态为 0
+                } else { // 非超级管理员
+                    // 比对，如果当前数据发布者与登录人一致
+                    if (userName.equals(createBy)) {
+                        map.put("isCreate",1);// 状态设为 1
+                    } else { // 不一致，则为 2
+                        map.put("isCreate",2);
+                    }
+                }
+            }
+            return list;
+        } else {
+            List<Map<String, Object>> billsList = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
+
+            for (Map<String, Object> billsMap : billsList) {
+                // 获取该数据创建人
+                String createBy = (String) billsMap.get("createBy");
+                // 获取当前登录人用户名
+                String userName = user.getUser().getUserName();
+                // 如果当前登录者是超级管理员
+                if ("admin".equals(userName)) {
+                    billsMap.put("isCreate",0);// 设置状态为 0
+                } else { // 非超级管理员
+                    // 比对，如果当前数据发布者与登录人一致
+                    if (userName.equals(createBy)) {
+                        billsMap.put("isCreate",1);// 状态设为 1
+                    } else { // 不一致，则为 2
+                        billsMap.put("isCreate",2);
+                    }
+                }
+                // 查询箱型、箱量表
+                TWarehousebillsCntr cntr = new TWarehousebillsCntr();
+                cntr.setfPid(Long.parseLong(billsMap.get("fId").toString()));
+                List<TWarehousebillsCntr> cntrList = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(cntr);
+
+                // 创建map统计箱型箱量
+                Map<String, Long> countMap = new HashMap<>();
+                for (TWarehousebillsCntr temp : cntrList) {
+                    String cntrName = temp.getCntrName();
+                    Long fCntrcount = temp.getfCntrcount();
+                    if (StringUtils.isNotNull(cntrName) && StringUtils.isNotNull(fCntrcount)) {
+                        if (countMap.containsKey(cntrName)) {
+                            countMap.put(cntrName, countMap.get(cntrName) + fCntrcount);
+                        } else {
+                            countMap.put(cntrName, fCntrcount);
+                        }
+                    }
+                }
+
+                // 组装返回
+                String fCntval = "";
+                if (countMap.size() > 0) {
+                    StringBuilder sb = new StringBuilder();
+                    for (String key : countMap.keySet()) {
+                        sb.append(key).append("×").append(countMap.get(key)).append("，");
+                    }
+                    fCntval = sb.deleteCharAt(sb.length() - 1).toString();
+                }
+                billsMap.put("fCntval", fCntval);
+            }
+
+            return billsList;
+        }
+    }
+
     /**
      * 查询详情主表列表
      *

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -651,6 +651,7 @@
             <if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and wh.f_goodsid = #{warehouse.fGoodsid}</if>
             <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and wh.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
             <if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and wh.f_warehouseid = #{warehouse.fWarehouseid}</if>
+            <if test="warehouse.fTrademodeid != null and warehouse.fTrademodeid != ''">and wh.f_trademodeid = #{warehouse.fTrademodeid}</if>
         </where>
     </select>
 

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

@@ -2844,7 +2844,7 @@
         SELECT
         DISTINCT
             c.f_name corpName,
-            #{fMblno} fMblno,
+            w.f_mblno fMblno,
             w.f_product_name goodsName,
             w.f_emblno fEmblno,
             d.dict_label fBusinessType,
@@ -2852,33 +2852,33 @@
             ware.f_warehouse_information fWName,
             dict.dict_label AS fBusinessTypes,
             w.f_marks AS fMarks,
-            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_tocorpid = #{fCorpid} || item.f_billtype = 'CKDB', date_format( item.f_bsdate, '%Y-%m-%d' ), NULL) inBsdate,
-            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_tocorpid = #{fCorpid} || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_qty, 0) inQty,
-            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid} || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_grossweight, 0.00) inGrossweight,
-            IF(item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, date_format( item.f_bsdate, '%Y-%m-%d' ), NULL ) outBsdate,
-            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, item.f_qty, 0 ) outQty,
-            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, item.f_grossweight, 0.00 ) outGrossweight,
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' || item.f_billtype = 'CKDB', date_format( item.f_bsdate, '%Y-%m-%d' ), NULL) inBsdate,
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_qty, 0) inQty,
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_grossweight, 0.00) inGrossweight,
+            IF(item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY', date_format( item.f_bsdate, '%Y-%m-%d' ), NULL ) outBsdate,
+            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY', item.f_qty, 0 ) outQty,
+            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY', item.f_grossweight, 0.00 ) outGrossweight,
             CASE
-                WHEN item.f_billtype = 'SJRK' THEN
-                '入库'
-                WHEN item.f_billtype = 'SJCK' THEN
-                '出库'
-                WHEN item.f_billtype = 'CKDB' and ware.f_charg = 1 THEN
-                '调拨'
-                WHEN item.f_billtype = 'HQZY' THEN
-                '货权转移'
-                WHEN item.f_billtype = 'HWTG' THEN
-                '货物通关'
+            WHEN item.f_billtype = 'SJRK' THEN
+            '入库'
+            WHEN item.f_billtype = 'SJCK' THEN
+            '出库'
+            WHEN item.f_billtype = 'CKDB' and ware.f_charg = 1 THEN
+            '调拨'
+            WHEN item.f_billtype = 'HQZY' THEN
+            '货权转移'
+            WHEN item.f_billtype = 'HWTG' THEN
+            '货物通关'
             END AS fBilltype,
             (
-            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_tocorpid = #{fCorpid} || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_qty, 0)
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_qty, 0)
             -
-            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, item.f_qty, 0 )
+            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY', item.f_qty, 0 )
             ) AS fQtyblc,
             (
-            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid} || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_grossweight, 0.00)
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_grossweight, 0.00)
             -
-            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, item.f_grossweight, 0.00 )
+            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY', item.f_grossweight, 0.00 )
             ) AS fGrossweightblc,
             item.f_truckno fTruckno,
             tf.f_billing_days fBillingDays,
@@ -3216,14 +3216,17 @@
 
     <select id="selecStorageFeeList" resultType="Map">
         SELECT DISTINCT w.f_id AS fId, w.f_billno AS fBillno, corp.f_name AS fCorpid, w.f_billing_deadline AS fBillingDeadline, w.remark,
-                        w.f_billstatus AS fBillstatus, w.create_by AS createBy, w.create_time AS createTime, w.f_fee_status fFeeStatus
+                        w.f_billstatus AS fBillstatus, w.create_by AS createBy, w.create_time AS createTime, w.f_fee_status fFeeStatus,
+                        w.f_trademodeid AS fTrademodeid,dict.dict_label AS fTrademodeName
         FROM t_warehousebills w LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
             LEFT JOIN t_corps corp ON corp.f_id = w.f_corpid
             left join sys_user u on w.create_by = u.user_name
             left join sys_user u1 on w.f_storekeeper = u1.user_name
             left join sys_dept d on w.f_bsdeptid = d.dept_id
+            LEFT JOIN sys_dict_data dict ON dict.dict_value = w.f_trademodeid
         <where>
             w.f_billtype = 'JSCCF'
+            and dict.dict_type = 'data_trademodes'
             <if test="fFeeStatus != null and fFeeStatus != ''">and w.f_fee_status = #{fFeeStatus}</if>
             <if test="fBillstatus != null and fBillstatus != ''">and w.f_billstatus = #{fBillstatus}</if>
             <if test="fMarks != null and fMarks != ''">and w.f_marks = #{fMarks}</if>
@@ -3234,6 +3237,7 @@
             <if test="fBillno != null and fBillno != ''">and w.f_billno like concat('%', #{fBillno}, '%')</if>
             <if test="fMblno != null and fMblno != ''">and w.f_mblno like concat('%', #{fMblno}, '%')</if>
             <if test="fCorpid != null and fCorpid != ''">and w.f_corpid = #{fCorpid}</if>
+            <if test="fTrademodeid != null and fTrademodeid != ''">and w.f_trademodeid = #{fTrademodeid}</if>
         </where>
             ${params.dataScope}
             ORDER BY w.f_bsdate DESC, w.f_bstime DESC,w.f_id DESC,w.f_billstatus

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

@@ -595,6 +595,7 @@
             and IF(item.f_billingway = '7', leg.f_qtyblc = 0, leg.f_qtyblc >= 0)
             <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.fTrademodeid != null and warehouse.fTrademodeid != ''">and ware.f_trademodeid = #{warehouse.fTrademodeid}</if>
             <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and item.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
             <if test="warehouse.fShipper != null and warehouse.fShipper != ''">and item.f_shipper like concat('%',#{warehouse.fShipper},'%')</if>
         </where>