diff --git a/GZ_LTHPilot_ORDER.csproj b/GZ_LTHPilot_ORDER.csproj index e5d80ea..fc30c5a 100644 --- a/GZ_LTHPilot_ORDER.csproj +++ b/GZ_LTHPilot_ORDER.csproj @@ -437,7 +437,6 @@ - - + copy $(TargetPath) "D:\kingdee\K3Cloud\WebSite\Bin\$(TargetFileName)" \ No newline at end of file diff --git a/Services/SaleOrderService.cs b/Services/SaleOrderService.cs index abec21c..4e3b38a 100644 --- a/Services/SaleOrderService.cs +++ b/Services/SaleOrderService.cs @@ -4,6 +4,7 @@ using GZ_LTHPilot_ORDER.Models.VO; using Kingdee.BOS; using Kingdee.BOS.Orm.DataEntity; using Kingdee.BOS.ServiceHelper; +using Kingdee.BOS.Util; using Kingdee.BOS.WebApi.FormService; using Kingdee.K3.FIN.App.Core.Match.Object; using Newtonsoft.Json; @@ -80,8 +81,9 @@ WHERE } }; var paramString = JsonConvert.SerializeObject(param); - var reusltString = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString).ToString(); - var result = JsonConvert.DeserializeObject>(reusltString); + var resultDict = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString); + var resultString = JsonConvert.SerializeObject(resultDict); + var result = JsonConvert.DeserializeObject>(resultString); var rows = result.Result.Rows; var dataRow = rows.Where(n => n.FBILLNO == billNo).FirstOrDefault(); if (dataRow != null) @@ -134,10 +136,17 @@ WHERE } }; var paramString = JsonConvert.SerializeObject(param); - var reusltString = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString).ToString(); - var result = JsonConvert.DeserializeObject>(reusltString); + var resultDict = WebApiServiceCall.GetSysReportData(this.ctx, "SAL_DetailReport", paramString); + var resultString = JsonConvert.SerializeObject(resultDict); + var result = JsonConvert.DeserializeObject>(resultString); var rows = result.Result.Rows; - var dataRow = rows.Where(n => n.FBILLNO.Trim() == string.Empty).ToList(); + var dataRow = rows.Where(n => n.FBILLNO.Trim() != string.Empty).Select(n => new SaleExecuteOut + { + FBILLNO = n.FBILLNO, + FDate = n.FDate, + FSALEORGNAME = n.FSALEORGNAME, + FALLMATCHAMOUNT = n.FALLMATCHAMOUNT.IsNullOrEmptyOrWhiteSpace() ? "0" : n.FALLMATCHAMOUNT.Replace(",", "").Trim(), + }).ToList(); return dataRow; } } diff --git a/WebApiService/SaleOrderApiService.cs b/WebApiService/SaleOrderApiService.cs index c1662d1..1b281c4 100644 --- a/WebApiService/SaleOrderApiService.cs +++ b/WebApiService/SaleOrderApiService.cs @@ -24,10 +24,16 @@ namespace GZ_LTHPilot_ORDER.WebApiService } - public decimal GetSaleOrderReceiveAmount(string orgId, string billNo) + public SaleExecuteOut GetSaleOrderReceiveAmount(string orgId, string billNo) { SaleOrderService saleOrderService = new SaleOrderService(this.KDContext.Session.AppContext); - return saleOrderService.GetSaleOrderReceiveAmount(orgId, billNo); + var amount = saleOrderService.GetSaleOrderReceiveAmount(orgId, billNo); + var result = new SaleExecuteOut() + { + FBILLNO = billNo, + FALLMATCHAMOUNT = amount.ToString() + }; + return result; } public List GetSaleOrderReceiveAmountByDate(string orgId, DateTime startDate, DateTime endDate)