[CODE]: 对账导出

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TContrastController.java

@@ -14,6 +14,7 @@ import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -150,4 +151,13 @@ public class TContrastController extends BaseController {
         return tFeeService.revoke(tFee,tFeeDo,loginUser,billsType);
     }
 
+    /**
+     * 导出入库详情主表列表
+     */
+    @GetMapping("/exportItems/{fId}")
+    public AjaxResult exportItems(@PathVariable("fId") Long fId) {
+        List<TWareHouseExcelItems> list = tFeeService.selectTWarehousebillsItemsList(fId);
+        ExcelUtil<TWareHouseExcelItems> util = new ExcelUtil<TWareHouseExcelItems>(TWareHouseExcelItems.class);
+        return util.exportExcel(list, "warehousebills");
+    }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/mapper/TFeeMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.finance.mapper;
 
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -73,4 +74,12 @@ public interface TFeeMapper {
     public List<Map<String, Object>> warehouseBillsFeesListAccamount(@Param("map") Map<String, Object> map);
 
     public List<Map<String, Object>> warehouseBillsFeesList1(TWareHouseFees tWareHouseFees);
+
+
+    /**
+     * 查询详情主表列表
+     * @param fid
+     * @return 详情主表集合
+     */
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(@Param("fId") Long fid);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/ITFeeService.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 
 import java.util.List;
 import java.util.Map;
@@ -98,4 +99,11 @@ public interface ITFeeService {
     public AjaxResult revoke(String tfee, String tfeeDo ,LoginUser loginUser,String fBilltype);
 
     public AjaxResult queryRemove(Long fId);
+
+    /**
+     *  导出计算明细
+     * @param fId
+     * @return
+     */
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long  fId);
 }

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

@@ -105,19 +105,27 @@ public class TFeeServiceImpl implements ITFeeService {
                 TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fees.getfSrcpid());
                 // 费用名称
                 TFees tFees= tFeesMapper.selectTFeesById(fees.getfFeeid());
+                // 费用表数据
+                TWarehousebillsfees tWarehousebillsfees = tWarehousebillsfeesMapper.selectTWarehousebillsfeesById(fees.getfSrcid());
                 map1.put("fId",fees.getfId());
                 map1.put("fSrcid",fees.getfSrcid());
                 map1.put("fSrcpid",fees.getfSrcpid());
-                map1.put("fMblno",tWarehousebills.getfMblno());
+                map1.put("fMblno",tWarehousebillsfees.getfMblno());
                 map1.put("fBscorpno",tWarehousebills.getfBscorpno());
-                map1.put("fProductName",tWarehousebills.getfProductName());
-                map1.put("fBsdate",tWarehousebills.getfBsdate());
+                map1.put("fProductName",tWarehousebillsfees.getfProductName());
+                map1.put("fBsdate",tWarehousebillsfees.getfBsdate());
                 map1.put("fFeeid",fees.getfFeeid());
                 map1.put("fFeeName",tFees.getfName());
                 map1.put("fSrcdc",fees.getfSrcdc());
                 map1.put("fAmt",fees.getfAmt());
                 map1.put("fAmtdr",fees.getfAmtdr());
                 map1.put("fRemarks",fees.getfRemarks());
+                map1.put("srcBillNo",tWarehousebillsfees.getSrcId());
+                map1.put("fMarks",tWarehousebillsfees.getfMarks());
+                map1.put("fChargedate",tWarehousebillsfees.getfChargedate());
+                map1.put("fBillingDeadline",tWarehousebillsfees.getfBillingDeadline());
+                map1.put("fBillingDays",tWarehousebillsfees.getfBillingDays());
+                map1.put("fInventoryDays",tWarehousebillsfees.getfInventoryDays());
                 if(tWarehousebills.getfBilltype().equals("SJRK")){
                     map1.put("fBilltype","入库");
                 } else if(tWarehousebills.getfBilltype().equals("SJCK")){
@@ -494,6 +502,11 @@ public class TFeeServiceImpl implements ITFeeService {
         }
     }
 
+    @Override
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long fId) {
+        return tFeeMapper.selectTWarehousebillsItemsList(fId);
+    }
+
     /**
      *  更新费用明细
      * @param fid

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

@@ -497,4 +497,41 @@
         </where>
     </select>
 
+    <select id="selectTWarehousebillsItemsList"
+            resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems">
+        SELECT
+            ( @ii := @ii + 1 ) AS fId,
+            wi.src_bill_no AS fMblno,
+            CASE
+                wi.f_billtype
+                WHEN  'SJRK' THEN
+                    '入库'
+                WHEN  'SJCK' THEN
+                    '出库'
+                WHEN  'HQZY' THEN
+                    '货转'
+                WHEN  'CKDB' THEN
+                    '调拨'
+                WHEN 'KCZZ' THEN
+                    '库存总账'
+                END AS fBilltype,
+            wi.f_product_name AS fGoodsid,
+            wi.f_marks AS fMarks,
+            wi.f_billing_qty AS fBillingQty,
+            wi.f_bsdate AS fBsdate,
+            wi.f_inventory_days AS fInventoryDays,
+            wi.f_billing_days AS fBillingDays,
+            wi.f_amt AS fAmt,
+            wi.f_amt AS fAmt2
+        FROM
+            t_fee_do w
+                LEFT JOIN t_warehousebillsfees wi ON w.f_srcid = wi.f_id
+           ,(
+            SELECT
+                @ii := 0
+        ) AS ii
+        WHERE
+            w.f_pid = #{fId}
+    </select>
+
 </mapper>