Develop/Piolot_Order_TH
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0

Browse Source
This commit is contained in:
朱斌 2025-08-05 23:41:16 +08:00
parent 8746a2087b
commit f8aacb3921
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Services/SaleOrderService.cs
View File

@ -67,17 +67,21 @@ WHERE
Model = new Model() Model = new Model()
{ {
FSaleOrgList = orgId, FSaleOrgList = orgId,
FSoFromDate = date.AddDays(-2), FSoFromDate = date.AddDays(-30),
FSoToDate = date.AddDays(1), FSoToDate = date.AddDays(30),
FSaleOFrom = billNo, FSaleOFrom = billNo,
FSaleOTo = billNo, FSaleOTo = billNo,
FFormCloseStatus = "ALL", FFormCloseStatus = "ALL",
FFormStatus = "C", FFormStatus = "ALL",
FPriceFrom = "SALORDERBILL", FPriceFrom = "SALORDERBILL",
FBusCloseStatus = "ALL", FBusCloseStatus = "ALL",
FMergingSOHeader = true, FMergingSOHeader = true,
FIncludedUnfilledOrders = true, FIncludedUnfilledOrders = true,
FIsRecWithMat = true, FIsRecWithMat = true,
FSuite = "All",
FSetAccountType = "ALL",
FIsGroup = false,
FIncludedFree = true
} }
}; };
var paramString = JsonConvert.SerializeObject(param); var paramString = JsonConvert.SerializeObject(param);
@ -85,16 +89,16 @@ WHERE
var resultString = JsonConvert.SerializeObject(resultDict); var resultString = JsonConvert.SerializeObject(resultDict);
var result = JsonConvert.DeserializeObject<KingdeeResult<SaleExecuteOut>>(resultString); var result = JsonConvert.DeserializeObject<KingdeeResult<SaleExecuteOut>>(resultString);
var rows = result.Result.Rows; var rows = result.Result.Rows;
var dataRow = rows.Where(n => n.FBILLNO == billNo).FirstOrDefault(); var dataRow = rows.Where(n => n.FBILLNO == billNo).ToList();
if (dataRow == null) if (dataRow.Count() == 0)
{ {
return 0m; return 0m;
} }
if (dataRow.FALLMATCHAMOUNT.IsNullOrEmptyOrWhiteSpace()) if (dataRow[0].FALLMATCHAMOUNT.IsNullOrEmptyOrWhiteSpace())
{ {
return 0m; return 0m;
} }
return Convert.ToDecimal(dataRow.FALLMATCHAMOUNT); return Convert.ToDecimal(dataRow[0].FALLMATCHAMOUNT);
} }
@ -131,12 +135,16 @@ WHERE
FSoFromDate = startDate, FSoFromDate = startDate,
FSoToDate = endDate, FSoToDate = endDate,
FFormCloseStatus = "ALL", FFormCloseStatus = "ALL",
FFormStatus = "C", FFormStatus = "ALL",
FPriceFrom = "SALORDERBILL", FPriceFrom = "SALORDERBILL",
FBusCloseStatus = "ALL", FBusCloseStatus = "ALL",
FMergingSOHeader = true, FMergingSOHeader = true,
FIncludedUnfilledOrders = true, FIncludedUnfilledOrders = true,
FIsRecWithMat = true, FIsRecWithMat = true,
FSuite = "All",
FSetAccountType = "ALL",
FIsGroup = false,
FIncludedFree = true
} }
}; };
var paramString = JsonConvert.SerializeObject(param); var paramString = JsonConvert.SerializeObject(param);

18
Services/SaleSicsService.cs
View File

@ -37,12 +37,7 @@ namespace GZ_LTHPilot_ORDER.Service
var saleOrgId = saleOrder["FSALEORGID"].ToString(); var saleOrgId = saleOrder["FSALEORGID"].ToString();
var sqlTemp = @"/*dialect*/UPDATE t1 var sqlTemp = @"/*dialect*/UPDATE t1
SET SET
t1.F_INVOICEAMOUNT = ISNULL (TEMP1.FAFTERTOTALTAXFOR, 0) + ROUND( t1.F_INVOICEAMOUNT = ISNULL (TEMP1.FAFTERTOTALTAXFOR, 0)
(
ISNULL (TEMP1.FAFTERTOTALTAX, 0) / ISNULL (t1fin.FEXCHANGERATE, 0)
),
2
)
FROM FROM
T_SAL_ORDER t1 T_SAL_ORDER t1
INNER JOIN T_SAL_ORDERFIN t1fin ON t1.FID = t1fin.FID INNER JOIN T_SAL_ORDERFIN t1fin ON t1.FID = t1fin.FID
@ -57,7 +52,7 @@ FROM
SELECT SELECT
FSALEORGID, -- 销售组织 FSALEORGID, -- 销售组织
F_PaperNumber, -- 纸质合同号 F_PaperNumber, -- 纸质合同号
0 FAFTERTOTALTAX, ISNULL (FAFTERTOTALTAX, 0) FAFTERTOTALTAX, -- 价税合计本币
ISNULL (FAFTERTOTALTAXFOR, 0) FAFTERTOTALTAXFOR -- 价税合计 ISNULL (FAFTERTOTALTAXFOR, 0) FAFTERTOTALTAXFOR -- 价税合计
FROM FROM
T_IV_SALESIC T_IV_SALESIC
@ -65,20 +60,19 @@ FROM
1 = 1 1 = 1
AND FDOCUMENTSTATUS = 'C' AND FDOCUMENTSTATUS = 'C'
AND FCANCELSTATUS = 'A' AND FCANCELSTATUS = 'A'
AND FDATE >= '2025-01-01' AND t1.F_SFQC = 0
AND FSALEORGID = '{0}' AND FSALEORGID = '{0}'
AND F_PaperNumber = '{1}' AND F_PaperNumber = '{1}'
UNION ALL UNION ALL
SELECT SELECT
'100302' FSALEORGID, -- 销售组织 '100302' FSALEORGID, -- 销售组织
合同号 F_PaperNumber, -- 纸质合同号 合同号 F_PaperNumber, -- 纸质合同号
SUM(ISNULL (专票金额, 0) + ISNULL (普票金额, 0)) FAFTERTOTALTAX, -- 价税合计本币 SUM(ISNULL (发票金额, 0)) FAFTERTOTALTAX, -- 价税合计本币
0 -- 价税合计 SUM(ISNULL (发票原币金额, 0)) FAFTERTOTALTAXFOR -- 价税合计
FROM FROM
oldk3seorder0701 oldk3ICSale0802
WHERE WHERE
1 = 1 1 = 1
AND 日期 < '2025-01-01'
AND 合同号 = '{1}' AND 合同号 = '{1}'
GROUP BY GROUP BY
合同号 合同号