From 52ea5fd92596267379be7924deb27de6cb10632b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 04 十二月 2025 20:33:46 +0800
Subject: [PATCH] 称重及值仓页面及逻辑
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index 80327b4..1c17e61 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -38,6 +38,12 @@
* @param param
*/
public void listPageInout(Page<InoutRecord> page, InoutParam param) {
+ if(StringUtils.isBlank(param.getCompanyId())){
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if(StringUtils.isBlank(param.getDeptId())){
+ param.setDeptId(ContextUtil.subDeptId(null));
+ }
QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
inoutRecordMapper.selectPage(page, queryWrapper);
}
@@ -47,7 +53,14 @@
* @param param
*/
public List<InoutRecord> listInout(InoutParam param) {
+ if(StringUtils.isBlank(param.getCompanyId())){
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if(StringUtils.isBlank(param.getDeptId())){
+ param.setDeptId(ContextUtil.subDeptId(null));
+ }
QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
+
return inoutRecordMapper.selectList(queryWrapper);
}
@@ -57,16 +70,32 @@
*/
public QueryWrapper<InoutRecord> getQueryWrapper(InoutParam param) {
QueryWrapper<InoutRecord> 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.getCompanyId())) {
+ queryWrapper.eq("company_id", param.getCompanyId());
+ }
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.eq("dept_id", param.getDeptId());
+ }
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
}
+
+ if (StringUtils.isNotBlank(param.getId())) {
+ queryWrapper.eq("id", param.getId());
+ }
+ if (StringUtils.isNotBlank(param.getPlateNum())) {
+ queryWrapper.eq("plate_num", param.getPlateNum());
+ }
if (StringUtils.isNotBlank(param.getWeightTag())) {
+ //鏌ヨ寰呯О閲嶇殑
queryWrapper.likeRight("progress", param.getWeightTag());
+ }
+ if (StringUtils.isNotBlank(param.getProgressTag())) {
+ //鏈畬鎴愮殑
+ queryWrapper.ne("progress", param.getProgressTag());
+ }
+ if (StringUtils.isNotBlank(param.getProgress())) {
+ queryWrapper.eq("progress", param.getProgress());
}
if (StringUtils.isNotBlank(param.getFoodVariety())) {
queryWrapper.eq("food_variety", param.getFoodVariety());
@@ -94,16 +123,17 @@
/**
- * 鏍规嵁id鏌ヨ鏁版嵁
- * @param id
+ * 鏌ヨ鏁版嵁
+ * @param param
* @return
*/
- public InoutRecord selectById(String id) {
- if(StringUtils.isBlank(id)){
- return null;
-
+ public InoutRecord selectOne(InoutParam param) {
+ if(StringUtils.isBlank(param.getCompanyId())){
+ param.setCompanyId(ContextUtil.getCompanyId());
}
- return inoutRecordMapper.selectById(id);
+ QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
+
+ return inoutRecordMapper.selectOne(queryWrapper);
}
/**
--
Gitblit v1.9.3