From 457c87c165739e37d72ce5c2b02fd27e05a75d6a Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 18 十二月 2025 11:05:44 +0800
Subject: [PATCH] 数量检测报表提交
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java | 96 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
index b50bdb5..7ddcb88 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
@@ -1,13 +1,20 @@
package com.fzzy.igds.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.RedisConst;
+import com.fzzy.igds.data.QuantityParam;
+import com.fzzy.igds.domain.Quantity;
import com.fzzy.igds.domain.QuantityConf;
-import com.fzzy.igds.repository.QuantityConfRepository;
+import com.fzzy.igds.mapper.QuantityConfMapper;
+import com.fzzy.igds.mapper.QuantityMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.redis.RedisCache;
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;
@@ -24,12 +31,45 @@
public class QuantityService {
@Resource
- private QuantityConfRepository quantityConfRepository;
+ private QuantityConfMapper quantityConfMapper;
@Resource
private RedisCache redisCache;
+ @Resource
+ private QuantityMapper quantityMapper;
+
/**
- * JPA - 鏌ヨ閰嶇疆淇℃伅锛屾牴鎹簱鍖虹紪鐮佽幏鍙�
+ * 鍒嗛〉鏌ヨ璐ㄩ噺妫�娴嬫暟鎹�
+ *
+ * @author sgj
+ * @date 2025/12/18
+ */
+ public void listPageQuantity(Page<Quantity> page, QuantityParam param) {
+ QueryWrapper<Quantity> queryWrapper = new QueryWrapper<>();
+
+ param.setCompanyId(ContextUtil.getCompanyId());
+ param.setDeptId(ContextUtil.subDeptId(null));
+ queryWrapper.eq("company_id", param.getCompanyId());
+ queryWrapper.eq("dept_id", param.getDeptId());
+
+ //浠撳簱妫�绱�
+ if (StringUtils.isNotBlank(param.getDepotId())) {
+ queryWrapper.eq("depot_id", param.getDepotId());
+ }
+ //鏃堕棿妫�绱�
+ if(param.getStart() != null){
+ queryWrapper.ge("receive_date", param.getStart());
+ }
+ if(param.getEnd() != null){
+ queryWrapper.le("receive_date", param.getEnd());
+ }
+ queryWrapper.orderByAsc("receive_date");
+ quantityMapper.selectPage(page, queryWrapper);
+
+ }
+
+ /**
+ * 鏌ヨ閰嶇疆淇℃伅锛屾牴鎹簱鍖虹紪鐮佽幏鍙�
*
* @param companyId
* @param deptId
@@ -39,15 +79,22 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
-
if (StringUtils.isEmpty(deptId)) {
deptId = ContextUtil.subDeptId(null);
}
- return quantityConfRepository.listQuantityConf(companyId, deptId);
+
+ QueryWrapper<QuantityConf> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("company_id", companyId);
+ if (StringUtils.isNotBlank(deptId)) {
+ queryWrapper.eq("dept_id", deptId);
+ }
+ queryWrapper.orderByAsc("order_num");
+
+ return quantityConfMapper.selectList(queryWrapper);
}
/**
- * JPA - 鏌ヨ閰嶇疆淇℃伅锛屾牴鎹粍缁囩紪鐮佽幏鍙�
+ * - 鏌ヨ閰嶇疆淇℃伅锛屾牴鎹粍缁囩紪鐮佽幏鍙�
*
* @param companyId
* @return
@@ -57,11 +104,11 @@
companyId = ContextUtil.getCompanyId();
}
- return quantityConfRepository.listQuantityConf(companyId);
+ return this.getConfList(companyId, null);
}
/**
- * JPA - 鏇存柊淇濆瓨鏁版嵁
+ * - 鏇存柊淇濆瓨鏁版嵁
*
* @param conf
*/
@@ -69,41 +116,50 @@
if (StringUtils.isEmpty(conf.getDepotId())) {
return;
}
- if (StringUtils.isEmpty(conf.getCompanyId())) {
+ if (StringUtils.isBlank(conf.getCompanyId())) {
conf.setCompanyId(ContextUtil.getCompanyId());
}
- if (StringUtils.isEmpty(conf.getDeptId())) {
+ if (StringUtils.isBlank(conf.getDeptId())) {
conf.setDeptId(ContextUtil.subDeptId(null));
+ }
+ if (null == conf.getUpdateBy()) {
conf.setCreateBy(ContextUtil.getLoginUserName());
conf.setCreateTime(new Date());
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ quantityConfMapper.insert(conf);
+ } else {
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ quantityConfMapper.update(conf, new UpdateWrapper<QuantityConf>().eq("depot_id", conf.getDepotId()));
}
- conf.setUpdateBy(ContextUtil.getLoginUserName());
- conf.setUpdateTime(new Date());
- quantityConfRepository.save(conf);
+
//鍒锋柊缂撳瓨
- setCacheQuantityConf(conf);
+ this.setCacheQuantityConf(conf);
}
/**
- * JPA- 鏇存柊閰嶇疆鍜嬫贩涓お
+ * 鏇存柊淇℃伅
*
* @param conf
*/
public void updateQuantityConfBySn(QuantityConf conf) {
- //鏇存柊鐘舵��
- quantityConfRepository.updateConfStatus(conf.getIp(), conf.getPort(), conf.getStatus(), conf.getSn());
- setCacheQuantityConf(conf);
+ UpdateWrapper<QuantityConf> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("sn", conf.getSn()).set("ip", conf.getIp()).set("port", conf.getPort()).set("status", conf.getStatus());
+ quantityConfMapper.update(null, updateWrapper);
+
+ this.setCacheQuantityConf(conf);
}
/**
- * JPA - 鍒犻櫎鏁版嵁
+ * - 鍒犻櫎鏁版嵁
*
* @param conf
* @return
*/
public String delQuantityConf(QuantityConf conf) {
- quantityConfRepository.delete(conf);
+ quantityConfMapper.deleteById(conf);
//鍒犻櫎閰嶇疆淇℃伅
flushConfCache(conf.getCompanyId(), conf.getDeptId());
--
Gitblit v1.9.3