From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index b4646fb..26ca548 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -3,10 +3,13 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -61,12 +64,31 @@
}
/**
+ * 鏇存柊搴撳瓨淇℃伅
+ * depotPR#saveOrUpdate2
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ @Transactional
+ @Log(title = "搴撳瓨绠＄悊", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.SYS)
+ public String saveOrUpdate2(Depot data) {
+
+ Depot depot = new Depot();
+ BeanUtils.copyProperties(data, depot);
+ depotService.updateStorageReal(depot);
+ return null;
+ }
+
+ /**
* depotPR#deleteDepot
*
* @param data
*/
@Expose
@Transactional
+ @Log(title = "浠撳簱绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public void deleteDepot(Depot data) {
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
@@ -88,7 +110,7 @@
*/
@DataProvider
public List<Depot> getAllCache() {
- return depotService.getCacheDepotList(null);
+ return depotService.getCacheDepotList(null, ContextUtil.subDeptId(null));
}
/**
--
Gitblit v1.9.3