From a953966925a2b16e23a2fbbcf8ef6a3efe089635 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 30 Oct 2024 09:42:04 +0800
Subject: [PATCH] 园区仓库区分类型
---
src/main/java/org/springblade/modules/yw/entity/SuppliesEntity.java | 6 ++++++
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/entity/SuppliesEntity.java b/src/main/java/org/springblade/modules/yw/entity/SuppliesEntity.java
index d7abbde..345ef29 100644
--- a/src/main/java/org/springblade/modules/yw/entity/SuppliesEntity.java
+++ b/src/main/java/org/springblade/modules/yw/entity/SuppliesEntity.java
@@ -32,6 +32,12 @@
*/
@ApiModelProperty(value = "所属企业id")
private Long firmId;
+
+ /**
+ * 类型 1：园区仓库 2：企业仓库
+ */
+ @ApiModelProperty(value = "类型 1：园区仓库 2：企业仓库")
+ private Integer type;
/**
* 物资库名称
*/
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
index 1cd7768..73496b5 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -124,9 +124,11 @@
*/
private void setSupplies(EmergencySuppliesExcel emergencySuppliesExcel, EmergencySuppliesEntity emergencySuppliesEntity) {
QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId())
- .eq("name",emergencySuppliesExcel.getSuppliesName())
+ wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
.eq("is_deleted",0);
+ if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
+ wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
+ }
SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
if (null!=suppliesEntity){
emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId());
--
Gitblit v1.9.3