From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入，判重兜底校验纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutLossOverService.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutLossOverService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutLossOverService.java
index 34192b4..62cfc9d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutLossOverService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutLossOverService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.InoutLossOver;
+import com.fzzy.igds.domain.InoutStockChange;
import com.fzzy.igds.mapper.InoutLossOverMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
@@ -53,21 +54,24 @@
inoutLossOverMapper.selectPage(page, queryWrapper);
}
+
/**
- * 鏌ヨ搴撳尯涓嬫墍鏈変俊鎭�
+ * 鏍规嵁鏃堕棿绫诲瀷锛岃幏鍙栨暟鎹�
+ * @param timeType
+ * @param param
* @return
*/
- public List<InoutLossOver> listData(String companyId, String deptId) {
+ public List<InoutLossOver> getDataByTime(String timeType, IgdsBaseParam param) {
+ if(StringUtils.isBlank(timeType)){
+ return null;
+ }
QueryWrapper<InoutLossOver> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(companyId)){
- queryWrapper.eq("company_id", companyId);
- }
- if(StringUtils.isNotBlank(deptId)){
- queryWrapper.eq("dept_id", deptId);
- }
- queryWrapper.orderByDesc("id");
+ queryWrapper.likeRight("dept_id", param.getDeptId());
+ queryWrapper.ge(timeType, param.getStart());
+ queryWrapper.le(timeType, param.getEnd());
+ queryWrapper.orderByAsc("loss_time");
return inoutLossOverMapper.selectList(queryWrapper);
}
--
Gitblit v1.9.3