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 |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 49 insertions(+), 3 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 a7ec0d8..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,13 +3,19 @@
 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;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.util.List;
 
@@ -25,17 +31,25 @@
     @Resource
     private DepotService depotService;
 
+    @Resource
+    private PledgeContractService pledgeContractService;
+
     /**
      * depotPR#getData
+     *
      * @return
      */
     @DataProvider
-    public List<Depot> getData(){
-        return depotService.getData(null, ContextUtil.subDeptId(null) ,false);
+    public List<Depot> getData(String parentId) {
+        if (StringUtils.isNotEmpty(parentId)) {
+            return depotService.getData(null, parentId, false);
+        }
+        return depotService.getData(null, ContextUtil.subDeptId(null), false);
     }
 
     /**
      * depotPR#saveOrUpdate
+     *
      * @param data
      * @return
      */
@@ -50,12 +64,32 @@
     }
 
     /**
+     * 鏇存柊搴撳瓨淇℃伅
+     * 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
-    public void deleteDepot(Depot data)  {
+    @Log(title = "浠撳簱绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
+    public void deleteDepot(Depot data) {
         Depot depot = new Depot();
         BeanUtils.copyProperties(data, depot);
         depotService.deleteDepot(depot);
@@ -71,6 +105,7 @@
 
     /**
      * ${dorado.getDataProvider("depotPR#getAllCache").getResult()}
+     *
      * @return
      */
     @DataProvider
@@ -80,6 +115,7 @@
 
     /**
      * depotPR#ajaxGetAllCache
+     *
      * @return
      */
     @Expose
@@ -88,6 +124,16 @@
     }
 
     /**
+     * depotPR#getDataByCompanyId
+     *
+     * @return
+     */
+    @DataProvider
+    public List<Depot> getDataByCompanyId() {
+        return depotService.getData(null, null, false);
+    }
+
+    /**
      * depotPR#getDepot 鑾峰彇浠撳簱淇℃伅
      *
      * @param depotId

--
Gitblit v1.9.3