This commit is contained in:
Administrator 2025-08-02 02:30:43 +08:00
parent a18026e5bc
commit 3ea7c1837d
3 changed files with 27 additions and 13 deletions

View File

@ -440,7 +440,6 @@
</Target> </Target>
<Import Project="packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets" Condition="Exists('packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets')" /> <Import Project="packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets" Condition="Exists('packages\SkiaSharp.NativeAssets.Win32.2.88.8\build\net462\SkiaSharp.NativeAssets.Win32.targets')" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>copy $(TargetPath) "D:\kingdee\K3Cloud\WebSite\Bin\$(TargetFileName)"</PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View File

@ -40,10 +40,14 @@ namespace GZ_LTHPilot_ORDER.ScheduleService
var startDate = planStartDate.AddDays(-advanceAays); var startDate = planStartDate.AddDays(-advanceAays);
var endDate = startDate.AddMonths(1); var endDate = startDate.AddMonths(1);
// 如果开始时间大于计划开始时间,说明结束了 // 如果开始时间大于计划开始时间,说明结束了
while (startDate > planStartDate) while (startDate <= planStartDate)
{ {
var receiveAmountList = saleOrderService.GetSaleOrderReceiveAmountByDate(orgId, startDate, endDate); var receiveAmountList = saleOrderService.GetSaleOrderReceiveAmountByDate(orgId, startDate, endDate);
InsertDataToTempTable(ctx, tableName, orgId, receiveAmountList); if (receiveAmountList.Count > 0)
{
InsertDataToTempTable(ctx, tableName, orgId, receiveAmountList);
}
startDate = startDate.AddMonths(1); startDate = startDate.AddMonths(1);
endDate = startDate.AddMonths(1); endDate = startDate.AddMonths(1);
} }
@ -61,8 +65,7 @@ namespace GZ_LTHPilot_ORDER.ScheduleService
/// <returns></returns> /// <returns></returns>
private int UpdateSaleOrderReceiveAmount(Context ctx, string tableName) private int UpdateSaleOrderReceiveAmount(Context ctx, string tableName)
{ {
var sql = $@" var sql = $@"/*dialect*/UPDATE t1
UPDATE t1
SET SET
t1.F_AMOUNT = FAMOUNT t1.F_AMOUNT = FAMOUNT
FROM FROM
@ -86,15 +89,23 @@ FROM
/// <returns></returns> /// <returns></returns>
private int InsertDataToTempTable(Context ctx, string tableName, string orgId, List<SaleExecuteOut> saleExecuteOuts) private int InsertDataToTempTable(Context ctx, string tableName, string orgId, List<SaleExecuteOut> saleExecuteOuts)
{ {
var values = saleExecuteOuts.Select(n => $"({orgId},'{n.FSALEORGNAME}','{n.FBILLNO}',{n.FALLMATCHAMOUNT},'{n.FDate}')"); var values = saleExecuteOuts.Select(n => $"({orgId},'{n.FSALEORGNAME}','{n.FBILLNO}',{n.FALLMATCHAMOUNT},'{n.FDate}')").ToList();
var valuesString = string.Join(",", values); var index = 0;
var sqlTemp = $@" var line = 0;
INSERT INTO var pageSize = 100;
while (values.Count > index)
{
var valuesString = string.Join(",", values.Where(n => values.IndexOf(n) >= index && values.IndexOf(n) < index + pageSize));
var sqlTemp = $@"/*dialect*/INSERT INTO
{tableName} (FORGID, FORGNAME, FBILLNO, FAMOUNT, FDATE) {tableName} (FORGID, FORGNAME, FBILLNO, FAMOUNT, FDATE)
VALUES VALUES
{valuesString} {valuesString}
"; ";
return DBServiceHelper.Execute(ctx, sqlTemp); line += DBServiceHelper.Execute(ctx, sqlTemp);
index += pageSize;
}
return line;
} }
/// <summary> /// <summary>
@ -104,8 +115,7 @@ VALUES
/// <param name="tableName"></param> /// <param name="tableName"></param>
private void CreateTempTable(Context ctx, string tableName) private void CreateTempTable(Context ctx, string tableName)
{ {
var sql = $@" var sql = $@"/*dialect*/CREATE TABLE
CREATE TABLE
{tableName} ( {tableName} (
FORGID int, FORGID int,
FORGNAME NVARCHAR (100), FORGNAME NVARCHAR (100),

View File

@ -143,7 +143,12 @@ WHERE
var resultDict = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString); var resultDict = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString);
var resultString = JsonConvert.SerializeObject(resultDict); var resultString = JsonConvert.SerializeObject(resultDict);
var result = JsonConvert.DeserializeObject<KingdeeResult<SaleExecuteOut>>(resultString); var result = JsonConvert.DeserializeObject<KingdeeResult<SaleExecuteOut>>(resultString);
if (result.Result.RowCount == 0)
{
return new List<SaleExecuteOut>();
}
var rows = result.Result.Rows; var rows = result.Result.Rows;
var dataRow = rows.Where(n => n.FBILLNO.Trim() != string.Empty).Select(n => new SaleExecuteOut var dataRow = rows.Where(n => n.FBILLNO.Trim() != string.Empty).Select(n => new SaleExecuteOut
{ {
FBILLNO = n.FBILLNO, FBILLNO = n.FBILLNO,