2022年11月25日17:36:04

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/ProfitController.java

@@ -8,6 +8,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.finance.domain.dto.FeeDTO;
+import com.ruoyi.finance.domain.excel.GeneralLedgerDetailExcel;
 import com.ruoyi.finance.domain.excel.ProfitGeneralLedgerExcel;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.reportManagement.excel.Profit;
@@ -45,6 +47,18 @@ public class ProfitController extends BaseController {
     }
 
     /**
+     * 根据结算单位、费用状态、审核日期查询应付总帐明细
+     */
+    @DataScope(deptAlias = "d", userAlias = "u")
+    @GetMapping("/generalLedgerList")
+    public AjaxResult financialLedgerDetails(FeeDTO feeDTO) {
+        return tFeeService.financialLedgerDetails(feeDTO);
+    }
+
+
+
+
+    /**
      * 应付总账列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:profit:export')")
@@ -62,4 +76,17 @@ public class ProfitController extends BaseController {
         return util.exportExcel(list, "利润总账");
     }
 
+    /**
+     * 应收总账列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:payable:export')")
+    @Log(title = "库存总账明细", businessType = BusinessType.EXPORT)
+    @DataScope(deptAlias = "d", userAlias = "u")
+    @GetMapping("/export/detail")
+    public AjaxResult exportDetail(FeeDTO feeDTO) throws Exception {
+        List<GeneralLedgerDetailExcel> list = tFeeService.financialLedgerDetailsExport(feeDTO);
+        ExcelUtil<GeneralLedgerDetailExcel> util = new ExcelUtil<GeneralLedgerDetailExcel>(GeneralLedgerDetailExcel.class);
+        return util.exportExcel(list, "应收总账明细");
+    }
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -769,8 +769,10 @@ public class TFeeServiceImpl implements ITFeeService {
         }
         if (tWareHouseFees.getSwitchSection() == 1) {
             tWareHouseFees.setTimeExamine(tWareHouseFees.getTimeExamine());
+            tWareHouseFees.setfBstimeExamine(null);
         } else {
             tWareHouseFees.setfBstimeExamine(tWareHouseFees.getTimeExamine());
+            tWareHouseFees.setTimeExamine(null);
         }
         return tFeeMapper.warehouseBillsFeesCustomProfitList(tWareHouseFees);
     }

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -1999,6 +1999,7 @@
     <select id="warehouseBillsFeesCustomProfitList" resultType="java.util.Map">
         SELECT
             c.f_name AS fName,
+               c.f_id AS fCorpid,
             DATE_FORMAT(w.f_review_date,'%Y-%m') AS reviewDate,
             DATE_FORMAT(t.f_bstime,'%Y-%m') AS f_bstime,
             sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) fAmount,
@@ -2886,7 +2887,8 @@
             IF ( w.f_feeid = #{feesId}, w.f_amount, 0.00 ) storage_fee,
             IF ( w.f_feeid != #{feesId}, w.f_amount, 0.00 ) other_fee,
             w.f_amount, w.f_stlamount AS fStlamount,
-            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS nnfinished
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS nnfinished,
+            t.f_bstime AS fBstime
         FROM t_warehousebills t
             LEFT JOIN t_warehousebillsfees w ON w.f_pid = t.f_id
             LEFT JOIN sys_user u ON t.create_by = u.user_name
@@ -2894,7 +2896,8 @@
             LEFT JOIN t_corps c ON c.f_id = w.f_corpid
             LEFT JOIN t_fees f ON w.f_feeid = f.f_id
         where
-            w.f_dc = #{fDc}
+            t.del_flag = '0'
+            <if test="fDc != null and fDc != ''">and w.f_dc = #{fDc}</if>
             <if test="fCorpId != null and fCorpId != ''">and w.f_corpid = #{fCorpId}</if>
             <if test='isReviewed != null and isReviewed == 0 '>
                 and w.f_billstatus != 6