1
This commit is contained in:
@@ -111,10 +111,10 @@ namespace Pilot_KD_Parino.SQL
|
||||
/// 获取核销收款单信息
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static DynamicObjectCollection GetWriteReceiveDate3(Context ctx, string FORGID)
|
||||
public static DynamicObjectCollection GetWriteReceiveDate3(Context ctx, string FORGID,string where )
|
||||
{
|
||||
//定义SQL,调用物料视图
|
||||
string sql = string.Format(@"/*dialect*/
|
||||
string sql = string.Format($@"/*dialect*/
|
||||
SELECT A.FID,
|
||||
A.FSALEERID,
|
||||
A.FCONTACTUNIT,
|
||||
@@ -130,9 +130,9 @@ namespace Pilot_KD_Parino.SQL
|
||||
FROM T_AR_RECEIVEBILL A
|
||||
WHERE A.FDOCUMENTSTATUS = 'C'
|
||||
AND A.FISINIT != '1'
|
||||
AND A.FSALEORGID = {0}
|
||||
|
||||
AND A.FRECAMOUNT != A.F_AMOUNT
|
||||
AND A.FRECAMOUNT >= A.F_AMOUNT
|
||||
AND A.FRECAMOUNT >= A.F_AMOUNT {where}
|
||||
order by FCONTACTUNIT,A.FID desc ", FORGID);
|
||||
return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null);
|
||||
}
|
||||
@@ -216,7 +216,7 @@ namespace Pilot_KD_Parino.SQL
|
||||
/// 获取核销销售订单信息
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static DynamicObjectCollection GetWriteOrderDate3(Context ctx, string FORGID)
|
||||
public static DynamicObjectCollection GetWriteOrderDate3(Context ctx, string FORGID,string where )
|
||||
{
|
||||
//定义SQL,调用物料视图
|
||||
string sql = string.Format($@"/*dialect*/
|
||||
@@ -240,15 +240,25 @@ namespace Pilot_KD_Parino.SQL
|
||||
0.00 AS BenCi,
|
||||
CASE WHEN A.F_Ordercategory ='670cca03263357' THEN 'P类合同' else '非P类合同' end as F_Ordercategory2,
|
||||
A.F_Ordercategory AS F_Ordercategory,
|
||||
0.00 as FInvoiceAmount
|
||||
(
|
||||
SELECT SUM(F_GeneralInvoice) AS '发票总金额' FROM (
|
||||
SELECT F_PaperNumber, t0.FSALEORGID,
|
||||
CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAX
|
||||
WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAX END AS F_GeneralInvoice
|
||||
--FAFTERTOTALTAX
|
||||
FROM T_IV_SALESIC t0 WITH(NOLOCK)
|
||||
INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID
|
||||
--WHERE F_PaperNumber='P202502070004'
|
||||
) AD WHERE AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID
|
||||
GROUP BY F_PaperNumber, FSALEORGID
|
||||
) as FInvoiceAmount
|
||||
FROM T_SAL_ORDER A
|
||||
INNER JOIN T_SAL_ORDERFIN C ON C.FID =A.FID
|
||||
WHERE
|
||||
C.FBILLALLAMOUNT_LC <>0
|
||||
AND A.FSALEORGID = {FORGID}
|
||||
C.FBILLALLAMOUNT_LC <>0
|
||||
AND A.FDOCUMENTSTATUS = 'C' AND ISNULL(A.F_CONTRACTNUMBER,'')!=''
|
||||
AND (A.F_AMOUNT < C.FBILLALLAMOUNT_LC
|
||||
or A.F_AMOUNT IS NULL) AND A.FBusinessType='NORMAL'
|
||||
or A.F_AMOUNT IS NULL) AND A.FBusinessType='NORMAL' {where}
|
||||
) A ORDER BY A.FCUSTID,a.FID desc ");
|
||||
return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user