From 2bf48230f30ba628b464f300df022d7d11b55c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=8C=20=E6=9C=B1?= <1324361213@qq.com> Date: Fri, 21 Nov 2025 20:06:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E7=A5=A8=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=B8=81=E5=88=AB=E5=8C=BA=E5=88=86=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Services/SaleOrderService.cs | 2 +- T_IV_SALESIC/ServicePlugIn/Submit.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Services/SaleOrderService.cs b/Services/SaleOrderService.cs index 986ee8b..46cb401 100644 --- a/Services/SaleOrderService.cs +++ b/Services/SaleOrderService.cs @@ -347,7 +347,7 @@ WHERE billIdFilter = $@" AND t1.FID NOT IN ({billIdString}) "; } var sqlTemp = $@"/*dialect*/SELECT - ISNULL (SUM(t1e_O.FALLAMOUNT), 0) AS SubmitAmount + ISNULL (SUM(t1e.FALLAMOUNTFOR), 0) AS SubmitAmount FROM T_IV_SALESIC t1 LEFT JOIN T_IV_SALESICENTRY t1e ON t1.FID = t1e.FID diff --git a/T_IV_SALESIC/ServicePlugIn/Submit.cs b/T_IV_SALESIC/ServicePlugIn/Submit.cs index 2230628..efd90e7 100644 --- a/T_IV_SALESIC/ServicePlugIn/Submit.cs +++ b/T_IV_SALESIC/ServicePlugIn/Submit.cs @@ -162,16 +162,16 @@ namespace GZ_LTHPilot_ORDER.T_IV_SALESIC.ServicePlugIn var saleOrderNoList = saleOrderList.Select(n => n["FBILLNO"].ToString()).ToList(); var saleOrderNoString = string.Join(",\n\r", saleOrderNoList); var saleOrder = saleOrderList[0]; - // 已提交发票金额（本币） + // 已提交发票金额（原币） var submitedAmount = saleOrderService.GetSubmitedAmount(orgId, contractNo, billIds); - // 销售订单价税合计（本币） + // 销售订单价税合计（原币） var saleOrderAmount = saleOrderService.GetSaleOrderAmount(orgId, contractNo); - // 销售订单累计开票金额（本币） + // 销售订单累计开票金额（原币） var saleOrderINVOICEAMOUNT = Convert.ToDecimal(saleOrder["F_INVOICEAMOUNT"]); - // 销售订单退货金额（本币） + // 销售订单退货金额（原币） var saleOrderReturnAmountK3Cloud = saleOrderService.GetSaleOrderRetrunAmount(orgId, contractNo); var saleOrderReturnAmountK3 = saleOrderService.GetK3SaleOrderRetrunAmount(orgId, contractNo); - // 销售订单退货金额（本币） + // 销售订单退货金额（原币） var saleOrderReturnAmount = saleOrderReturnAmountK3 + saleOrderReturnAmountK3Cloud; // 校验销售订单累计开票金额 + 本次开票金额 + 已提交发票金额 <= 销售订单价税合计 if ((saleOrderAmount - saleOrderReturnAmount < saleOrderINVOICEAMOUNT + amount + submitedAmount) && amount >= 0)