From bb844f41d295106fba26e54c248be9cc61389d77 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Jun 2022 18:03:57 +0800
Subject: [PATCH] 农资库存管理
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1 +
src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java | 1 +
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 1 +
src/main/java/org/springblade/modules/soldrecord/entity/Soldrecord.java | 1 +
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 9 +++++++++
src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml | 2 +-
src/main/java/org/springblade/modules/lang/vo/LandVO.java | 1 +
7 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index 7f69ab9..b97c1ea 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -54,6 +54,7 @@
secureRegistry.excludePathPatterns("/farmPlant/**");
secureRegistry.excludePathPatterns("/land/land/**");
secureRegistry.excludePathPatterns("/farmPlant/**");
+ secureRegistry.excludePathPatterns("/soldrecord/soldrecord/**");
secureRegistry.excludePathPatterns("/soldr/soldr/**");
secureRegistry.excludePathPatterns("/stockrecord/stockrecord/**");
secureRegistry.excludePathPatterns("/blade-resource/oss/endpoint/**");
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 2049187..e44f49e 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -38,6 +38,15 @@
<if test="land.landName!=null and land.landName != ''">
and l.land_name like concat('%', #{land.landName},'%')
</if>
+ <if test="land.deptId!=null and land.deptId != ''">
+ and l.dept_id like concat('%', #{land.deptId},'%')
+ </if>
+ <if test="land.type!=null and land.type != ''">
+ and l.type like concat('%', #{land.type},'%')
+ </if>
+ <if test="land.tenantId!=null and land.tenantId != ''">
+ and l.tenant_id like concat('%', #{land.tenantId},'%')
+ </if>
</select>
<insert id="saveLandInfo">
diff --git a/src/main/java/org/springblade/modules/lang/vo/LandVO.java b/src/main/java/org/springblade/modules/lang/vo/LandVO.java
index a76838d..fe5b025 100644
--- a/src/main/java/org/springblade/modules/lang/vo/LandVO.java
+++ b/src/main/java/org/springblade/modules/lang/vo/LandVO.java
@@ -33,5 +33,6 @@
String dic;
String dica;
String deptname;
+ String tenantId;
}
diff --git a/src/main/java/org/springblade/modules/soldrecord/entity/Soldrecord.java b/src/main/java/org/springblade/modules/soldrecord/entity/Soldrecord.java
index ee539ad..9aca4a8 100644
--- a/src/main/java/org/springblade/modules/soldrecord/entity/Soldrecord.java
+++ b/src/main/java/org/springblade/modules/soldrecord/entity/Soldrecord.java
@@ -60,6 +60,7 @@
*/
private Integer specsVal2;
private String type;
+ private Long sid;
}
diff --git a/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml b/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
index 07059c2..86f8b82 100644
--- a/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
@@ -97,7 +97,7 @@
LEFT JOIN ( SELECT id, real_name FROM blade_user ) f ON f.id=st.create_user
WHERE st.is_deleted = 0
<if test="soldrecord.stockId1!=null and soldrecord.stockId1 != ''">
- and st.stock_id1 = #{soldrecord.stockId1}
+ and st.sid= #{soldrecord.stockId1}
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java b/src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java
index 28434ca..4bcdb5e 100644
--- a/src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java
+++ b/src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java
@@ -39,4 +39,5 @@
String agrname;
Integer cnum;
String codes;
+ String username;
}
diff --git a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
index 4aa3684..eec21db 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -200,6 +200,7 @@
soldrecord.setSpecsVal1(stockrecord.getSpecsVal1());
soldrecord.setSpecsVal2(stockrecord.getSpecsVal2());
soldrecord.setType(stockrecord.getType1());
+ soldrecord.setSid(stockrecord.getSid());
String type1 = stockrecord.getType1();
if (type1.equals("0")) {
//已出库农资数量记录
--
Gitblit v1.9.3