#EQD-5843 国联民生-交易确认书编号规则, 客户编号规则, 以及确认书相关的一些调整：除了上传确认书

2026-05-21 10:57:14 +08:00
parent e3b11e7f5b
commit 1ca9cace72
8 changed files with 205 additions and 8 deletions
@@ -1347,6 +1347,9 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
            return Trade.TradeNumber;
        }

+        /// <summary>
+        /// 生成国贸确认书编号
+        /// </summary>
        private string GenerateGuolianContractNo()
        {
            if (_contractType != ContractTypeEnum.Trade)
@@ -1355,13 +1358,11 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
            }
            if (Trade.TradeType == "收益互换")
            {
-                var posi = GetSwapPositions(Trade.id, true).FirstOrDefault(p => p.PositionType > 0);
-                var isLong = posi?.PositionType == (int)PositionTypeFlag.Short ? false : true;
-
-                return "GLMS-" + _client.Number + "-" + Trade.TradeNumber;
+                return GuolianContractNoGenerator.Generate(DbContext, (trade)Trade, _client.Code);
            }
-            return Trade.TradeNumber;
+           return Trade.TradeNumber;
        }
+
        /// <summary>
        /// 生成国贸确认书编号
        /// </summary>