From 258b05a3c8455b1fde449aca3bf3e02ebcf793be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= <wufanghai@ylkj7.wecom.work>
Date: Tue, 11 Jun 2024 18:36:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataBase/EFExtensions/MySqlBulkExtensions.cs | 16 ++--------------
 YLErpDAL/Modules/SwapModule/SwapTradeService.cs  |  2 +-
 YLErpWeb/Controllers/SwapTrade2Controller.cs     |  2 +-
 YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml       |  9 ++++-----
 .../Scripts/app/marginRate/marginRateSwapList.js |  2 +-
 .../Scripts/app/swaptrade/swapTradeEdit.js       |  2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/YLErpDAL/DataBase/EFExtensions/MySqlBulkExtensions.cs b/YLErpDAL/DataBase/EFExtensions/MySqlBulkExtensions.cs
index 97b8f0fe..eb56fc78 100644
--- a/YLErpDAL/DataBase/EFExtensions/MySqlBulkExtensions.cs
+++ b/YLErpDAL/DataBase/EFExtensions/MySqlBulkExtensions.cs
@@ -56,25 +56,13 @@ namespace YLErp.BLL
             }
 
             var selcols = string.Join(", ", selProperties.Select(property => $"`{columns[property.Name]}`"));
-
-            var tempTable = tableName + Guid.NewGuid().ToString("N").Substring(0, 16);
-
             var sCommand = new StringBuilder();
 
-            sCommand.Append("CREATE TEMPORARY TABLE `").Append(tempTable).Append("` SELECT ")
-                .Append(selcols).Append("FROM `").Append(tableName).AppendLine("` where 1<>1;");
-
-            sCommand.Append("INSERT INTO `").Append(tempTable)
-                .Append("` (").Append(selcols).Append(") VALUES ");
+            sCommand.Append("INSERT INTO `").Append(tableName)
+                    .Append("` (").Append(selcols).Append(") VALUES ");
 
             DumpInertValues(sCommand, data, selProperties).AppendLine(";");
 
-            sCommand.Append("INSERT INTO ").Append(tableName)
-                .Append("(").Append(selcols).AppendLine(")")
-                .Append("SELECT ").AppendLine(selcols)
-                .Append(" FROM ").Append(tempTable).AppendLine(";")
-                .Append("DROP TABLE ").Append(tempTable).Append(";");
-
             var sql = sCommand.ToString();
 
             System.Diagnostics.Debug.WriteLine("$$$$$$$$$$");
diff --git a/YLErpDAL/Modules/SwapModule/SwapTradeService.cs b/YLErpDAL/Modules/SwapModule/SwapTradeService.cs
index 3dcdf1ee..d0ce95d8 100644
--- a/YLErpDAL/Modules/SwapModule/SwapTradeService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapTradeService.cs
@@ -315,7 +315,7 @@ namespace YLErp.Modules.SwapModule
             }
             TradeExtendJson tradeExtendJson = new TradeExtendJson()
             {
-                FlowBookMode = (int)FlowBookModeEnum.重置,
+                FlowBookMode = (int)FlowBookModeEnum.先进先出,
                 FloatingPnlAnnualized = false,
                 NeedOpenFee = true,
                 OpenFeeType = 1,
diff --git a/YLErpWeb/Controllers/SwapTrade2Controller.cs b/YLErpWeb/Controllers/SwapTrade2Controller.cs
index 909f1291..ccc4a7f5 100644
--- a/YLErpWeb/Controllers/SwapTrade2Controller.cs
+++ b/YLErpWeb/Controllers/SwapTrade2Controller.cs
@@ -67,7 +67,7 @@ namespace YLErp.Web.Controllers
                 };
                 r.StructureType = "普通债券类收益互换";
                 r.ExerciseDate = QdpCalendarHelper.GetNonHolidayDefore(r.StartDate.Value.AddDays(14));
-                tradeExtendJson.FlowBookMode = (int)FlowBookModeEnum.重置;
+                tradeExtendJson.FlowBookMode = (int)FlowBookModeEnum.先进先出;
                 r.trade_extend = new trade_extend()
                 {
                     ExtendJson = JsonHelper.Serialize(tradeExtendJson)
diff --git a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
index 6c29a6c4..3321e235 100644
--- a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
@@ -92,7 +92,6 @@
                         <select v-model="trade.StructureType" v-on:change="changeStructureType" :disabled="trade.id>0">
                             <option value="普通债券类收益互换">普通债券类收益互换</option>
                             <option value="普通收益互换">普通收益互换</option>
-                            <option value="多空组合" disabled>多空组合</option>
                         </select>
                     </div>
                     <div class="form-group">
@@ -157,10 +156,10 @@
                     <div class="form-group">
                         <label class="formlabel half">流水簿记模式</label>
                         <select v-model="trade.trade_extend.ExtendObj.FlowBookMode" disabled>
-                            <option value="0">否</option>
-                            @*<option value="1">先进先出</option>*@
-                            <option value="2">加权平均</option>
-                            <option value="3">重置</option>
+                           @* <option value="0">否</option>*@
+                            <option value="1">先进先出</option>
+                          @*  <option value="2">加权平均</option>
+                            <option value="3">重置</option>*@
                         </select>
                     </div>
                     <div class="form-group" >
diff --git a/YLErpWeb/wwwroot/Scripts/app/marginRate/marginRateSwapList.js b/YLErpWeb/wwwroot/Scripts/app/marginRate/marginRateSwapList.js
index 084d2fda..e4956b3e 100644
--- a/YLErpWeb/wwwroot/Scripts/app/marginRate/marginRateSwapList.js
+++ b/YLErpWeb/wwwroot/Scripts/app/marginRate/marginRateSwapList.js
@@ -152,7 +152,7 @@ const jqgrid1Mgr = (new function () {
         name: 'ValueDate', label: '生效日期', index: 'ValueDate', formatter: 'date'
     }, {
         name: 'InitMarginRate', label: '期初预付金', index: 'InitMarginRate', formatter: percentFormat
-    }}, {
+    }, {
         name: 'InitMarginRebateRate', label: '期初预付金利率', index: 'InitMarginRebateRate', formatter: percentFormat, 
     }, {
         name: 'AddToMarginRebateRate', label: '追加预付金利率', index: 'AddToMarginRebateRate', formatter: percentFormat,
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
index c5a66ee7..755506cf 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
@@ -177,7 +177,7 @@ const vue = new Vue({
     methods: {
         changeStructureType() {
             this.trade.StockEqvNotional = 0;
-            this.trade.trade_extend.ExtendObj.FlowBookMode = 0;
+            //this.trade.trade_extend.ExtendObj.FlowBookMode = 0;
         },
         //变更初始预付金收取方向
         changeInitialMargin() {