Browse Source

[CODE]: 仓储计算费 导出

maxianghua 4 years ago
parent
commit
31ec66870e

+ 12 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TStorageFeeCalculationController.java

@@ -12,12 +12,14 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -111,4 +113,14 @@ public class TStorageFeeCalculationController extends BaseController {
         return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
     }
 
+    /**
+     * 导出入库详情主表列表
+     */
+    @GetMapping("/exportItems/{fId}")
+    public AjaxResult exportItems(@PathVariable("fId") Long fId) {
+        List<TWareHouseExcelItems> list = itWarehouseBillsService.selectTWarehousebillsItemsList(fId);
+        ExcelUtil<TWareHouseExcelItems> util = new ExcelUtil<TWareHouseExcelItems>(TWareHouseExcelItems.class);
+        return util.exportExcel(list, "warehousebills");
+    }
+
 }

+ 8 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import org.apache.ibatis.annotations.Param;
 
@@ -79,4 +80,11 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @return  结果
      */
     int warehouseFollowUpdate(@Param("fPid") Long fPid, @Param("fettle") Long fettle);
+
+    /**
+     * 查询详情主表列表
+     * @param fid
+     * @return 详情主表集合
+     */
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(@Param("fId") Long fid);
 }

+ 8 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -2,6 +2,7 @@ package com.ruoyi.warehouseBusiness.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 
 import java.util.List;
@@ -166,4 +167,11 @@ public interface ITWarehouseBillsService {
      * @return 结果
      */
     AjaxResult warehouseSubmission(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr, String tWarehousebillsitems, String tEnclosure, LoginUser loginUser, String billsType);
+
+    /**
+     *  导出计算明细
+     * @param fId
+     * @return
+     */
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long  fId);
 }

+ 5 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -702,6 +702,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
     }
 
+    @Override
+    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long  fId) {
+        return tWarehouseBillsMapper.selectTWarehousebillsItemsList(fId);
+    }
+
     /**
      * 根据仓库主表id 更新对应明细表状态
      *

+ 37 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -220,6 +220,43 @@
         ORDER BY f_bsdate desc
     </select>
 
+    <select id="selectTWarehousebillsItemsList"
+            resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems">
+        SELECT
+            ( @ii := @ii + 1 ) AS fId,
+            wi.f_billno AS fMblno,
+            CASE
+                wi.f_billtype
+                WHEN  'SJRK' THEN
+                    '入库'
+                WHEN  'SJCK' THEN
+                    '出库'
+                WHEN 'KCZZ' THEN
+                    '库存总账'
+                END AS fBilltype,
+            g.f_name AS fGoodsid,
+            wi.f_marks AS fMarks,
+            /*'' AS fBillingQty1,*/
+            wi.f_billing_qty AS fBillingQty,
+            /*'' AS fBillingQty2,*/
+            wi.f_bsdate AS fBsdate,
+            /*'' AS fBsdate1,*/
+            wi.f_inventory_days AS fInventoryDays,
+            wi.f_billing_days AS fBillingDays,
+            wi.f_amt AS fAmt,
+            /*'' AS fAmt1,*/
+            wi.f_amt AS fAmt2
+        FROM
+            t_warehousebills w
+                LEFT JOIN t_warehousebillsitems wi ON w.f_id = wi.f_pid
+                LEFT JOIN t_goods g ON g.f_id = wi.f_goodsid,(
+                SELECT
+                    @ii := 0
+            ) AS ii
+        WHERE
+            w.f_id = #{fId}
+    </select>
+
     <insert id="insertTWarehousebills" parameterType="TWarehousebills" useGeneratedKeys="true" keyProperty="fId">
         insert into t_warehousebills
         <trim prefix="(" suffix=")" suffixOverrides=",">