Merge branch 'main' of http://8.130.121.29:3000/Develop/Piolot_Order_TH

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

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)