From 92bc6dca274eb45dc330f63b5a3f90a01458e157 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 27 五月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java
index 53466da..fdcb8d4 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java
@@ -4,14 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.tms.entity.BaseTools;
-import org.jeecg.modules.tms.entity.ParaCommonTool;
import org.jeecg.modules.tms.entity.vo.*;
import org.jeecg.modules.tms.mapper.BaseToolsMapper;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Map;
@@ -137,4 +135,13 @@
queryWrapper.orderByDesc("t.create_time");
return this.baseMapper.paraBladeList(page, queryWrapper);
}
+ @Override
+ public IPage<StocktakingPoundVo> pageWithLedgerAndConfig(Page<StocktakingPoundVo> page, QueryWrapper<StocktakingPoundVo> queryWrapper) {
+ return baseMapper.pageWithLedgerAndConfig(page, queryWrapper);
+ }
+
+ @Override
+ public IPage<SharpeeningVo> pageWithSharpedAndConfig(Page<SharpeeningVo> page, QueryWrapper<SharpeeningVo> queryWrapper) {
+ return baseMapper.pageWithSharpedAndConfig(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3