From 6665ddbc6dd0fe82ea3d47cd2bb5e48a5a27a712 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 17:46:57 +0800
Subject: [PATCH] feat: 报废明细

---
 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index bd56ed2..3fe3dfe 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
@@ -302,13 +302,10 @@
             paramts.put("chuKuBusinessFormCode", businessFormCode);
             sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
             paramts.put("baoFeiBusinessFormCode", businessFormCode);
-
-            sqlBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
+            sqlDepBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
             paramts.put("deptBaoFeiBusinessFormCode", businessFormCode);
-            sqlBaoFei.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
+            sqlDepTuiHui.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
             paramts.put("deptBackBusinessFormCode", businessFormCode);
-
-
             sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
             paramts.put("panDianBusinessFormCode", businessFormCode);
 
@@ -340,7 +337,8 @@
                 .append(sqlChuKu)
                 .append(sqlBaoFei)
                 .append(sqlPanDian)
-
+                .append(sqlDepBaoFei)
+                .append(sqlDepTuiHui)
                 .append(sqlEnd);
 
         return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
@@ -377,7 +375,8 @@
                 + "flow.DEAL_TIME,\n"
                 + "flow.OPERATOR_NAME,\n"
                 + "record.TOTAL_PRICE\n"
-                + "FROM  L_WAREHOUSE_FLOW flow\n"
+                + "FROM ( SELECT * FROM BASE_WAREHOUSE WHERE 1= 1 AND AGENCY_ID =:tenantId ) bw "
+                + "LEFT JOIN L_WAREHOUSE_FLOW flow ON bw.id = flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE = 0\n"
                 + "LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID\n"
                 + "LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID\n"
                 + "LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4) AND tTrans.id=flow.BUSINESS_FORM_ID\n"
@@ -385,13 +384,17 @@
                 + "LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID\n"
                 + "LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID\n"
                 + "LEFT JOIN USING_FORM_BACK tBack ON flow.BUSINESS_TYPE=6 AND tBack.id=flow.BUSINESS_FORM_ID\n"
-                + "LEFT JOIN base_warehouse bw ON flow.WAREHOUSE_ID = bw.id\n"
+                //+ "LEFT JOIN base_warehouse bw ON flow.WAREHOUSE_ID = bw.id\n"
                 + "LEFT JOIN fin_sys_tenant fst ON fst.id = bw.AGENCY_ID\n"
                 + "WHERE record.id IS NOT NULL ");
 
         HashMap<String, Object> paramts = new HashMap<>();
         //鏈烘瀯
         if (param.getAgencyId() != null) {
+            paramts.put("tenantId", param.getAgencyId());
+        }
+        //鏈烘瀯
+        if (param.getAgencyId() != null) {
             sql.append("AND fst.id like :agencyId ");
             paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
         }

--
Gitblit v1.9.1