From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 14 十一月 2023 14:05:20 +0800
Subject: [PATCH] 出库单管理

---
 consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index 8201368..253d995 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
@@ -3,13 +3,9 @@
 import com.consum.base.Constants;
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.util.IdUtil;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.model.po.*;
 import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
 import org.springframework.beans.BeanUtils;
@@ -37,6 +33,8 @@
     private FinSysTenantDepartmentServiceImpl departmentService;
     @Autowired
     private FinSysTenantUserServiceImpl userService;
+    @Autowired
+    private SDictDataServiceImpl sDictDataService;
 
     /**
      * @Description 鏂板
@@ -55,6 +53,11 @@
             baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
             baseWarehouse.setAgencyName(finSysTenant.getName());
         }
+        //鏍规嵁CLASSIFICATION_CODE鏌ヨCLASSIFICATION_NAME
+        SDictData dictData = this.sDictDataService.get(new SDictData(Long.valueOf(param.getClassificationCode())));
+        if (dictData != null) {
+            baseWarehouse.setClassificationName(dictData.getDict_label());
+        }
         baseWarehouse.setIsDefault(Constants.IS_DEFAULT_YES);
 
         return this.insert(baseWarehouse);
@@ -65,7 +68,8 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/26
      */
-    public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+//    public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+    public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) {
         StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
         HashMap<String, Object> paramts = new HashMap<>();
 
@@ -80,12 +84,12 @@
             paramts.put("CLASSIFICATION_CODE", param.getClassificationCode());
         }
         //鏈烘瀯id
-        sql.append(" and AGENCY_ID =:AGENCY_ID ");
-        if (param.getAgencyId() != null) {
-            paramts.put("AGENCY_ID", param.getAgencyId());
-        } else {
-            paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
-        }
+//        sql.append(" and AGENCY_ID =:AGENCY_ID ");
+//        if (param.getAgencyId() != null) {
+//            paramts.put("AGENCY_ID", param.getAgencyId());
+//        } else {
+//            paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
+//        }
         //鐘舵��
         if (param.getStates() != null) {
             sql.append(" and states =:states ");
@@ -104,6 +108,16 @@
      * @Date 2023/10/26
      */
     public int updateBaseWarehouse(BaseWarehouse baseWarehouse) {
+        SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode())));
+        if (SDictData != null) {
+            baseWarehouse.setClassificationName(SDictData.getDict_label());
+        }
+        //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+        FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+        if (finSysTenant != null) {
+            baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+            baseWarehouse.setAgencyName(finSysTenant.getName());
+        }
         return this.update(baseWarehouse);
     }
 
@@ -148,4 +162,22 @@
 
 
     }
+
+    /**
+     * @Description  鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/27
+     * @return
+     */
+    public List<BaseWarehouse> getByAgencyId(Long agencyId) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
+        HashMap<String, Object> paramts = new HashMap<>();
+
+        //鏈烘瀯id
+        if (agencyId != null) {
+            sql.append(" and AGENCY_ID =:AGENCY_ID ");
+            paramts.put("AGENCY_ID", agencyId);
+        }
+        return select(sql.toString(), paramts, new BaseWarehouse());
+    }
 }

--
Gitblit v1.9.1