|
|
@@ -1084,7 +1084,7 @@
|
|
|
sc.dict_label AS ffeeunitidName,/*计价单位中文名*/
|
|
|
td.fqty AS fqty,/*数量*/
|
|
|
td.famount AS famount,/*金额*/
|
|
|
- tr.f_name AS fsbuName,/*开票公司*/
|
|
|
+ tr.f_name AS fsbuName,/*开票公司*/
|
|
|
round(td.price,2) AS price/*单价*/
|
|
|
<if test="groupDate != null and groupDate == 0">
|
|
|
,td.fBsdate AS fBsdate/*入库日期*/
|
|
|
@@ -1162,7 +1162,7 @@
|
|
|
<if test="groupDate != null and groupDate == 0">
|
|
|
td.fBsdate DESC,/*入库日期*/
|
|
|
</if>
|
|
|
- td.fgoodsid DESC
|
|
|
+ td.fgoodsid DESC
|
|
|
</select>
|
|
|
<!--安品利润统计-->
|
|
|
<select id="salectAnpinProfit" parameterType="TWarehousebills"
|
|
|
@@ -1184,9 +1184,9 @@
|
|
|
xs.fGoodid AS fGoodid,
|
|
|
IFNULL( xs.pay, 0 ) AS market,
|
|
|
IFNULL( sq.collect, 0 ) AS purchase,
|
|
|
- CASE WHEN xs.pay IS NOT NULL AND sq.collect IS NOT NULL THEN xs.pay-sq.collect
|
|
|
- WHEN xs.pay IS NULL AND sq.collect IS NOT NULL THEN 0 -sq.collect
|
|
|
- WHEN xs.pay IS NOT NULL AND sq.collect IS NULL THEN xs.pay- 0
|
|
|
+ CASE WHEN xs.pay IS NOT NULL AND sq.collect IS NOT NULL THEN xs.pay-sq.collect
|
|
|
+ WHEN xs.pay IS NULL AND sq.collect IS NOT NULL THEN 0 -sq.collect
|
|
|
+ WHEN xs.pay IS NOT NULL AND sq.collect IS NULL THEN xs.pay- 0
|
|
|
END AS profit
|
|
|
FROM
|
|
|
(
|
|
|
@@ -1260,9 +1260,9 @@
|
|
|
sq.fGoodid AS fGoodid,
|
|
|
IFNULL( xs.pay, 0 ) AS market,
|
|
|
IFNULL( sq.collect, 0 ) AS purchase,
|
|
|
- CASE WHEN xs.pay IS NOT NULL AND sq.collect IS NOT NULL THEN xs.pay-sq.collect
|
|
|
- WHEN xs.pay IS NULL AND sq.collect IS NOT NULL THEN 0 -sq.collect
|
|
|
- WHEN xs.pay IS NOT NULL AND sq.collect IS NULL THEN xs.pay- 0
|
|
|
+ CASE WHEN xs.pay IS NOT NULL AND sq.collect IS NOT NULL THEN xs.pay-sq.collect
|
|
|
+ WHEN xs.pay IS NULL AND sq.collect IS NOT NULL THEN 0 -sq.collect
|
|
|
+ WHEN xs.pay IS NOT NULL AND sq.collect IS NULL THEN xs.pay- 0
|
|
|
END AS profit
|
|
|
FROM
|
|
|
(
|
|
|
@@ -1334,7 +1334,8 @@
|
|
|
ORDER BY temp.years,temp.months,CONVERT(tp.f_name USING GBK)
|
|
|
</select>
|
|
|
<!--查询入库日期所在年月是否结账-->
|
|
|
- <select id="selectTMonthEndingClosingList" parameterType="object" resultType="com.ruoyi.anpin.TMonthEndingClosingExcel">
|
|
|
+ <select id="selectTMonthEndingClosingList" parameterType="object"
|
|
|
+ resultType="com.ruoyi.anpin.TMonthEndingClosingExcel">
|
|
|
select f_id, f_year, f_month, f_start, f_enf, f_status from t_month_ending_closing
|
|
|
<where>
|
|
|
<if test="fYear != null and fYear != ''">and f_year = #{fYear}</if>
|
|
|
@@ -1344,11 +1345,12 @@
|
|
|
ORDER BY f_year,f_month
|
|
|
</select>
|
|
|
<!--安品库存总账-->
|
|
|
- <select id="selectInventoryLedger" parameterType="TWarehousebills" resultType="com.ruoyi.anpin.InventoryLedgerExcel">
|
|
|
+ <select id="selectInventoryLedger" parameterType="TWarehousebills"
|
|
|
+ resultType="com.ruoyi.anpin.InventoryLedgerExcel">
|
|
|
SELECT
|
|
|
DATE_FORMAT( MAX(tf.f_bsdate), '%Y' ) AS fyears,
|
|
|
/*年*/
|
|
|
- /* DATE_FORMAT( MAX(tf.f_bsdate), '%m' ) AS fmonth,*/
|
|
|
+ /* DATE_FORMAT( MAX(tf.f_bsdate), '%m' ) AS fmonth,*/
|
|
|
/*月*/
|
|
|
tf.f_corpid AS fCorpid,
|
|
|
/*供应商*/
|
|
|
@@ -1372,39 +1374,54 @@
|
|
|
/*库区*/
|
|
|
th.f_warehouse_information AS fWarehouseName,
|
|
|
/*库区中文名*/
|
|
|
- ifnull(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END ),0) AS fBeginQty,
|
|
|
+ ifnull(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END ) - sum(
|
|
|
+ CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END ),0) AS fBeginQty,
|
|
|
/*期初数量*/
|
|
|
ROUND(
|
|
|
IFNULL((
|
|
|
- sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ))/(
|
|
|
- sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END )),
|
|
|
+ sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ) - sum(
|
|
|
+ CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ))/(
|
|
|
+ sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END ) - sum( CASE
|
|
|
+ WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_qty ELSE 0 END )),
|
|
|
0
|
|
|
),
|
|
|
2
|
|
|
) AS fBeginUnitprice,
|
|
|
/*期初单价*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ),0) AS fBeginAmount,
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ) -
|
|
|
+ sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<#{timeInterval[0]} THEN tf.f_amount ELSE 0 END ),0) AS
|
|
|
+ fBeginAmount,
|
|
|
/*期初金额*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END ),0) AS rQty,
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]}
|
|
|
+ THEN tf.f_qty ELSE 0 END ),0) AS rQty,
|
|
|
/*入库数量*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END ),0) AS cQty,
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]}
|
|
|
+ THEN tf.f_qty ELSE 0 END ),0) AS cQty,
|
|
|
/*出库数量*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_amount ELSE 0 END ),0) AS rfAmount,
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]}
|
|
|
+ THEN tf.f_amount ELSE 0 END ),0) AS rfAmount,
|
|
|
/*入库金额*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_amount ELSE 0 END ),0) AS cfAmount,
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate>=#{timeInterval[0]} AND tf.f_bsdate<=#{timeInterval[1]}
|
|
|
+ THEN tf.f_amount ELSE 0 END ),0) AS cfAmount,
|
|
|
/*出库金额*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END ) - sum( CASE WHEN tf.f_billtype = 'CK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END ),0) AS fAfterQty,
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END ) -
|
|
|
+ sum( CASE WHEN tf.f_billtype = 'CK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END ),0) AS
|
|
|
+ fAfterQty,
|
|
|
/*结余数量*/
|
|
|
ROUND(
|
|
|
IFNULL((
|
|
|
- sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_amount ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_amount ELSE 0 END ))/(
|
|
|
- sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<= #{timeInterval[1]} THEN tf.f_qty ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END )),
|
|
|
+ sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_amount ELSE 0 END ) - sum(
|
|
|
+ CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_amount ELSE 0 END ))/(
|
|
|
+ sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<= #{timeInterval[1]} THEN tf.f_qty ELSE 0 END ) - sum( CASE
|
|
|
+ WHEN tf.f_billtype='CK' AND tf.f_bsdate<=#{timeInterval[1]} THEN tf.f_qty ELSE 0 END )),
|
|
|
0
|
|
|
),
|
|
|
2
|
|
|
) AS fAfterUnitprice,
|
|
|
/*结余单价*/
|
|
|
- IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<= #{timeInterval[1]} THEN tf.f_amount ELSE 0 END ) - sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<= #{timeInterval[1]} THEN tf.f_amount ELSE 0 END ),0) AS fAfterAmount /*结余金额*/
|
|
|
+ IFNULL(sum( CASE WHEN tf.f_billtype='RK' AND tf.f_bsdate<= #{timeInterval[1]} THEN tf.f_amount ELSE 0 END ) -
|
|
|
+ sum( CASE WHEN tf.f_billtype='CK' AND tf.f_bsdate<= #{timeInterval[1]} THEN tf.f_amount ELSE 0 END ),0) AS
|
|
|
+ fAfterAmount /*结余金额*/
|
|
|
|
|
|
FROM
|
|
|
t_warehousebillsfees tf
|
|
|
@@ -1423,7 +1440,7 @@
|
|
|
AND tf.f_bsdate<=#{timeInterval[1]}
|
|
|
<if test="fFeeType != null">and te.f_feetype = #{fFeeType}</if>
|
|
|
<if test="fBillstatus != null">and tf.f_billstatus = #{fBillstatus}</if>
|
|
|
- <if test="fBillstatus == null">and tf.f_billstatus = 6 </if>
|
|
|
+ <if test="fBillstatus == null">and tf.f_billstatus = 6</if>
|
|
|
<if test="fCorpid != null ">and tf.f_corpid = #{fCorpid}</if>
|
|
|
<if test="fWarehouseid != null ">and tw.f_warehouseid = #{fWarehouseid}</if>
|
|
|
<if test="feeName != null and feeName != ''">and tf.f_feeid = #{feeName}</if>
|
|
|
@@ -1442,4 +1459,104 @@
|
|
|
CONVERT (
|
|
|
te.f_name USING GBK)
|
|
|
</select>
|
|
|
+ <!--安品查询费用信息-->
|
|
|
+ <select id="selectFeeMessage" parameterType="TWarehousebills" resultType="com.ruoyi.anpin.AnPingOrderMessage">
|
|
|
+ SELECT
|
|
|
+ tc.f_name AS fCorpName,
|
|
|
+ ROUND(temp.LastYear,2) AS LastYear,
|
|
|
+ ROUND(temp.January,2) AS January,
|
|
|
+ ROUND(temp.February,2) AS February,
|
|
|
+ ROUND(temp.March,2) AS March,
|
|
|
+ ROUND(temp.April,2) AS April,
|
|
|
+ ROUND(temp.May,2) AS May,
|
|
|
+ ROUND(temp.June,2) AS June,
|
|
|
+ ROUND(temp.July,2) AS July,
|
|
|
+ ROUND(temp.August,2) AS August,
|
|
|
+ ROUND(temp.September,2) AS September,
|
|
|
+ ROUND(temp.October,2) AS October,
|
|
|
+ ROUND(temp.November,2) AS November,
|
|
|
+ ROUND(temp.December,2) AS December,
|
|
|
+ ROUND(SUM(temp.LastYear+temp.January+temp.February+temp.March+temp.April+temp.May+temp.June+
|
|
|
+ temp.July+temp.August+temp.September+temp.October+temp.November+temp.December),2) AS total
|
|
|
+ FROM
|
|
|
+ ( SELECT
|
|
|
+ tw.f_corpid AS fCorpid,
|
|
|
+ CASE
|
|
|
+ YEAR ( tw.f_bsdate )
|
|
|
+ WHEN #{annum} THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS LastYear,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '1' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS January,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '2' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS February,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '3' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS March,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '4' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS April,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '5' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS May,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '6' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS June,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '7' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS July,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '8' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS August,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '9' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS September,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '10' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS October,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '11' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS November,
|
|
|
+ CASE
|
|
|
+ MONTH ( tw.f_bsdate )
|
|
|
+ WHEN '12' THEN
|
|
|
+ sum( tf.f_amount ) ELSE 0
|
|
|
+ END AS December
|
|
|
+ FROM
|
|
|
+ t_warehousebillsfees tf
|
|
|
+ LEFT JOIN t_warehousebills tw ON tw.f_id = tf.f_pid
|
|
|
+ where
|
|
|
+ DATE_FORMAT( tw.f_bsdate, '%Y' ) = #{tw.annual}
|
|
|
+ <if test="tw.fCorpid != null ">and tw.f_corpid = #{tw.fCorpid}</if>
|
|
|
+ <if test="tw.fBillstatus != null">and tw.f_billstatus = #{tw.fBillstatus}</if>
|
|
|
+ <if test="tw.fBilltype != null and tw.fBilltype != ''">and tw.f_billtype = #{tw.fBilltype}</if>
|
|
|
+ GROUP BY
|
|
|
+ tw.f_corpid ) AS temp
|
|
|
+ LEFT JOIN t_corps tc ON tc.f_id = temp.fCorpid
|
|
|
+ GROUP BY temp.fCorpid
|
|
|
+ </select>
|
|
|
</mapper>
|
lazhaoqian