|
@@ -949,26 +949,26 @@
|
|
|
|
|
|
<select id="selectQueryMenuList" parameterType="TWarehousebillsfees"
|
|
<select id="selectQueryMenuList" parameterType="TWarehousebillsfees"
|
|
resultType="com.ruoyi.warehouseBusiness.excel.QueryMenu">
|
|
resultType="com.ruoyi.warehouseBusiness.excel.QueryMenu">
|
|
- SELECT distinct
|
|
|
|
|
|
+ SELECT
|
|
tc.f_name AS corpName,
|
|
tc.f_name AS corpName,
|
|
tf.f_mblno AS fMblno,
|
|
tf.f_mblno AS fMblno,
|
|
IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY' || tf.f_billtype = 'KCZZ',tf.f_bsdate, null) AS fBsdate,
|
|
IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY' || tf.f_billtype = 'KCZZ',tf.f_bsdate, null) AS fBsdate,
|
|
tf.f_review_date AS fReviewDate,
|
|
tf.f_review_date AS fReviewDate,
|
|
te.f_name AS feeName,
|
|
te.f_name AS feeName,
|
|
tf.f_dc AS fDc,
|
|
tf.f_dc AS fDc,
|
|
- sum(tf.f_amount) AS fAmount,
|
|
|
|
|
|
+ tf.f_amount AS fAmount,
|
|
tf.f_stlamount_no AS fStlamountNo,
|
|
tf.f_stlamount_no AS fStlamountNo,
|
|
tw.f_shipper AS fShipper,
|
|
tw.f_shipper AS fShipper,
|
|
tw.f_emblno AS fEmblno,
|
|
tw.f_emblno AS fEmblno,
|
|
- sum(tf.f_stlamount) AS fStlamount,
|
|
|
|
|
|
+ tf.f_stlamount AS fStlamount,
|
|
tf.f_stlamount_date AS fStlamountDate,
|
|
tf.f_stlamount_date AS fStlamountDate,
|
|
- sum(tf.f_invamount) AS fInvamount,
|
|
|
|
|
|
+ tf.f_invamount AS fInvamount,
|
|
tf.f_invnos AS fInvnos,
|
|
tf.f_invnos AS fInvnos,
|
|
- sum(tf.f_accamount) AS fAccamount,
|
|
|
|
|
|
+ tf.f_accamount AS fAccamount,
|
|
tf.f_accamount_date AS fAccamountDate,
|
|
tf.f_accamount_date AS fAccamountDate,
|
|
tf.f_statement_no AS fStatementNo,
|
|
tf.f_statement_no AS fStatementNo,
|
|
tf.f_feeUnitid AS fFeeUnitid,
|
|
tf.f_feeUnitid AS fFeeUnitid,
|
|
- sum(tf.f_qty) AS fQty,
|
|
|
|
|
|
+ tf.f_qty AS fQty,
|
|
tf.f_unitprice AS fUnitprice,
|
|
tf.f_unitprice AS fUnitprice,
|
|
tf.f_billtype AS fBilltype,
|
|
tf.f_billtype AS fBilltype,
|
|
tf.f_product_name AS fProductName,
|
|
tf.f_product_name AS fProductName,
|