From 2fcf73e5783a7a06dd4d4e6f412b9f759a7230c1 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:22:06 +0800
Subject: [PATCH] 调整出入库配置
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
index 255b959..67fa188 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
-import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.mapper.DepotConfMapper;
import com.fzzy.igds.utils.ContextUtil;
@@ -13,6 +12,7 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,8 +32,6 @@
@Resource
private DepotConfMapper depotConfMapper;
@Resource
- private DepotService depotService;
- @Resource
private RedisCache redisCache;
/**
@@ -51,7 +49,7 @@
QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", companyId);
- if(StringUtils.isNotBlank(deptId)){
+ if (StringUtils.isNotBlank(deptId)) {
queryWrapper.eq("dept_id", deptId);
}
return depotConfMapper.selectList(queryWrapper);
@@ -66,30 +64,36 @@
SysUser user = ContextUtil.getLoginUser();
QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company_id", user.getCompanyId());
+
//鐩戠鐢ㄦ埛-榛樿鏌ョ湅鎵�鏈変俊鎭笉澧炲姞鏉′欢
if (Constant.USER_TYPE_10.equals(user.getUserType())) {
+ queryWrapper.eq("company_id", user.getCompanyId());
//涓嶅鍔犳潯浠�
+ }
+
+ //搴撳尯鐢ㄦ埛锛屽鏋滄槸鍏徃鐢ㄦ埛鍙互鏌ョ湅鍏徃涓嬪睘鎵�鏈夊簱鍖猴紝濡傛灉涓哄綋鍓嶅簱鍖哄彧鏌ヨ褰撳墠搴撳尯
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ queryWrapper.eq("company_id", user.getCompanyId());
+
+ if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
+ queryWrapper.eq("dept_id", user.getDeptId() + "");
+ } else {
+ queryWrapper.likeRight("dept_id", user.getDeptId() + "");
+ }
}
//閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
if (Constant.USER_TYPE_20.equals(user.getUserType())) {
- return this.getDeptByContract(user.getUserData());
+ if(StringUtils.isBlank(user.getUserData())) return null;
+
+ queryWrapper.eq("d.company_id", user.getCompanyId());
+ queryWrapper.eq("c.pledge_bank", user.getUserData());
+ return depotConfMapper.selectByBank(queryWrapper);
}
-
-
-
-
- return null;
- }
-
- private List<DepotConf> getDeptByContract(String userData) {
-
- //TODO
- return null;
+ return depotConfMapper.selectList(queryWrapper);
}
/**
@@ -112,7 +116,7 @@
conf.setUpdateBy(ContextUtil.getLoginUserName());
conf.setUpdateTime(new Date());
depotConfMapper.insert(conf);
- }else {
+ } else {
conf.setUpdateBy(ContextUtil.getLoginUserName());
conf.setUpdateTime(new Date());
depotConfMapper.update(conf, new UpdateWrapper<DepotConf>().eq("depot_id", conf.getDepotId()));
@@ -127,7 +131,7 @@
* @return
*/
public void deleteDepotConf(DepotConf conf) {
- depotConfMapper.deleteById( conf);
+ depotConfMapper.deleteById(conf);
//鍒犻櫎閰嶇疆缂撳瓨
this.delCacheDepotConf(conf, conf.getCompanyId());
--
Gitblit v1.9.3