diff --git a/GZ_LTHPilot_ORDER.csproj b/GZ_LTHPilot_ORDER.csproj index 59ccb0c..17f42e3 100644 --- a/GZ_LTHPilot_ORDER.csproj +++ b/GZ_LTHPilot_ORDER.csproj @@ -440,6 +440,7 @@ - copy $(TargetPath) "D:\kingdee\K3Cloud\WebSite\Bin\$(TargetFileName)" + + \ No newline at end of file diff --git a/SAL_ORDER/DataChage.cs b/SAL_ORDER/DataChage.cs index 273bd03..45adac2 100644 --- a/SAL_ORDER/DataChage.cs +++ b/SAL_ORDER/DataChage.cs @@ -37,13 +37,19 @@ namespace GZ_LTHPilot_ORDER.SAL_ORDER var FSaleOrgId = this.View.Model.GetValue("FSaleOrgId"); this.View.Model.SetValue("F_SaleOrgId", FSaleOrgId); } + else if (SqlDS[0]["FDATAVALUE"].ToString().Contains("BMS")) + { + this.View.Model.SetValue("F_SaleOrgId", "100302"); + } else { this.View.Model.SetValue("F_SaleOrgId", "100302"); } } + + this.View.UpdateView("F_SaleOrgId"); + } - this.View.UpdateView("F_SaleOrgId"); } } } diff --git a/ScheduleService/SaleOrderReceiveAmount.cs b/ScheduleService/SaleOrderReceiveAmount.cs index 3a8413d..3ffe598 100644 --- a/ScheduleService/SaleOrderReceiveAmount.cs +++ b/ScheduleService/SaleOrderReceiveAmount.cs @@ -35,7 +35,10 @@ namespace GZ_LTHPilot_ORDER.ScheduleService { // 获取组织Id var orgId = item["FORGID"].ToString(); - + if (orgId == "100302") + { + continue; + } // 循环查询销售订单执行明细表,每次查询一个月的数据, 将数据插入自定义临时表中 var startDate = planStartDate.AddDays(-advanceAays); var endDate = startDate.AddMonths(1); diff --git a/Services/SaleOrderService.cs b/Services/SaleOrderService.cs index bec5b2d..040e6cd 100644 --- a/Services/SaleOrderService.cs +++ b/Services/SaleOrderService.cs @@ -67,17 +67,21 @@ WHERE Model = new Model() { FSaleOrgList = orgId, - FSoFromDate = date.AddDays(-2), - FSoToDate = date.AddDays(1), + FSoFromDate = date.AddDays(-30), + FSoToDate = date.AddDays(30), FSaleOFrom = billNo, FSaleOTo = billNo, FFormCloseStatus = "ALL", - FFormStatus = "C", + FFormStatus = "ALL", FPriceFrom = "SALORDERBILL", FBusCloseStatus = "ALL", FMergingSOHeader = true, - FIncludedUnfilledOrders = false, + FIncludedUnfilledOrders = true, FIsRecWithMat = true, + FSuite = "All", + FSetAccountType = "ALL", + FIsGroup = false, + FIncludedFree = true } }; var paramString = JsonConvert.SerializeObject(param); @@ -85,16 +89,16 @@ WHERE 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) + var dataRow = rows.Where(n => n.FBILLNO == billNo).ToList(); + if (dataRow.Count() == 0) { return 0m; } - if (dataRow.FALLMATCHAMOUNT.IsNullOrEmptyOrWhiteSpace()) + if (dataRow[0].FALLMATCHAMOUNT.IsNullOrEmptyOrWhiteSpace()) { return 0m; } - return Convert.ToDecimal(dataRow.FALLMATCHAMOUNT); + return Convert.ToDecimal(dataRow[0].FALLMATCHAMOUNT); } @@ -131,12 +135,16 @@ WHERE FSoFromDate = startDate, FSoToDate = endDate, FFormCloseStatus = "ALL", - FFormStatus = "C", + FFormStatus = "ALL", FPriceFrom = "SALORDERBILL", FBusCloseStatus = "ALL", FMergingSOHeader = true, - FIncludedUnfilledOrders = false, + FIncludedUnfilledOrders = true, FIsRecWithMat = true, + FSuite = "All", + FSetAccountType = "ALL", + FIsGroup = false, + FIncludedFree = true } }; var paramString = JsonConvert.SerializeObject(param); diff --git a/Services/SaleSicsService.cs b/Services/SaleSicsService.cs index 0f27f8d..22c1c69 100644 --- a/Services/SaleSicsService.cs +++ b/Services/SaleSicsService.cs @@ -37,12 +37,7 @@ namespace GZ_LTHPilot_ORDER.Service var saleOrgId = saleOrder["FSALEORGID"].ToString(); var sqlTemp = @"/*dialect*/UPDATE t1 SET - t1.F_INVOICEAMOUNT = ISNULL (TEMP1.FAFTERTOTALTAXFOR, 0) + ROUND( - ( - ISNULL (TEMP1.FAFTERTOTALTAX, 0) / ISNULL (t1fin.FEXCHANGERATE, 0) - ), - 2 - ) + t1.F_INVOICEAMOUNT = ISNULL (TEMP1.FAFTERTOTALTAXFOR, 0) FROM T_SAL_ORDER t1 INNER JOIN T_SAL_ORDERFIN t1fin ON t1.FID = t1fin.FID @@ -57,7 +52,7 @@ FROM SELECT FSALEORGID, -- 销售组织 F_PaperNumber, -- 纸质合同号 - 0 FAFTERTOTALTAX, + ISNULL (FAFTERTOTALTAX, 0) FAFTERTOTALTAX, -- 价税合计本币 ISNULL (FAFTERTOTALTAXFOR, 0) FAFTERTOTALTAXFOR -- 价税合计 FROM T_IV_SALESIC @@ -65,20 +60,19 @@ FROM 1 = 1 AND FDOCUMENTSTATUS = 'C' AND FCANCELSTATUS = 'A' - AND FDATE >= '2025-01-01' + AND t1.F_SFQC = 0 AND FSALEORGID = '{0}' AND F_PaperNumber = '{1}' UNION ALL SELECT '100302' FSALEORGID, -- 销售组织 合同号 F_PaperNumber, -- 纸质合同号 - SUM(ISNULL (专票金额, 0) + ISNULL (普票金额, 0)) FAFTERTOTALTAX, -- 价税合计本币 - 0 -- 价税合计 + SUM(ISNULL (发票金额, 0)) FAFTERTOTALTAX, -- 价税合计本币 + SUM(ISNULL (发票原币金额, 0)) FAFTERTOTALTAXFOR -- 价税合计 FROM - oldk3seorder0701 + oldk3ICSale0802 WHERE 1 = 1 - AND 日期 < '2025-01-01' AND 合同号 = '{1}' GROUP BY 合同号