From 74fb4dbb669d1450dd87ad84db0fecb1c0e17710 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 5 Aug 2024 15:16:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs index fd09ee21..569a9bb4 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/SysCacheService.cs @@ -39,7 +39,7 @@ namespace DS.WMS.Core.Sys.Method { var currVal =_redisService.GetValue>($"{cacheCategory.ToString()}_{systemKey}"); - _redisService.Dispose(); + //_redisService.Dispose(); if (currVal == null) return DataResult>.FailedData(new List()); @@ -61,7 +61,7 @@ namespace DS.WMS.Core.Sys.Method _redisService.SetValue($"{cacheCategory.ToString()}_{systemKey}", JsonConvert.SerializeObject(cacheObj)); - _redisService.Dispose(); + //_redisService.Dispose(); return DataResult.Success(string.Empty); } @@ -76,7 +76,7 @@ namespace DS.WMS.Core.Sys.Method { _redisService.DeleteKey($"{cacheCategory.ToString()}_{systemKey}"); - _redisService.Dispose(); + //_redisService.Dispose(); return DataResult.Successed(MultiLanguageConst.RemoveCacheSucc); } From 32f46816cddf03c99deb6c304d7d12036dd4ad8b Mon Sep 17 00:00:00 2001 From: cjy Date: Tue, 6 Aug 2024 09:53:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Test/SaasDBUpdateTest.cs | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 ds-wms-service/DS.WMS.Test/SaasDBUpdateTest.cs diff --git a/ds-wms-service/DS.WMS.Test/SaasDBUpdateTest.cs b/ds-wms-service/DS.WMS.Test/SaasDBUpdateTest.cs new file mode 100644 index 00000000..ea63fdd0 --- /dev/null +++ b/ds-wms-service/DS.WMS.Test/SaasDBUpdateTest.cs @@ -0,0 +1,85 @@ +using System.Reflection; +using DS.Module.Core; +using DS.Module.Core.Extensions; +using DS.Module.SqlSugar; +using DS.WMS.Core.Check.Entity; +using DS.WMS.Core.Code.Entity; +using DS.WMS.Core.Info.Entity; +using DS.WMS.Core.Op.Entity; +using DS.WMS.Core.Op.Entity.BookingSlot; +using DS.WMS.Core.Sys.Entity; +using DS.WMS.Core.TaskPlat.Entity; +using Mapster; +using Masuit.Tools.Strings; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Owin.BuilderProperties; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using Org.BouncyCastle.Ocsp; +using SqlSugar; +using SqlSugar.IOC; +using Xunit; + +namespace Ds.WMS.Test; + +public class SaasDBUpdateTest +{ + private readonly IServiceProvider _serviceProvider; + private readonly SqlSugarScope db; + private readonly ISaasDbService saasService; + public SaasDBUpdateTest(IServiceProvider serviceProvider) + { + _serviceProvider = serviceProvider; + db = (SqlSugarScope)_serviceProvider.GetRequiredService(); + saasService = _serviceProvider.GetRequiredService(); + } + + + /// + /// 主库初始化单表 + /// + [Fact] + public void MasterInitTableTest() + { + StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 + db.CodeFirst.InitTables(typeof(SysPrintTemplate)); + Assert.True(true); + } + /// + /// 初始化单表 多表 + /// 注意 海运出口 SeaExport 得手动数据库更新 + /// + [Fact] + public void InitSaasTableTestByCjy() + { + var tenantList = db.Queryable().ToList(); + var ass = Assembly.Load("DS.WMS.Core"); + //var types = ass.GetTypes().Where(it => it.FullName?.Contains("DS.WMS.Core.TaskPlat.Entity") == true).ToArray(); + foreach (var item in tenantList) + { + var tenantDb = saasService.GetBizDbScopeById(item.TenantId).CopyNew(); + StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci"; //较高版本支持 + //tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体 + tenantDb.CodeFirst.InitTables(typeof(OpLetterYard));//指定更新特定实体 + } + + Assert.True(true); + } + /// + /// 初始化单表 + /// + [Fact] + public void InitTableTestZXF() + { + var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 + + var ass = Assembly.Load("DS.WMS.Core"); + var types = ass.GetTypes().Where(it => it.FullName?.Contains("DS.WMS.Core.TaskPlat.Entity") == true).ToArray(); + tenantDb.CodeFirst.InitTables(types); + + //tenantDb.CodeFirst.InitTables(typeof(TaskFlowLog)); + //tenantDb.CodeFirst.InitTables(typeof(TaskFlowLogDetail)); + Assert.True(true); + } +} \ No newline at end of file From af1b2718c63687e35e84c22541e9258f9cf02250 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 6 Aug 2024 10:31:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9INTTRA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/EDI/InttraEdiHelper.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs index da627b97..dd798d0d 100644 --- a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs +++ b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs @@ -900,20 +900,28 @@ namespace DS.WMS.Core.Op.EDI } - if (InttrEdi.UseForWarderCode) + if (bill.CARRIEREDICODE == "ANNU" || bill.CARRIEREDICODE == "CMDU" || bill.CARRIEREDICODE == "CHNL") { r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'"); - r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'"); - icount = icount + 2; + icount = icount + 1; } else { - if (bill.ORDERNO.Trim() != "") + if (InttrEdi.UseForWarderCode) { r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'"); r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'"); icount = icount + 2; } + else + { + if (bill.ORDERNO.Trim() != "") + { + r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'"); + r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'"); + icount = icount + 2; + } + } } if (bill.CARRIEREDICODE != "COSU")