Ver Fonte

修改返回数据添加fid

lichao há 3 anos atrás
pai
commit
5306ea5587

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/anpin/StockControl.java

@@ -249,6 +249,9 @@ public class StockControl extends BaseController {
     }
     /**
      * 出入库统计列表
+     *
+     * 2022/2/23
+     * 修改 返回数据添加fid
      */
     @PreAuthorize("@ss.hasPermi('anpin:stockControl:selectTWarehouseInorOut')")
     @GetMapping("/selectTWarehouseInorOut")

+ 6 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/anpin/WarhousrExcel.java

@@ -23,6 +23,12 @@ public class WarhousrExcel {
     private Date fBsdate;
     @Excel(name = "项目名称")
     private String projectName;
+
+    /**
+     *    fid
+     */
+    private String fId;
+
     @Excel(name = "开票公司")
     private String fSbuName;
     @Excel(name = "出入库类别")

+ 7 - 3
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -1016,7 +1016,9 @@
     <!--安品出入库统计-->
     <select id="selectTWarehouseInorOut" parameterType="TWarehousebillsfees"
             resultType="com.ruoyi.anpin.WarhousrExcel">
-        SELECT ti.f_bsdate AS fBsdate,/*进货时间*/
+        SELECT
+        tw.f_id AS fId,
+        ti.f_bsdate AS fBsdate,/*进货时间*/
         tf.f_name AS feeName,/*物资名称*/
         tf.f_currency AS fCurrencyName,/*物资规格*/
         tw.f_qty AS fQty,/*实际数量*/
@@ -1979,7 +1981,8 @@
     <!--安品调入统计-->
     <select id="selectTWarehouseFold" parameterType="TWarehousebillsfees"
             resultType="com.ruoyi.anpin.WarhousrExcel">
-        SELECT ti.f_bsdate AS fBsdate,/*进货时间*/
+        SELECT tw.f_id AS fId,
+        ti.f_bsdate AS fBsdate,/*进货时间*/
         tf.f_name AS feeName,/*物资名称*/
         tf.f_currency AS fCurrencyName,/*物资规格*/
         tw.f_qty AS fQty,/*实际数量*/
@@ -2050,7 +2053,8 @@
     <!--安品调出统计-->
     <select id="selectTWarehouseCallout" parameterType="TWarehousebillsfees"
             resultType="com.ruoyi.anpin.WarhousrExcel">
-        SELECT ti.f_bsdate AS fBsdate,/*进货时间*/
+        SELECT tw.f_id AS fId,
+        ti.f_bsdate AS fBsdate,/*进货时间*/
         tf.f_name AS feeName,/*物资名称*/
         tf.f_currency AS fCurrencyName,/*物资规格*/
         tw.f_qty AS fQty,/*实际数量*/