From 20c30d26f8bab22a4cb6b6459962fa92d6da490f Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期一, 27 十一月 2023 14:20:29 +0800
Subject: [PATCH] feat: 漏洞修改

---
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java   |   65 +--
 consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java   |   24 +
 deploy-jar-single/src/main/resources/application-dev.yml                               |   13 
 deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java          |   82 ++--
 consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java         |    6 
 consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser_mapper.java       |   12 
 consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java                 |    2 
 consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java               |    7 
 deploy-jar-single/src/main/resources/application-prod.yml                              |   13 
 deploy-jar-single/src/main/resources/import/depTaiZhangExpTemp.xlsx                    |    0 
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java    |   40 -
 consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java  |   56 ++-
 consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java           |    8 
 deploy-jar-single/src/main/resources/import/taiZhangExpTemp.xlsx                       |    0 
 consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java                 |    3 
 deploy-jar-single/src/main/java/com/consum/test/synchronizedCode.java                  |   94 ++--
 consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java       |   49 ++
 consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java    |  108 ++++++
 consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java    |   22 +
 consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java                     |   11 
 deploy-jar-single/pom.xml                                                              |    7 
 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java      |   23 
 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java      |   47 ++
 consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java     |   22 +
 consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java |    6 
 consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java   |   54 +++
 deploy-jar-single/src/main/java/com/consum/test/base/Base_Category.java                |   74 ++--
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java     |  103 ++---
 consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java                 |   13 
 consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java  |   45 ++
 30 files changed, 670 insertions(+), 339 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
index 343c47b..4cea9f8 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
@@ -1,6 +1,7 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.pojo.BaseCategoryParam;
 import com.consum.base.pojo.ProjectTreeResult;
 import com.consum.base.service.BaseCategoryServiceImpl;
@@ -11,17 +12,13 @@
 import com.walker.infrastructure.tree.TreeNode;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description 鐗╁搧鍒嗙被
@@ -50,7 +47,7 @@
      * @Date 2023/10/30
      */
     @GetMapping("/select/tree")
-    public ResponseValue tree(String categoryName) {
+    public ResponseValue trees() {
         List<ProjectTreeResult> tree = this.baseCategoryService.tree();
         return ResponseValue.success(tree);
     }
@@ -61,7 +58,11 @@
      * @Date 2023/10/23
      */
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody BaseCategoryParam param) {
+    public ResponseValue add() {
+        BaseCategoryParam param = CommonUtil.getObjFromReqBody(BaseCategoryParam.class);
+        BaseCategoryParam param2 = new BaseCategoryParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         if (StringUtils.isEmpty(param.getCategoryName())) {
             return ResponseValue.error("鍒嗙被鍚嶇О涓虹┖");
         }
@@ -87,7 +88,12 @@
      * @Date 2023/10/23
      */
     @GetMapping("/list")
-    public ResponseValue queryBaseCategoryList(BaseCategoryParam param) {
+    public ResponseValue queryBaseCategoryList() {
+        BaseCategoryParam param = CommonUtil.getObjFromReq(BaseCategoryParam.class);
+        BaseCategoryParam param2 = new BaseCategoryParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -103,7 +109,12 @@
      * @Date 2023/10/23
      */
     @PostMapping("/edit")
-    public ResponseValue edit(@RequestBody BaseCategory baseCategory) {
+    public ResponseValue edit() {
+        BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
+        BaseCategory param2 = new BaseCategory();
+        CommonUtil.copyProperties(baseCategory, param2);
+        baseCategory = param2;
+
         Long id = baseCategory.getId();
         if (id == null || id.longValue() <= 0) {
             return ResponseValue.error("缂栬緫鐨勭墿鍝佸垎绫讳笉瀛樺湪");
@@ -131,7 +142,12 @@
      */
     //鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
     @PostMapping("/updStatus")
-    public ResponseValue updateStatus(@RequestBody BaseCategory baseCategory) {
+    public ResponseValue updateStatus() {
+        BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
+        BaseCategory param2 = new BaseCategory();
+        CommonUtil.copyProperties(baseCategory, param2);
+        baseCategory = param2;
+
         if (baseCategory == null || baseCategory.getId() == null || baseCategory.getStates() == null) {
             return ResponseValue.error("鍙傛暟閿欒");
         }
@@ -151,7 +167,12 @@
      * @Date 2023/10/23
      */
     @DeleteMapping("/del")
-    public ResponseValue updateById(@RequestBody BaseCategory baseCategory) {
+    public ResponseValue updateById() {
+        BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
+        BaseCategory param2 = new BaseCategory();
+        CommonUtil.copyProperties(baseCategory, param2);
+        baseCategory = param2;
+
         if (baseCategory.getId() == null) {
             return ResponseValue.error("鍒嗙被id涓虹┖");
         }
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index b43e991..f074e93 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -1,6 +1,7 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.service.BaseGoodsModelsServiceImpl;
 import com.consum.model.po.BaseGoodsModels;
 import com.iplatform.model.po.S_user_core;
@@ -48,7 +49,12 @@
      * @Date 2023/10/23
      */
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody BaseGoodsModels models) {
+    public ResponseValue add() {
+        BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+        BaseGoodsModels param2 = new BaseGoodsModels();
+        CommonUtil.copyProperties(models, param2);
+        models = param2;
+
         if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName()) || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) {
             return ResponseValue.error("鍙傛暟閿欒");
         }
@@ -69,7 +75,12 @@
      * @date 2023/10/25
      */
     @PostMapping("/updStatus")
-    public ResponseValue updateStatus(@RequestBody BaseGoodsModels models) {
+    public ResponseValue updateStatus() {
+        BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+        BaseGoodsModels param2 = new BaseGoodsModels();
+        CommonUtil.copyProperties(models, param2);
+        models = param2;
+
         if (models == null || models.getId() == null || models.getStates() == null) {
             return ResponseValue.error("鍙傛暟閿欒");
         }
@@ -84,7 +95,12 @@
      * @Date 2023/10/25
      */
     @DeleteMapping("/del")
-    public ResponseValue updateById(@RequestBody BaseGoodsModels models) {
+    public ResponseValue updateById() {
+        BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+        BaseGoodsModels param2 = new BaseGoodsModels();
+        CommonUtil.copyProperties(models, param2);
+        models = param2;
+
         if (models.getId() == null) {
             return ResponseValue.error("瑙勬牸鍨嬪彿id涓虹┖");
         }
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index c7c053a..f4ede5c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -1,6 +1,7 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.core.utils.MapUtils;
 import com.consum.base.core.utils.MapperUtil;
 import com.consum.base.pojo.BaseGoodsTemplateParam;
@@ -8,11 +9,7 @@
 import com.consum.base.service.BaseGoodsTemplateServiceImpl;
 import com.consum.base.service.BaseWarehouseServiceImpl;
 import com.consum.base.service.LWhGoodsService;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.SDictData;
+import com.consum.model.po.*;
 import com.consum.model.vo.BaseGoodsTemplateVo;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.StringUtils;
@@ -20,18 +17,14 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 鐗╁搧妯℃澘
@@ -57,7 +50,12 @@
      * @Date 2023/10/24
      */
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody BaseGoodsTemplateParam param) {
+    public ResponseValue add() {
+        BaseGoodsTemplateParam param = CommonUtil.getObjFromReqBody(BaseGoodsTemplateParam.class);
+        BaseGoodsTemplateParam param2 = new BaseGoodsTemplateParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         FinSysTenantUser sysInfo = this.getSysInfo();
         if (param.getCategoryId() == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -87,7 +85,12 @@
      * @Date 2023/10/24
      */
     @GetMapping("/list")
-    public ResponseValue queryList(BaseGoodsTemplateParam param) {
+    public ResponseValue queryList() {
+        BaseGoodsTemplateParam param = CommonUtil.getObjFromReq(BaseGoodsTemplateParam.class);
+        BaseGoodsTemplateParam param2 = new BaseGoodsTemplateParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         FinSysTenantUser sysInfo = this.getSysInfo();
         if (sysInfo == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -121,7 +124,12 @@
      * @Date 2023/10/24
      */
     @PostMapping("/edit")
-    public ResponseValue edit(@RequestBody BaseGoodsTemplateParam param) {
+    public ResponseValue edit() {
+        BaseGoodsTemplateParam param = CommonUtil.getObjFromReqBody(BaseGoodsTemplateParam.class);
+        BaseGoodsTemplateParam param2 = new BaseGoodsTemplateParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         if (StringUtils.isEmpty(param.getGoodsName())) {
             return ResponseValue.error("鐗╁搧鍚嶇О涓虹┖");
         }
@@ -142,7 +150,12 @@
      */
     //TODO 鐗╁搧鐨勭鐢ㄦ垨鍒犻櫎锛屼笉褰卞搷宸茬粡閲囪喘鍏ヨ繃搴撶殑鐗╁搧淇℃伅銆�
     @PostMapping("/updStatus")
-    public ResponseValue updateStatus(@RequestBody BaseGoodsTemplate goodsTemplate) {
+    public ResponseValue updateStatus() {
+        BaseGoodsTemplate goodsTemplate = CommonUtil.getObjFromReqBody(BaseGoodsTemplate.class);
+        BaseGoodsTemplate param2 = new BaseGoodsTemplate();
+        CommonUtil.copyProperties(goodsTemplate, param2);
+        goodsTemplate = param2;
+
         if (goodsTemplate == null || goodsTemplate.getId() == null || goodsTemplate.getStates() == null) {
             return ResponseValue.error("鍙傛暟閿欒");
         }
@@ -158,7 +171,12 @@
      */
     //TODO 鐗╁搧鐨勭鐢ㄦ垨鍒犻櫎锛屼笉褰卞搷宸茬粡閲囪喘鍏ヨ繃搴撶殑鐗╁搧淇℃伅銆�
     @DeleteMapping("/del")
-    public ResponseValue updateById(@RequestBody BaseGoodsTemplate goodsTemplate) {
+    public ResponseValue updateById() {
+        BaseGoodsTemplate goodsTemplate = CommonUtil.getObjFromReqBody(BaseGoodsTemplate.class);
+        BaseGoodsTemplate param2 = new BaseGoodsTemplate();
+        CommonUtil.copyProperties(goodsTemplate, param2);
+        goodsTemplate = param2;
+
         if (goodsTemplate.getId() == null) {
             return ResponseValue.error("鐗╁搧id涓虹┖");
         }
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index b1dcd6a..9c1bb36 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,6 +1,7 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.pojo.BaseWarehouseParam;
 import com.consum.base.pojo.query.WarehouseQry;
 import com.consum.base.service.BaseWarehouseServiceImpl;
@@ -13,15 +14,10 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @Description 浠撳簱绠＄悊
@@ -44,7 +40,12 @@
      * @Date 2023/10/26
      */
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody BaseWarehouseParam param) {
+    public ResponseValue add() {
+        BaseWarehouseParam param = CommonUtil.getObjFromReqBody(BaseWarehouseParam.class);
+        BaseWarehouseParam param2 = new BaseWarehouseParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         if (StringUtils.isEmpty(param.getWarehouseName())) {
             return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
         }
@@ -63,7 +64,12 @@
      * @Date 2023/10/26
      */
     @GetMapping("/list")
-    public ResponseValue queryList(BaseWarehouseParam param) {
+    public ResponseValue queryList() {
+        BaseWarehouseParam param = CommonUtil.getObjFromReq(BaseWarehouseParam.class);
+        BaseWarehouseParam param2 = new BaseWarehouseParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         FinSysTenantUser sysInfo = this.getSysInfo();
         if (sysInfo == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -79,7 +85,12 @@
      * @Date 2023/10/26
      */
     @PostMapping("/edit")
-    public ResponseValue edit(@RequestBody BaseWarehouse baseWarehouse) {
+    public ResponseValue edit() {
+        BaseWarehouse baseWarehouse = CommonUtil.getObjFromReqBody(BaseWarehouse.class);
+        BaseWarehouse param2 = new BaseWarehouse();
+        CommonUtil.copyProperties(baseWarehouse, param2);
+        baseWarehouse = param2;
+
         Long id = baseWarehouse.getId();
         if (id == null || id <= 0) {
             return ResponseValue.error("缂栬緫鐨勪粨搴撲笉瀛樺湪");
@@ -116,7 +127,12 @@
      * @Date 2023/10/26
      */
     @DeleteMapping("/del")
-    public ResponseValue updateById(@RequestBody BaseWarehouse baseWarehouse) {
+    public ResponseValue updateById() {
+        BaseWarehouse baseWarehouse = CommonUtil.getObjFromReqBody(BaseWarehouse.class);
+        BaseWarehouse param2 = new BaseWarehouse();
+        CommonUtil.copyProperties(baseWarehouse, param2);
+        baseWarehouse = param2;
+
         if (baseWarehouse.getId() == null) {
             return ResponseValue.error("浠撳簱id涓虹┖");
         }
@@ -162,7 +178,12 @@
         @ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true, dataType = "WarehouseQry", paramType = "query")
     })
     @GetMapping("/select/number")
-    public ResponseValue selectNumber(@Validated WarehouseQry warehouseQry) {
+    public ResponseValue selectNumber() {
+        WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
+        WarehouseQry param2 = new WarehouseQry();
+        CommonUtil.copyProperties(warehouseQry, param2);
+        warehouseQry = param2;
+
         Long warehouseId = warehouseQry.getWarehouseId();
         if (warehouseId == null) {
             Long agencyId = warehouseQry.getAgencyId();
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java b/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java
new file mode 100644
index 0000000..daec1ca
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java
@@ -0,0 +1,108 @@
+package com.consum.base.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.query.LWhLedgerQry;
+import com.consum.base.service.FinWarehouseLedgerServiceImpl;
+import com.consum.model.po.FinSysTenantUser;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.web.ResponseValue;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 閮ㄩ棬鍙拌处
+ */
+@RestController
+@RequestMapping("/pc/fin/warehouse/departLedger")
+public class FinDepartLedgerController extends BaseController {
+    @Resource
+    private FinWarehouseLedgerServiceImpl finWarehouseLedgerService;
+
+    /**
+     * @Description 鍒嗛〉鍒楄〃鏌ヨ
+     * @Author wh
+     * @Date 2023/7/11 13:59
+     */
+    @RequestMapping("/getList")
+    public ResponseValue getLedgerList() {
+        LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+        LWhLedgerQry query = new LWhLedgerQry();
+        CommonUtil.copyProperties(param, query);
+        param = query;
+        S_user_core currentUser = this.getCurrentUser();
+        if (currentUser == null) {
+            return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+        }
+        /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+        FinSysTenantUser sysInfo = this.getSysInfo();
+        String tenantId = sysInfo.getTenantId();
+        Long paramAgencyId = param.getAgencyId();
+        if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+            param.setAgencyId(Long.valueOf(tenantId));
+        }
+        param.setStates((short) 1);
+        param.setWarehouseType((short) 1);
+        GenericPager pager = finWarehouseLedgerService.departLedgerList(param);
+        return ResponseValue.success(pager);
+    }
+
+    @RequestMapping("/getListExport")
+    public void getListExport(HttpServletResponse response) throws Exception {
+        LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+        LWhLedgerQry query = new LWhLedgerQry();
+        CommonUtil.copyProperties(param, query);
+        param = query;
+        S_user_core currentUser = this.getCurrentUser();
+        if (currentUser == null) {
+            return;
+        }
+        /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+        FinSysTenantUser sysInfo = this.getSysInfo();
+        String tenantId = sysInfo.getTenantId();
+        Long paramAgencyId = param.getAgencyId();
+        if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+            param.setAgencyId(Long.valueOf(tenantId));
+        }
+        param.setStates((short) 1);
+        param.setWarehouseType((short) 1);
+        param.setPageNum(1);
+        param.setPageSize(Integer.MAX_VALUE);
+        GenericPager<Map<String, Object>> pager = finWarehouseLedgerService.departLedgerList(param);
+        List<Map<String, Object>> datas = pager.getDatas();
+        org.springframework.core.io.Resource resource = new ClassPathResource("import/depTaiZhangExpTemp.xlsx");
+        // 鑾峰彇鏂囦欢杈撳叆娴�
+        InputStream inputStream = resource.getInputStream();
+        Workbook wb = new XSSFWorkbook(inputStream);
+        TemplateExportParams params = new TemplateExportParams();
+        params.setTemplateWb(wb);
+
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("dataList", datas);
+
+        Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+        // 璁剧疆鍝嶅簲澶�
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("搴撳瓨鏌ヨ.xlsx", "utf-8"));
+        try (OutputStream outputStream = response.getOutputStream()) {
+            workbook.write(outputStream);
+            workbook.close();
+        }
+
+    }
+}
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index edae61d..f03df71 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -1,5 +1,6 @@
 package com.consum.base.controller;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.context.AnalysisContext;
@@ -30,38 +31,22 @@
 import com.iplatform.model.po.S_role;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.DateUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.infrastructure.utils.PhoneNumberUtils;
-import com.walker.infrastructure.utils.StringUtils;
+import com.walker.infrastructure.utils.*;
 import com.walker.web.ResponseValue;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.*;
 
 /**
  * @Description 绯荤粺鐢ㄦ埛
@@ -174,8 +159,10 @@
 
         try {
             Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-            fieldDatas.setAccessible(true);
-            fieldDatas.set(pager, resultList);
+//            fieldDatas.setAccessible(true);
+//            fieldDatas.set(pager, resultList);
+            ReflectUtil.setFieldValue(pager, fieldDatas, resultList);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -227,11 +214,11 @@
         user.setSysUserId(NumberGenerator.getLongSequenceNumber());
         // 鍔犲瘑鎵嬫満鍙�
         String key = PlatformRSAUtils.AES_KEY;
-        String pwdPhone = "";
+        String encPhone = "";
         if (user.getUserPhone() != null) {
-            pwdPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
         }
-        user.setUserPhone(pwdPhone);
+        user.setUserPhone(encPhone);
         //鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
         user.setSysDeptId(3L); //瀵瑰簲骞冲彴鏈烘瀯id  榛樿涓哄钩鍙扮鐞�
         this.finSysTenantUserService.insert(user);
@@ -245,7 +232,7 @@
         userCore.setNick_name(user.getUserName());
         //鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
         userCore.setUser_type(2);
-        userCore.setPhonenumber(pwdPhone);
+        userCore.setPhonenumber(encPhone);
         userCore.setSex(user.getSex().toString());
         //鍒濆鍖栧瘑鐮� 123456
         String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
@@ -427,8 +414,8 @@
                 user.setRemark("鎵归噺瀵煎叆");
                 // 鍔犲瘑鎵嬫満鍙�
                 String key = PlatformRSAUtils.AES_KEY;
-                String pwdPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
-                user.setUserPhone(pwdPhone);
+                String encPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
+                user.setUserPhone(encPhone);
 
                 user.setIsDelete(1);
                 //鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
@@ -551,11 +538,11 @@
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
         String key = PlatformRSAUtils.AES_KEY;
-        String pwdPhone = "";
+        String encPhone = "";
         if (user.getUserPhone() != null) {
-            pwdPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
         }
-        user.setUserPhone(pwdPhone);
+        user.setUserPhone(encPhone);
         // 1.鏇存柊绯荤粺鐢ㄦ埛   FIN_SYS_TENANT_USER
         finSysTenantUserService.update(user);
         // 2.鏇存柊骞冲彴鐢ㄦ埛  S_USER_CORE
@@ -786,10 +773,10 @@
         // 鍔犲瘑鎵嬫満鍙�
         String key = PlatformRSAUtils.AES_KEY;
         String userPhone = user.getUserPhone();
-        String pwdPhone = "";
+        String encPhone = "";
         if (userPhone != null) {
-            pwdPhone = AESUtils.encryptStrAES(userPhone, key);
-            user.setUserPhone(pwdPhone);
+            encPhone = AESUtils.encryptStrAES(userPhone, key);
+            user.setUserPhone(encPhone);
         }
 
         this.finSysTenantUserService.insert(user);
@@ -883,12 +870,12 @@
         updUser.setEmail(user.getEmail());
         updUser.setUserName(user.getUserName());
         updUser.setSex(user.getSex());
-        String pwdPhone = "";
+        String encPhone = "";
         if (user.getUserPhone() != null) {
             String key = PlatformRSAUtils.AES_KEY;
-            pwdPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+            encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
         }
-        updUser.setUserPhone(pwdPhone);
+        updUser.setUserPhone(encPhone);
         // 1.鏇存柊绯荤粺鐢ㄦ埛   FIN_SYS_TENANT_USER
         finSysTenantUserService.update(updUser);
         // 2.鏇存柊骞冲彴鐢ㄦ埛  S_USER_CORE
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java b/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
index 2dd853c..2c0337d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
@@ -46,6 +46,9 @@
     @RequestMapping("/getList")
     public ResponseValue getLedgerList() {
         LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+        LWhLedgerQry query = new LWhLedgerQry();
+        CommonUtil.copyProperties(param, query);
+        param = query;
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -65,6 +68,9 @@
     @RequestMapping("/getListExport")
     public void getListExport(HttpServletResponse response) throws Exception {
         LWhLedgerQry param = CommonUtil.getObjFromReq(LWhLedgerQry.class);
+        LWhLedgerQry query = new LWhLedgerQry();
+        CommonUtil.copyProperties(param, query);
+        param = query;
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return;
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index 5177428..b55681b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -1,5 +1,6 @@
 package com.consum.base.controller;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.core.utils.MapUtils;
@@ -34,7 +35,12 @@
     private LWarehouseFlowService lWarehouseFlowService;
 
     @GetMapping("/list")
-    public ResponseValue queryFormProcureList(LWarehouseFlowParam param) {
+    public ResponseValue queryFormProcureList() {
+        LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+        LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -47,8 +53,9 @@
         });
         try {
             Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-            fieldDatas.setAccessible(true);
-            fieldDatas.set(genericPager, result);
+//            fieldDatas.setAccessible(true);
+//            fieldDatas.set(genericPager, result);
+            ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
@@ -58,7 +65,11 @@
 
 
     @GetMapping("/detail/list")
-    public ResponseValue queryFormProcureList1(LWarehouseFlowParam param) {
+    public ResponseValue queryFormProcureList1() {
+        LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+        LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -74,6 +85,9 @@
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
         LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+        LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
         FinSysTenantUser sysInfo = this.getSysInfo();
         String tenantId = sysInfo.getTenantId();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index fae394a..770b5b4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -1,16 +1,13 @@
 package com.consum.base.controller;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.core.utils.MapUtils;
 import com.consum.base.core.utils.MapperUtil;
 import com.consum.base.pojo.LWhFormOutputParam;
 import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.base.pojo.response.FormOutputGoodsVO;
-import com.consum.base.pojo.response.FormOutputTemplateInfoVO;
-import com.consum.base.pojo.response.FormOutputVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormOutputExtendVO;
+import com.consum.base.pojo.response.*;
 import com.consum.base.service.LWarehouseFlowService;
 import com.consum.base.service.LWhFormOutputServiceImpl;
 import com.consum.base.service.LWhGoodsService;
@@ -25,11 +22,6 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +29,12 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 鍑哄簱鍗�
@@ -129,8 +127,9 @@
         }
         try {
             Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-            fieldDatas.setAccessible(true);
-            fieldDatas.set(genericPager, resultList);
+//            fieldDatas.setAccessible(true);
+//            fieldDatas.set(genericPager, resultList);
+            ReflectUtil.setFieldValue(genericPager, fieldDatas, resultList);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index ed68075..79df3ac 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -1,5 +1,6 @@
 package com.consum.base.controller;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.consum.base.BaseController;
 import com.consum.base.core.CodeGeneratorEnum;
 import com.consum.base.core.CodeGeneratorService;
@@ -12,27 +13,9 @@
 import com.consum.base.pojo.LWhFormProcureParam;
 import com.consum.base.pojo.LWhProcureModelParam;
 import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.pojo.response.FormProcureVO;
-import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormProcureExtendVO;
-import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LOrgSupplierServiceImpl;
-import com.consum.base.service.LWhFormProcureCoreService;
-import com.consum.base.service.LWhFormProcureGoodsService;
-import com.consum.base.service.LWhFormProcureService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LOrgSupplier;
-import com.consum.model.po.LWhFormProcure;
-import com.consum.model.po.LWhFormProcureGoods;
-import com.consum.model.po.LWhProcureModel;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.CollectionUtils;
@@ -42,22 +25,13 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Resource;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.*;
 
 /**
  * @ClassName LWhFormProcureController
@@ -95,7 +69,15 @@
      * @Description 鏂板
      */
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody LWhFormProcureParam param) {
+    public ResponseValue add() {
+        LWhFormProcureParam param = CommonUtil.getObjFromReqBody(LWhFormProcureParam.class);
+        LWhFormProcureParam param2 = new LWhFormProcureParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+        return this.add(param);
+    }
+
+    private ResponseValue add(LWhFormProcureParam param) {
         Long warehouseId = param.getWarehouseId();
         if (param.getWarehouseId() == null) {
             return ResponseValue.error("浠撳簱ID涓嶈兘涓虹┖");
@@ -222,10 +204,14 @@
      */
     @ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
+            @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
     })
     @GetMapping("/list")
-    public ResponseValue queryFormProcureList(FormProcureQry param) {
+    public ResponseValue queryFormProcureList() {
+        FormProcureQry param = CommonUtil.getObjFromReq(FormProcureQry.class);
+        FormProcureQry param2 = new FormProcureQry();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -248,8 +234,8 @@
 
                 // 鏌ヨ鍨嬪彿鏁伴噺
                 String sql = "select fpg.id,BASE_CATEGORY_ID ,BASE_GOODS_TEMPLATE_ID ,GOODS_TEMPLATE_NAME ,sum(counts) count "
-                    + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
-                    + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
+                        + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
+                        + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
                 Map<String, Object> paramMap = new HashMap<>();
                 paramMap.put("id", item.getId());
                 List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
@@ -264,8 +250,9 @@
         }
         try {
             Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-            fieldDatas.setAccessible(true);
-            fieldDatas.set(genericPager, result);
+//            fieldDatas.setAccessible(true);
+//            fieldDatas.set(genericPager, result);
+            ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -277,7 +264,11 @@
      * @Description 缂栬緫
      */
     @PostMapping("/edit")
-    public ResponseValue edit(@RequestBody LWhFormProcureParam param) {
+    public ResponseValue edit() {
+        LWhFormProcureParam param = CommonUtil.getObjFromReqBody(LWhFormProcureParam.class);
+        LWhFormProcureParam param2 = new LWhFormProcureParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         ResponseValue delFlag = delById(param.getId());
         if (delFlag.getCode() == ResponseValue.CODE_SUCCESS) {
             return this.add(param);
@@ -342,13 +333,13 @@
         lWhFormProcureGoods.setWhFormProcureId(id);
         List<LWhFormProcureGoods> formProcureGoods = lWhFormProcureGoodsService.select(lWhFormProcureGoods);
 
-        Field fieldModels = null;
-        try {
-            fieldModels = LWhFormProcureGoodsVO.class.getDeclaredField("models");
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        fieldModels.setAccessible(true);
+//        Field fieldModels = null;
+//        try {
+//            fieldModels = LWhFormProcureGoodsVO.class.getDeclaredField("models");
+//        } catch (NoSuchFieldException e) {
+//            e.printStackTrace();
+//        }
+//        fieldModels.setAccessible(true);
         ArrayList<LWhFormProcureGoodsVO> procureGoodsVOList = new ArrayList<>();
         for (LWhFormProcureGoods formProcureGood : formProcureGoods) {
             LWhFormProcureGoodsVO lWhFormProcureGoodsVO = new LWhFormProcureGoodsVO();
@@ -363,15 +354,17 @@
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("formProcureGoodId", formProcureGood.getId());
             String sql = "SELECT\n" + "pm.BASE_GOODS_MODELS_ID,pm.BASE_GOODS_MODELS_NAME,pm.PRICE,pm.COUNTS,pm.WOREHOUSE_COUNT,bgm.unit " + "FROM\n"
-                + "\tl_wh_procure_model pm\n"
-                + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
+                    + "\tl_wh_procure_model pm\n"
+                    + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
             List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
             List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
             procureModelList.forEach(item -> {
                 GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
                 goodsModelVOList.add(goodsModelVO);
             });
-            fieldModels.set(lWhFormProcureGoodsVO, goodsModelVOList);
+//            fieldModels.set(lWhFormProcureGoodsVO, goodsModelVOList);
+            ReflectUtil.setFieldValue(lWhFormProcureGoodsVO, "models", goodsModelVOList);
+
             procureGoodsVOList.add(lWhFormProcureGoodsVO);
         }
         lWhFormProcureExtendVO.setProcureGoods(procureGoodsVOList);
@@ -384,6 +377,10 @@
     @GetMapping("detail/list")
     public ResponseValue queryFormProcureDetailList() {
         FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
+        FormProcureQry param2 = new FormProcureQry();
+        CommonUtil.copyProperties(formProcureQry, param2);
+        formProcureQry = param2;
+
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index a78ab43..7b482b3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -1,33 +1,24 @@
 package com.consum.base.controller;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.IdUtil;
 import com.consum.base.core.utils.MapUtils;
 import com.consum.base.core.utils.MapperUtil;
 import com.consum.base.pojo.GoodsUseRecordVO;
 import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
-import com.consum.base.pojo.request.ProcureModelInfoParam;
 import com.consum.base.pojo.RecordUserInfoVO;
 import com.consum.base.pojo.UseRecordSkuVO;
 import com.consum.base.pojo.dto.UseRecordDTO;
 import com.consum.base.pojo.query.TransferQry;
 import com.consum.base.pojo.request.LWhFormTransferParam;
+import com.consum.base.pojo.request.ProcureModelInfoParam;
 import com.consum.base.pojo.response.FormTransferVO;
 import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
 import com.consum.base.pojo.response.LWHFromTransferExtendVO;
 import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
-import com.consum.base.service.LWhFormTransferCoreService;
-import com.consum.base.service.LWhFormTransferServiceImpl;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModelUser;
-import com.consum.model.po.LWhProcureModelUserRecord;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
 import com.consum.model.vo.LWhFormOutputVo;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
@@ -38,21 +29,14 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description 璋冩嫧绠＄悊
@@ -152,8 +136,10 @@
         }
         try {
             Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-            fieldDatas.setAccessible(true);
-            fieldDatas.set(genericPager, result);
+//            fieldDatas.setAccessible(true);
+//            fieldDatas.set(genericPager, result);
+            ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
new file mode 100644
index 0000000..5ebf949
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
@@ -0,0 +1,45 @@
+package com.consum.base.controller;
+
+import cn.hutool.core.convert.Convert;
+import com.consum.base.BaseController;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName LWhHomeStatisticsController
+ * @Author cy
+ * @Date 2023/11/27
+ * @Description
+ * @Version 1.0
+ **/
+
+@RestController
+@RequestMapping("/pc/warehouse/homeStatistics")
+@Api(value = "棣栭〉缁熻", tags = "棣栭〉缁熻")
+public class LWhHomeStatisticsController extends BaseController {
+    @Resource
+    private LWhGoodsService lWhGoodsService;
+
+    /**
+     * 鐗╁搧鏁伴噺閲戦缁熻
+     *
+     * @return
+     */
+    @GetMapping("getGoodsNumPrice")
+    public ResponseValue goodsNumPrice() {
+        /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+        FinSysTenantUser sysInfo = this.getSysInfo();
+        String tenantId = sysInfo.getTenantId();
+        List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0l));
+        return ResponseValue.success(goodsNumPrice.get(0));
+    }
+}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
index 783f3de..e1610e4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -68,6 +68,10 @@
     @PostMapping("/add")
     public ResponseValue add() throws Exception {
         WhWarningConfigParam param = CommonUtil.getObjFromReqBody(WhWarningConfigParam.class);
+        WhWarningConfigParam param2 = new WhWarningConfigParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         String modelConfigStr = param.getModelConfigStr();
         Long baseWarehouseId = param.getBaseWarehouseId();
         Long baseGoodsTemplateId = param.getBaseGoodsTemplateId();
@@ -144,6 +148,10 @@
     @PostMapping("/upd")
     public ResponseValue upd() {
         WhWarningConfig param = CommonUtil.getObjFromReqBody(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         if (param.getId() == null || (param.getUpperLimit() == null && param.getLowerLimit() == null)) {
             return ResponseValue.error("搴撳瓨涓婇檺銆佷笅闄愪笉鑳藉叏涓虹┖锛�");
         }
@@ -160,6 +168,9 @@
     @DeleteMapping("del")
     public ResponseValue delById() {
         WhWarningConfig param = CommonUtil.getObjFromReqBody(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         if (param.getId() == null) {
             return ResponseValue.error("id涓虹┖");
         }
@@ -170,6 +181,9 @@
     @GetMapping("/getList")
     public ResponseValue getConfigList() {
         WhWarningConfigQry param = CommonUtil.getObjFromReq(WhWarningConfigQry.class);
+        WhWarningConfigQry param2 = new WhWarningConfigQry();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
         FinSysTenantUser sysInfo = this.getSysInfo();
         String tenantId = sysInfo.getTenantId();
@@ -184,12 +198,20 @@
     @GetMapping("/getById")
     public ResponseValue getById() {
         WhWarningConfig param = CommonUtil.getObjFromReq(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         WhWarningConfig whWarningConfig = lWhWarningConfigService.get(param);
         return ResponseValue.success(whWarningConfig);
     }
 
     @GetMapping("/getConfigList")
-    public ResponseValue getConfigList(WhWarningConfig param) {
+    public ResponseValue getWarnConfigList() {
+        WhWarningConfig param = CommonUtil.getObjFromReq(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         if (param.getBaseWarehouseId() == null || param.getWarehouseType() == null || (param.getBaseGoodsModelsId() == null || param.getBaseGoodsTemplateId() == null)) {
             return ResponseValue.error("缂哄皯蹇呰鍙傛暟");
         }
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
index 585f3ea..bd64206 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
@@ -35,6 +35,9 @@
     @GetMapping("/getList")
     public ResponseValue getList() {
         WhWarningQry param = CommonUtil.getObjFromReq(WhWarningQry.class);
+        WhWarningQry param2 = new WhWarningQry();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
         FinSysTenantUser sysInfo = this.getSysInfo();
         String tenantId = sysInfo.getTenantId();
@@ -60,6 +63,9 @@
     @GetMapping("/handerChenKuCun")
     public ResponseValue handerChenKuCun() {
         WhWarningQry param = CommonUtil.getObjFromReq(WhWarningQry.class);
+        WhWarningQry param2 = new WhWarningQry();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         FinSysTenantUser sysInfo = this.getSysInfo();
         long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
 
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java b/consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java
index b092d9c..a40697c 100644
--- a/consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java
@@ -1,10 +1,12 @@
 package com.consum.base.core.utils;
 
+import cn.hutool.core.util.ReflectUtil;
+import lombok.extern.slf4j.Slf4j;
+
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class MapUtils {
@@ -24,8 +26,9 @@
             T obj = clazz.newInstance();
             for (Map.Entry<String, Object> entry : map.entrySet()) {
                 Field field = clazz.getDeclaredField(entry.getKey());
-                field.setAccessible(true);
-                field.set(obj, entry.getValue());
+//                field.setAccessible(true);
+//                field.set(obj, entry.getValue());
+                ReflectUtil.setFieldValue(obj, field, entry.getValue());
             }
             return obj;
         } catch (InstantiationException | IllegalAccessException | NoSuchFieldException e) {
@@ -87,4 +90,4 @@
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
index 574fd9e..42581d6 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
@@ -2,8 +2,9 @@
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
 import lombok.Data;
+
+import java.util.List;
 
 @Data
 @ApiModel(value = "鏂板鎶ュ簾鍗曚俊鎭�")
@@ -14,6 +15,10 @@
      */
     @ApiModelProperty(value = "鏈烘瀯id")
     private Long agencyId;
+
+    @ApiModelProperty(value = "閮ㄩ棬id")
+    private Long departmentId;
+
     /**
      * 浠撳簱缂栧彿
      */
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java
index 5e847d4..119d2ca 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/LWhLedgerQry.java
@@ -19,7 +19,7 @@
     private Long agencyId;
 
     @ApiModelProperty("浠撳簱绫诲瀷")
-    private Long warehouseType;
+    private Short warehouseType;
 
     @ApiModelProperty("浠撳簱id")
     private Long warehouseId;
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
index a52c402..4495408 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java
@@ -40,6 +40,9 @@
     @ApiModelProperty("鐘舵�侊紙1=鏈煡鐪嬶紱2=宸叉煡鐪嬶級")
     private Integer states;
 
+    @ApiModelProperty("棰勮绫诲瀷锛�1=瓒呬笂闄愶紱2=瓒呬笅闄愶級")
+    private Short warningType;
+
     @ApiModelProperty(value = "姣忛〉鏄剧ず鏉℃暟")
     private Integer pageSize = 10;
 
diff --git a/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
index 664ffa8..12ed86d 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
@@ -20,7 +20,8 @@
 @Service
 public class FinWarehouseLedgerServiceImpl extends BaseServiceImpl {
 
-    private static String LEDGER_LIST_QUERY_PREFIX = "SELECT ware.AGENCY_NAME ,ware.WAREHOUSE_NAME ,goodsTemp.CATEGORY_NAME ,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME ,goods.BASE_GOODS_MODELS_NAME ,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_WAREHOUSE ware ON ware.id=goods.WAREHOUSE_ID where 1=1 ";
+    private String LEDGER_LIST_QUERY_PREFIX = "SELECT ware.AGENCY_NAME ,ware.WAREHOUSE_NAME ,goodsTemp.CATEGORY_NAME ,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME ,goods.BASE_GOODS_MODELS_NAME ,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_WAREHOUSE ware ON ware.id=goods.WAREHOUSE_ID where 1=1 ";
+    private String LEDGER_LIST_QUERY_GROUP = " GROUP BY ware.AGENCY_NAME,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT";
 
     public GenericPager<Map<String, Object>> ledgerList(LWhLedgerQry param) {
         StringBuilder sql = new StringBuilder(LEDGER_LIST_QUERY_PREFIX);
@@ -64,7 +65,56 @@
             sql.append(" AND goods.COST_TYPE=:costType");
             paramts.put("costType", param.getCostType());
         }
-        sql.append(" GROUP BY ware.AGENCY_NAME,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT");
+        sql.append(LEDGER_LIST_QUERY_GROUP);
+        return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+    }
+
+    private String DEPART_LEDGER_LIST_QUERY_PREFIX = "SELECT tenant.id tenantId,tenant.NAME AS AGENCY_NAME,ware.NAME AS depart_name,goodsTemp.CATEGORY_NAME,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN fin_sys_tenant_department ware ON ware.id=goods.WAREHOUSE_ID AND goods.WAREHOUSE_TYPE=1 LEFT JOIN fin_sys_tenant tenant ON tenant.id=ware.TENANT_ID WHERE 1=1 ";
+    private String DEPART_LEDGER_LIST_QUERY_GROUP = " GROUP BY tenant.id,tenant.NAME,ware.NAME,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT";
+
+    public GenericPager<Map<String, Object>> departLedgerList(LWhLedgerQry param) {
+        StringBuilder sql = new StringBuilder(DEPART_LEDGER_LIST_QUERY_PREFIX);
+        Map<String, Object> paramts = new HashMap<>();
+        //鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
+        if (param.getStates() != null) {
+            sql.append(" and goods.states = :states");
+            paramts.put("states", param.getStates());
+        }
+        //鏈烘瀯
+        if (param.getAgencyId() != null) {
+            sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+            paramts.put("lengthAgencyId", param.getAgencyId());
+            paramts.put("agencyId", param.getAgencyId());
+        }
+        //浠撳簱绫诲瀷
+        if (param.getWarehouseType() != null) {
+            sql.append(" AND goods.WAREHOUSE_TYPE = :warehouseType");
+            paramts.put("warehouseType", param.getWarehouseType());
+        }
+        if (param.getWarehouseId() != null) {
+            sql.append(" AND goods.WAREHOUSE_ID = :warehouseId");
+            paramts.put("warehouseId", param.getWarehouseId());
+        }
+        //鐗╁搧鍚嶇О
+        if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+            sql.append(" AND goods.GOODS_TEMPLATE_NAME like :goodsTemplateName");
+            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+        }
+        if (param.getGoodsTemplateId() != null) {
+            sql.append(" AND goods.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
+            paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+        }
+        //鍒嗙被
+        if (param.getCategoryId() != null) {
+            sql.append(" AND goodsTemp.CATEGORY_ID=:categoryId");
+            paramts.put("categoryId", param.getCategoryId());
+        }
+        //浠峰�肩被鍨�
+        if (param.getCostType() != null) {
+            sql.append(" AND goods.COST_TYPE=:costType");
+            paramts.put("costType", param.getCostType());
+        }
+        sql.append(DEPART_LEDGER_LIST_QUERY_GROUP);
         return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
     }
 }
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
index 32b6f70..cbfb40a 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -1,5 +1,6 @@
 package com.consum.base.service;
 
+import com.consum.base.core.utils.MapperUtil;
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -260,4 +261,16 @@
         return update(sql.toString(), params.toArray());
     }
 
+    private static String GOODS_NUM_PRICE = "SELECT t.tenantId,count(id) total_Num,count(CASE WHEN STATES=2 THEN 1 END) xia_fa_num,IFNULL(round(sum(PRICE)/1000000,2),0) total_price,IFNULL(ROUND(count(CASE WHEN STATES=2 THEN 1 END)/count(id),4),0)*100 AS zhan_you_percent,count(CASE COST_TYPE WHEN 1 THEN 1 END) a_total_Num,count(CASE COST_TYPE WHEN 2 THEN 1 END) b_total_Num,count(CASE COST_TYPE WHEN 3 THEN 1 END) c_total_Num FROM (SELECT tCangKu.tenantId,tKuCun.id,tKuCun.STATES,tKuCun.COST_TYPE,tKuCun.price FROM (SELECT tenant.id tenantId,tenant.NAME AS org_name,ware.*FROM fin_sys_tenant tenant RIGHT JOIN ( SELECT 0 WAREHOUSE_TYPE,id,AGENCY_ID,WAREHOUSE_NAME FROM BASE_WAREHOUSE UNION ALL SELECT 1 WAREHOUSE_TYPE,id,TENANT_ID AGENCY_ID,`NAME` WAREHOUSE_NAME FROM fin_sys_tenant_department) ware ON tenant.id=ware.AGENCY_ID WHERE 1=1 ";
+    private static String GOODS_NUM_PRICE_END = ") tCangKu LEFT JOIN L_WH_GOODS tKuCun ON tCangKu.WAREHOUSE_TYPE=tKuCun.WAREHOUSE_TYPE AND tCangKu.id=tKuCun.WAREHOUSE_ID AND tKuCun.STATES BETWEEN 1 AND 2) t GROUP BY t.tenantId";
+
+    //鏈烘瀯
+    public List<Map<String, Object>> getGoodsNumPrice(Long agencyId) {
+        StringBuilder sql = new StringBuilder(GOODS_NUM_PRICE);
+        Map<String, Object> paramts = new HashMap<>();
+        sql.append(" and tenant.id=:agencyId");
+        paramts.put("agencyId", agencyId);
+        return select(sql.append(GOODS_NUM_PRICE_END).toString(), paramts, new MapperUtil());
+    }
+
 }
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
index a0a051d..e063677 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
@@ -33,8 +33,8 @@
         }
         //鏈烘瀯
         if (param.getAgencyId() != null) {
-            sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
-            paramts.put("lengthAgencyId", param.getAgencyId());
+            sql.append(" and ware.AGENCY_ID=:agencyId");
+//            paramts.put("lengthAgencyId", param.getAgencyId());
             paramts.put("agencyId", param.getAgencyId());
         }
         //浠撳簱绫诲瀷
@@ -67,6 +67,10 @@
             sql.append(" AND cate.CLASSIFICATION=':costType'");
             paramts.put("costType", costType);
         }
+        if (param.getWarningType() != null) {
+            sql.append(" AND wareWarn.WARNING_TYPE=:warningType");
+            paramts.put("warningType", param.getWarningType());
+        }
 
         sql.append(" ORDER BY wareWarn.DEAL_TIME DESC ");
 
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser_mapper.java
index aaf437a..fbab27f 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser_mapper.java
@@ -49,7 +49,7 @@
     public static final String AgentJid = "agent_jid";
     public static final String WorkgroupJid = "workgroup_jid";
     public static final String ClientNumber = "client_number";
-    public static final String ClientPwd = "client_pwd";
+    public static final String ClientPd = "client_pwd";
     public static final String TenantName = "tenant_name";
     public static final String Lv = "lv";
     public static final String SupplierId = "supplier_Id";
@@ -225,7 +225,7 @@
         ib.set(AgentJid, this.getAgentJid(), this.isset_agentJid);
         ib.set(WorkgroupJid, this.getWorkgroupJid(), this.isset_workgroupJid);
         ib.set(ClientNumber, this.getClientNumber(), this.isset_clientNumber);
-        ib.set(ClientPwd, this.getClientPwd(), this.isset_clientPwd);
+        ib.set(ClientPd, this.getClientPwd(), this.isset_clientPwd);
         return ib.genMapSql();
     }
 
@@ -258,7 +258,7 @@
         ub.set(AgentJid, this.getAgentJid(), this.isset_agentJid);
         ub.set(WorkgroupJid, this.getWorkgroupJid(), this.isset_workgroupJid);
         ub.set(ClientNumber, this.getClientNumber(), this.isset_clientNumber);
-        ub.set(ClientPwd, this.getClientPwd(), this.isset_clientPwd);
+        ub.set(ClientPd, this.getClientPwd(), this.isset_clientPwd);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -292,7 +292,7 @@
         ub.set(AgentJid, this.getAgentJid(), this.isset_agentJid);
         ub.set(WorkgroupJid, this.getWorkgroupJid(), this.isset_workgroupJid);
         ub.set(ClientNumber, this.getClientNumber(), this.isset_clientNumber);
-        ub.set(ClientPwd, this.getClientPwd(), this.isset_clientPwd);
+        ub.set(ClientPd, this.getClientPwd(), this.isset_clientPwd);
         return ub.genMapSql(where, parameters);
     }
 
@@ -325,7 +325,7 @@
         ub.set(AgentJid, this.getAgentJid(), this.isset_agentJid);
         ub.set(WorkgroupJid, this.getWorkgroupJid(), this.isset_workgroupJid);
         ub.set(ClientNumber, this.getClientNumber(), this.isset_clientNumber);
-        ub.set(ClientPwd, this.getClientPwd(), this.isset_clientPwd);
+        ub.set(ClientPd, this.getClientPwd(), this.isset_clientPwd);
         return ub.genArraySql(where, parameters);
     }
 
@@ -573,7 +573,7 @@
         if (columnIndex > 0) {
             fin_sys_tenant_user.setClientNumber(rs.getString(columnIndex));
         }
-        columnIndex = resultSetUtils.findColumn(rs, FinSysTenantUser_mapper.ClientPwd);
+        columnIndex = resultSetUtils.findColumn(rs, FinSysTenantUser_mapper.ClientPd);
         if (columnIndex > 0) {
             fin_sys_tenant_user.setClientPwd(rs.getString(columnIndex));
         }
diff --git a/deploy-jar-single/pom.xml b/deploy-jar-single/pom.xml
index f56e3cf..19e1ffe 100644
--- a/deploy-jar-single/pom.xml
+++ b/deploy-jar-single/pom.xml
@@ -95,7 +95,12 @@
 <!--            <groupId>com.iplatform</groupId>-->
 <!--            <artifactId>iplatform-report</artifactId>-->
 <!--        </dependency>-->
-
+        <!-- 閰嶇疆鏂囦欢鍔犲瘑 -->
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java b/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java
index 7321ad7..9704716 100644
--- a/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java
+++ b/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java
@@ -1,46 +1,46 @@
-package com.consum.test;
-
-import com.consum.ConsumApplication;
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {ConsumApplication.class})
-public class CodeGeneratorServiceTest {
-
-    @Autowired
-    private CodeGeneratorService service;
-
-    @Test
-    public void createWarehouseCode(){
-       for (int i=0;i<5;i++){
-           String code =service.createWarehouseCode();
-           System.out.println(code);
-       }
-    }
-
+//package com.consum.test;
+//
+//import com.consum.ConsumApplication;
+//import com.consum.base.core.CodeGeneratorEnum;
+//import com.consum.base.core.CodeGeneratorService;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = {ConsumApplication.class})
+//public class CodeGeneratorServiceTest {
+//
+//    @Autowired
+//    private CodeGeneratorService service;
+//
 //    @Test
-//    public void createGoodsTemplateCode(){
-//        String[] prefixs =  new String[] {"A","B","C","A","B"};
-//        int[] leis = new int[]{1,2,2,1,2};
+//    public void createWarehouseCode(){
+//       for (int i=0;i<5;i++){
+//           String code =service.createWarehouseCode();
+//           System.out.println(code);
+//       }
+//    }
+//
+////    @Test
+////    public void createGoodsTemplateCode(){
+////        String[] prefixs =  new String[] {"A","B","C","A","B"};
+////        int[] leis = new int[]{1,2,2,1,2};
+////        for (int i=0;i<5;i++){
+////            String code =service.createGoodsTemplateCode(prefixs[i],leis[i]);
+////            System.out.println(code);
+////        }
+////    }
+//
+//    @Test
+//    public void createBusinessFormCode(){
 //        for (int i=0;i<5;i++){
-//            String code =service.createGoodsTemplateCode(prefixs[i],leis[i]);
+//            String code =service.createBusinessFormCode(CodeGeneratorEnum.Transfer);
 //            System.out.println(code);
 //        }
 //    }
-
-    @Test
-    public void createBusinessFormCode(){
-        for (int i=0;i<5;i++){
-            String code =service.createBusinessFormCode(CodeGeneratorEnum.Transfer);
-            System.out.println(code);
-        }
-    }
-
-}
+//
+//}
diff --git a/deploy-jar-single/src/main/java/com/consum/test/base/Base_Category.java b/deploy-jar-single/src/main/java/com/consum/test/base/Base_Category.java
index 772d042..653b689 100644
--- a/deploy-jar-single/src/main/java/com/consum/test/base/Base_Category.java
+++ b/deploy-jar-single/src/main/java/com/consum/test/base/Base_Category.java
@@ -1,37 +1,37 @@
-package com.consum.test.base;
-
-import com.consum.ConsumApplication;
-import com.consum.base.core.data.Base_CategoryService;
-import com.consum.model.po.BaseCategory;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.jdbc.BaseDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {ConsumApplication.class})
-public class Base_Category {
-    @Autowired
-    private Base_CategoryService service;
-
-    @Test
-    public void addFirstCategory(){
-        for (int ii =0;ii <10;ii++){
-            Long id = NumberGenerator.getLongSequenceNumber();
-            for (int i=0;i<1000;i++){
-                service.addFirstCategory(id);
-            }
-        }
-    }
-    @Test
-    public void addSecondCategory(){
-        service.addSecondCategory(12624043866144l);
-    }
-    @Test
-    public void addThirdCategory(){
-        service.addThirdCategory(12838134761035l);
-    }
-}
+//package com.consum.test.base;
+//
+//import com.consum.ConsumApplication;
+//import com.consum.base.core.data.Base_CategoryService;
+//import com.consum.model.po.BaseCategory;
+//import com.walker.infrastructure.utils.NumberGenerator;
+//import com.walker.jdbc.BaseDao;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = {ConsumApplication.class})
+//public class Base_Category {
+//    @Autowired
+//    private Base_CategoryService service;
+//
+//    @Test
+//    public void addFirstCategory(){
+//        for (int ii =0;ii <10;ii++){
+//            Long id = NumberGenerator.getLongSequenceNumber();
+//            for (int i=0;i<1000;i++){
+//                service.addFirstCategory(id);
+//            }
+//        }
+//    }
+//    @Test
+//    public void addSecondCategory(){
+//        service.addSecondCategory(12624043866144l);
+//    }
+//    @Test
+//    public void addThirdCategory(){
+//        service.addThirdCategory(12838134761035l);
+//    }
+//}
diff --git a/deploy-jar-single/src/main/java/com/consum/test/synchronizedCode.java b/deploy-jar-single/src/main/java/com/consum/test/synchronizedCode.java
index d27c5cd..d61d8e6 100644
--- a/deploy-jar-single/src/main/java/com/consum/test/synchronizedCode.java
+++ b/deploy-jar-single/src/main/java/com/consum/test/synchronizedCode.java
@@ -1,47 +1,47 @@
-package com.consum.test;
-
-/**
- * 娴嬭瘯澶氱嚎绋嬪苟鍙�
- */
-public class synchronizedCode implements Runnable {
-
-    static synchronizedCode instance = new synchronizedCode();
-    static int i = 0;
-
-    static String key = "1";
-
-    public static void main(String[] args) throws InterruptedException {
-        for (int j=0;j<5;j++){
-            Thread t1 = new Thread(instance);
-            t1.start();
-        }
-
-        System.out.println("绾跨▼鎵ц缁撴潫");
-    }
-
-    @Override
-    public void run() {
-
-        String myKey;
-        if (key == "1"){
-            myKey = "def";
-            key = "2";
-        } else {
-            myKey = "abc";
-            key="1";
-        }
-
-        System.out.println(Thread.currentThread().getName() + ":" + myKey);
-
-        synchronized (myKey){
-            System.out.println(Thread.currentThread().getName() + "寮�濮嬭繍琛�");
-            try {
-                Thread.sleep(3000);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-            System.out.println("鎴戝彨"+ Thread.currentThread().getName()+"杩愯缁撴潫");
-        }
-    }
-}
\ No newline at end of file
+//package com.consum.test;
+//
+///**
+// * 娴嬭瘯澶氱嚎绋嬪苟鍙�
+// */
+//public class synchronizedCode implements Runnable {
+//
+//    static synchronizedCode instance = new synchronizedCode();
+//    static int i = 0;
+//
+//    static String key = "1";
+//
+//    public static void main(String[] args) throws InterruptedException {
+//        for (int j=0;j<5;j++){
+//            Thread t1 = new Thread(instance);
+//            t1.start();
+//        }
+//
+//        System.out.println("绾跨▼鎵ц缁撴潫");
+//    }
+//
+//    @Override
+//    public void run() {
+//
+//        String myKey;
+//        if (key == "1"){
+//            myKey = "def";
+//            key = "2";
+//        } else {
+//            myKey = "abc";
+//            key="1";
+//        }
+//
+//        System.out.println(Thread.currentThread().getName() + ":" + myKey);
+//
+//        synchronized (myKey){
+//            System.out.println(Thread.currentThread().getName() + "寮�濮嬭繍琛�");
+//            try {
+//                Thread.sleep(3000);
+//            } catch (InterruptedException e) {
+//                // TODO Auto-generated catch block
+//                e.printStackTrace();
+//            }
+//            System.out.println("鎴戝彨"+ Thread.currentThread().getName()+"杩愯缁撴潫");
+//        }
+//    }
+//}
diff --git a/deploy-jar-single/src/main/resources/application-dev.yml b/deploy-jar-single/src/main/resources/application-dev.yml
index 0a3dd1a..08d7122 100644
--- a/deploy-jar-single/src/main/resources/application-dev.yml
+++ b/deploy-jar-single/src/main/resources/application-dev.yml
@@ -7,7 +7,8 @@
 # 鏁版嵁搴撻摼鎺�
     dataBaseName: low_consum_manage_dev
     username: root
-    password: Bjjmy_2020
+#    Bjjmy_2020
+    password: ENC(V7lFKlYcHfEzTbXsbBQhSUswgxLsbS5z)
     url: jdbc:mysql://116.198.40.76:3306/${spring.datasource.dataBaseName}?useUnicode=true&characterEncoding=UTF-8&useSSL=false
 # Druid杩炴帴姹�
     type: com.walker.jdbc.ds.MyDruidDataSource
@@ -35,7 +36,7 @@
     host: 116.198.40.76
     port: 6379
     database: 11
-    password: Jmy2019.
+    password: ENC(C40h1dp9Q1oLqdU+JUGSBOWUfOmj/ZO4)   #Jmy2019.
 
   mvc:
     pathmatch:
@@ -151,8 +152,8 @@
 #      - /api/**
 
     # 瓒呯骇绠＄悊鍛樺瘑鐮侊紝鍔犲瘑鍚庣殑绉樻枃
-    supervisor-password: $2a$10$9lSwwUFMULR6/KhPsUbTj.0PTZfTnq0fB3OtS6PWoKAibpa8hL1cy
-
+    supervisor-password: ENC(cDkgI4dm/vDXFDsDm5KJW23i5zAAUxIUW448ReA27tmgQ83ZLgO3k/YMK5+wIiuGDKPDIXUH9/irgKTLMKl7n7mP6XRgBnOf)
+    #    supervisor-password: $2a$10$9lSwwUFMULR6/KhPsUbTj.0PTZfTnq0fB3OtS6PWoKAibpa8hL1cy
     # 鏄惁鍏佽閰嶇疆璺ㄥ煙鍝嶅簲澶�, true 鍚敤锛� false 涓嶅惎鐢ㄣ��2022-12-28
     # 鍦℅ateway妯″紡涓紝闇�瑕佸叧闂法鍩熼厤缃紝鍥犱负缃戝叧涔熶細閰嶇疆銆�
     cors-enabled: true
@@ -218,7 +219,7 @@
       ip: 116.198.40.76
       port: 22
       user-name: mysftp
-      password: Bjjmy_2020
+      password: ENC(kEQ43JzZv6yOOmbmKNLWmsU/wQKTwA9x)
       private-key:
       # ftp鏈嶅姟涓婇潰鐨勫瓨鍌ㄦ牴璺緞锛屽彧鑳芥槸linux璺緞
       file-root: /progress/
@@ -248,4 +249,4 @@
     # 閭欢閫氱煡鍙戦�佷俊鎭厤缃紝2023-04-26
     mail-server: smtp.126.com
     mail-from: hnzzzhsl@126.com
-    mail-password: test
+    mail-password: ENC(hjRDRcQmmhpUICkAaJnXUQ==)
diff --git a/deploy-jar-single/src/main/resources/application-prod.yml b/deploy-jar-single/src/main/resources/application-prod.yml
index 28f88b7..bfbfa40 100644
--- a/deploy-jar-single/src/main/resources/application-prod.yml
+++ b/deploy-jar-single/src/main/resources/application-prod.yml
@@ -6,8 +6,8 @@
     show-sql: true
     # 鏁版嵁搴撻摼鎺�
     username: root
-    password: Bjjmy_2020
-    dataBaseName: low_consum_manage_dev
+    password: ENC(Zw99rAYSpDE2VCWJjC+C8hFAOItlbiSZ)
+    dataBaseName: low_consum_manage
     url: jdbc:mysql://192.200.0.49:3306/${spring.datasource.dataBaseName}?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     # Druid杩炴帴姹�
     type: com.walker.jdbc.ds.MyDruidDataSource
@@ -35,7 +35,7 @@
     host: 192.200.0.49
     port: 6379
     database: 11
-    password: Jmy2019.
+    password: ENC(1IxlpqZ3ykMIWVknDjVydrCpK/6nccv/)   #Jmy2019.
 
   mvc:
     pathmatch:
@@ -151,7 +151,8 @@
     #      - /api/**
 
     # 瓒呯骇绠＄悊鍛樺瘑鐮侊紝鍔犲瘑鍚庣殑绉樻枃
-    supervisor-password: $2a$10$9lSwwUFMULR6/KhPsUbTj.0PTZfTnq0fB3OtS6PWoKAibpa8hL1cy
+    supervisor-password: ENC(cDkgI4dm/vDXFDsDm5KJW23i5zAAUxIUW448ReA27tmgQ83ZLgO3k/YMK5+wIiuGDKPDIXUH9/irgKTLMKl7n7mP6XRgBnOf)
+    #    supervisor-password: $2a$10$9lSwwUFMULR6/KhPsUbTj.0PTZfTnq0fB3OtS6PWoKAibpa8hL1cy
 
     # 鏄惁鍏佽閰嶇疆璺ㄥ煙鍝嶅簲澶�, true 鍚敤锛� false 涓嶅惎鐢ㄣ��2022-12-28
     # 鍦℅ateway妯″紡涓紝闇�瑕佸叧闂法鍩熼厤缃紝鍥犱负缃戝叧涔熶細閰嶇疆銆�
@@ -218,7 +219,7 @@
       ip: 192.200.0.28
       port: 22
       user-name: mysftp
-      password: Jmy@2023
+      password: ENC(3o6p8lx7FWgH1Zi6gZ7ruZnt2geVGiC/)
       private-key:
       # ftp鏈嶅姟涓婇潰鐨勫瓨鍌ㄦ牴璺緞锛屽彧鑳芥槸linux璺緞
       file-root: /lowconsum/
@@ -248,4 +249,4 @@
     # 閭欢閫氱煡鍙戦�佷俊鎭厤缃紝2023-04-26
     mail-server: smtp.126.com
     mail-from: hnzzzhsl@126.com
-    mail-password: test
+    mail-password: ENC(hjRDRcQmmhpUICkAaJnXUQ==)
diff --git a/deploy-jar-single/src/main/resources/import/depTaiZhangExpTemp.xlsx b/deploy-jar-single/src/main/resources/import/depTaiZhangExpTemp.xlsx
new file mode 100644
index 0000000..1bd3ffb
--- /dev/null
+++ b/deploy-jar-single/src/main/resources/import/depTaiZhangExpTemp.xlsx
Binary files differ
diff --git a/deploy-jar-single/src/main/resources/import/taiZhangExpTemp.xlsx b/deploy-jar-single/src/main/resources/import/taiZhangExpTemp.xlsx
index 5d99e2e..3631b7a 100644
--- a/deploy-jar-single/src/main/resources/import/taiZhangExpTemp.xlsx
+++ b/deploy-jar-single/src/main/resources/import/taiZhangExpTemp.xlsx
Binary files differ

--
Gitblit v1.9.1