From 38454456fc3e22495c292ab5cdf48d61fbc2980f Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Fri, 8 Sep 2023 09:17:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=98=AF=E5=90=A6=E8=B6=85=E9=85=8D=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
index 9c902bc1..42fff12b 100644
--- a/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
+++ b/BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
@@ -123,4 +123,8 @@ public partial class BasLocation : BaseEntity<string>
     /// 列
     /// </summary>
     public int loc_column { get; set; }
+    /// <summary>
+    /// 是否超配(1：不超配 2：超配)
+    /// </summary>
+    public string is_overmatch { get; set; }
 }

From 465f6b0bddb19f39c1bd3a1da2fb0ccad161fcaa Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Fri, 8 Sep 2023 09:37:36 +0800
Subject: [PATCH 2/3] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
index a4166499..ae098b9a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
@@ -48,7 +48,7 @@ namespace Tnb.WarehouseMgr
     [Route("api/[area]/[controller]/[action]")]
     public class BaseWareHouseService : IOverideVisualDevService, IDynamicApiController, ITransient
     {
-        private static Lazy<Dictionary<string, IWHStorageService>> _stroageMap;
+        private static Lazy<Dictionary<string, IWHStorageService>> _stroageMapLazy;
         public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
         private readonly ChannelWriter<NotifyMessage> _channelWriter;
 
@@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr
 
         static BaseWareHouseService()
         {
-            _stroageMap = new Lazy<Dictionary<string, IWHStorageService>>(() =>
+            _stroageMapLazy = new Lazy<Dictionary<string, IWHStorageService>>(() =>
             {
                 Dictionary<string, IWHStorageService> map = new(StringComparer.OrdinalIgnoreCase);
                 var serviceTypes = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(IWHStorageService).IsAssignableFrom(u)).ToList();
@@ -140,9 +140,9 @@ namespace Tnb.WarehouseMgr
         [NonAction]
         protected async Task DoUpdate(WareHouseUpInput input)
         {
-            if (_stroageMap.Value.ContainsKey(input.loginType))
+            if (_stroageMapLazy.Value.ContainsKey(input.loginType))
             {
-                await _stroageMap.Value[input.loginType].Do(input);
+                await _stroageMapLazy.Value[input.loginType].Do(input);
             }
         }
         [NonAction]

From a070ff4409252d028b2e7957557059814bf1f862 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Fri, 8 Sep 2023 12:10:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=BD=E5=85=B7?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=92=8C=E5=AF=BC=E5=85=A5=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/WmsCarryLedgerService.cs     | 15 ++++++++++++++-
 .../Tnb.VisualDev/VisualDevModelDataService.cs    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs
index 7a455402..991c2dbd 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs
@@ -96,7 +96,20 @@ namespace Tnb.WarehouseMgr
                     x.modify_id = null;
                     x.modify_time = null;
                 });
-                row = await _db.Insertable(carrys).ExecuteCommandAsync();
+                if (carrys.Count > 1000)
+                {
+                    await _db.Fastest<WmsCarryH>().BulkCopyAsync(carrys);
+                }
+                else if (carrys.Count > 400)
+                {
+                    _db.Utilities.PageEach(carrys, 100, async pageList => {
+                        await _db.Insertable(pageList).ExecuteCommandAsync();
+                    });
+                }
+                else
+                {
+                    row = await _db.Insertable(carrys).ExecuteCommandAsync();
+                }
             }
             catch (Exception ex)
             {
diff --git a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs
index adc31b40..66b953c8 100644
--- a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs
+++ b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs
@@ -800,7 +800,7 @@ namespace JNPF.VisualDev
             var overideSvc = OverideVisualDevManager.GetOrDefault(modelId);
             if (overideSvc != null && overideSvc.OverideFuncs.ImportDataAsync != null)
             {
-                await overideSvc.OverideFuncs.ImportDataAsync(list);
+                result = await overideSvc.OverideFuncs.ImportDataAsync(list);
             }
             else
             {