出入库流水优化

hx-victoriatourist/src/main/resources/mapper/logistics/LogisticsInfosMapper.xml

@@ -51,7 +51,7 @@
                 </if>
                 LEFT JOIN bytesailing_base.sys_dept de ON
                 <if test="businessType neq 1 and businessType neq 5">
-                    pi.deptWdly = de.dept_id
+                    pi.deptIdWdly = de.dept_id
                 </if>
                 <if test="businessType eq 1 or businessType eq 5">
                      p.team_id=de.dept_id

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalDetailsServiceImpl.java

@@ -24,6 +24,7 @@ import com.fjhx.wms.service.arrival.ArrivalStockRecordsDetailsService;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsService;
 import com.fjhx.wms.service.stock.*;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +71,7 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
      * 分页公共参数
      */
     private IWrapper<StockJournalDetails> getPageWrapper(StockJournalSelectDto dto) {
+
         IWrapper<StockJournalDetails> wrapper = getWrapper();
         wrapper.eq("sj.op_type", dto.getOpType());
         wrapper.eq("sj.type", dto.getType());
@@ -91,6 +93,10 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         wrapper.ge("sjd",StockJournalDetails::getCreateTime,dto.getBeginTime());
         wrapper.le("sjd",StockJournalDetails::getCreateTime,dto.getEndTime());
 
+        //count方法手动赋值逻辑删除租户
+        wrapper.eq("sj.del_flag",0);
+        wrapper.eq("sj.tenant_id", SecurityUtils.getTenantId());
+
         //排序
         wrapper.orderByDesc("sjd", StockJournalDetails::getCreateTime);
 
@@ -101,8 +107,10 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
     public Page<StockJournalDetailsVo> getPage(StockJournalSelectDto dto) {
         IWrapper<StockJournalDetails> wrapper = getPageWrapper(dto);
 
+        Page<Object> page1 = dto.getPage();
+        page1.setCountId("getPageCount");
 
-        Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        Page<StockJournalDetailsVo> page = this.baseMapper.getPage(page1, wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {
             return page;

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.wms.mapper.stock.StockJournalDetailsMapper">
+    <select id="getPageCount" resultType="java.lang.Long">
+        SELECT
+            count( 1 )
+        FROM
+            stock_journal_details sjd
+                JOIN stock_journal sj ON sjd.stock_journal_id = sj.id
+                LEFT JOIN warehouse w ON sj.warehouse_id = w.id
+        ${ew.customSqlSegment}
+    </select>
     <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo">
         SELECT
             sjd.id,