From a2e5b22eafcf4228f00136c625c159e7fba4d424 Mon Sep 17 00:00:00 2001 From: dengyu Date: Thu, 12 Sep 2024 16:04:58 +0800 Subject: [PATCH] 20240912 --- .../DS.WMS.ContainerManagementApi/Program.cs | 6 + .../Dtos/CM_CurrentStateReq.cs | 5 + .../Dtos/CM_CurrentStateRes.cs | 5 + .../Dtos/CM_State_ChangeReq.cs | 5 + .../Dtos/CM_State_ChangeRes.cs | 5 + .../Dtos/VW_CM_FeeBase_DetailRes.cs | 5 +- .../Dtos/VW_CM_NeedEndLease_DetailRes.cs | 4 + .../Dtos/VW_CM_RentOut_NeedEndLeaseRes.cs | 5 +- .../Dtos/VW_CM_RentOut_NeedRentRes.cs | 5 + .../Dtos/VW_CM_SellCtn_NeedSellRes.cs | 4 + .../Entity/CM_CurrentState.cs | 5 + .../Entity/CM_State_Change.cs | 6 +- .../Entity/VW_CM_FeeBase_Detail.cs | 6 + .../Entity/VW_CM_NeedEndLease_Detail.cs | 5 + .../Entity/VW_CM_RentOut_NeedEndLease.cs | 6 +- .../Entity/VW_CM_RentOut_NeedRent.cs | 6 + .../Entity/VW_CM_SellCtn_NeedSell.cs | 6 + .../Interface/ICM_BaseInfoService.cs | 9 +- .../Method/CM_State_ChangeService.cs | 7 +- .../DS.WMS.Test/ContainerManagementTest.cs | 326 +++++++++--------- 20 files changed, 262 insertions(+), 169 deletions(-) diff --git a/ds-wms-service/DS.WMS.ContainerManagementApi/Program.cs b/ds-wms-service/DS.WMS.ContainerManagementApi/Program.cs index ee852739..09188a6c 100644 --- a/ds-wms-service/DS.WMS.ContainerManagementApi/Program.cs +++ b/ds-wms-service/DS.WMS.ContainerManagementApi/Program.cs @@ -12,6 +12,8 @@ using DS.Module.Swagger; using DS.Module.UserModule; using NLog.Web; using Swashbuckle.AspNetCore.SwaggerUI; +using DS.Module.DjyRulesEngine; +using DS.Module.PrintModule; var builder = WebApplication.CreateBuilder(args); var environment = builder.Environment.EnvironmentName; @@ -44,6 +46,10 @@ builder.Services.AddMultiLanguageInstall();// //builder.Services.AddCrawlerModuleInstall();//运踪服务 +builder.Services.AddDjyModuleInstall();//Djy服务 +builder.Services.AddRuleEngineModuleInstall();//Djy规则引擎校验服务 + + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateReq.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateReq.cs index fe119797..6a637bf5 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateReq.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateReq.cs @@ -195,6 +195,11 @@ public class CM_CurrentStateReq /// 璐叆浠锋牸 /// public decimal? CtnValue_BuyingPrice { get; set; } = 0; + + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateRes.cs index 50e79190..6577d6fe 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateRes.cs @@ -189,4 +189,9 @@ public class CM_CurrentStateRes: BaseFieldRes /// Desc:绠辩敓浜ф椂闂 /// public DateTime? ProductionDate { get; set; } + + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeReq.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeReq.cs index 8242286c..16dc8527 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeReq.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeReq.cs @@ -208,6 +208,11 @@ public class CM_State_ChangeReq /// public DateTime? ProductionDate { get; set; } + /// + /// 澶囨敞 + /// + public string Remark { get; set; } + /// /// 鐢ㄤ簬鍒ゆ柇鏄惁鏄浉鍚岀殑鍙樺姩 /// 渚濇嵁鏄細 diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeRes.cs index 39052378..4636011c 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeRes.cs @@ -184,4 +184,9 @@ public class CM_State_ChangeRes : BaseFieldRes /// 绠卞垵鏈熸垚鏈 /// public decimal? CtnValue_Base { get; set; } = 0; + + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_FeeBase_DetailRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_FeeBase_DetailRes.cs index c1c9d5c7..59bb380b 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_FeeBase_DetailRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_FeeBase_DetailRes.cs @@ -193,5 +193,8 @@ public class VW_CM_FeeBase_DetailRes /// Desc:绠辨祦杞姸鎬 /// public string CtnFlowState => CtnFlowStateId?.GetDescription(); - + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_NeedEndLease_DetailRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_NeedEndLease_DetailRes.cs index 06bf113b..aee0bc9a 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_NeedEndLease_DetailRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_NeedEndLease_DetailRes.cs @@ -178,4 +178,8 @@ public class VW_CM_NeedEndLease_DetailRes /// Desc:绠变笟鍔＄姸鎬乮d: 鐭绉熷嚭 闀跨绉熷嚭 鍗曠▼ 鍗栫 /// public CM_CtnBizStateEnum? CtnBizStateId { get; set; } + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedEndLeaseRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedEndLeaseRes.cs index 88b60ddc..4af48203 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedEndLeaseRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedEndLeaseRes.cs @@ -201,5 +201,8 @@ public class VW_CM_RentOut_NeedEndLeaseRes public string VesselVoyno { get; set; } - + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedRentRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedRentRes.cs index 9571c1ce..0a536774 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedRentRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedRentRes.cs @@ -122,4 +122,9 @@ public class VW_CM_RentOut_NeedRentRes /// Desc:鍏宠仈鏀剧鍗曞彿 /// public string? CtnReleaseNo { get; set; } + + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_SellCtn_NeedSellRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_SellCtn_NeedSellRes.cs index a337972b..a565c7b7 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_SellCtn_NeedSellRes.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_SellCtn_NeedSellRes.cs @@ -144,4 +144,8 @@ public class VW_CM_SellCtn_NeedSellRes /// Desc:鍏宠仈鏀剧鍗曞彿 /// public string? CtnReleaseNo { get; set; } + /// + /// 澶囨敞 + /// + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_CurrentState.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_CurrentState.cs index d53cb597..7c74a608 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_CurrentState.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_CurrentState.cs @@ -200,5 +200,10 @@ public class CM_CurrentState : BaseOrgModel [SugarColumn(ColumnDescription = "鐘舵佹椂闂", IsNullable = true)] public DateTime? StateTime { get; set; } + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change.cs index db0f012e..3d103c8a 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change.cs @@ -206,7 +206,11 @@ public class CM_State_Change : BaseOrgModel [SugarColumn(ColumnDescription = "鐘舵佸彉鍔ㄦ椂闂", IsNullable = true)] public DateTime? ChangeTime { get; set; } - + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_FeeBase_Detail.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_FeeBase_Detail.cs index b5d746cd..58c95941 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_FeeBase_Detail.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_FeeBase_Detail.cs @@ -226,5 +226,11 @@ public class VW_CM_FeeBase_Detail : BaseOrgModel /// [Description("鍒涘缓鏃堕棿")] public DateTime CreateTime { get; set; } + + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_NeedEndLease_Detail.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_NeedEndLease_Detail.cs index 839495ec..450c15b1 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_NeedEndLease_Detail.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_NeedEndLease_Detail.cs @@ -231,5 +231,10 @@ public class VW_CM_NeedEndLease_Detail : BaseOrgModel [SugarColumn(ColumnDescription = "绠辨祦杞姸鎬両d", IsNullable = true)] public CMCtnFlowStateEnum? CtnFlowStateId { get; set; } + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedEndLease.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedEndLease.cs index d6e5aa0a..426c5628 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedEndLease.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedEndLease.cs @@ -219,6 +219,10 @@ public class VW_CM_RentOut_NeedEndLease : BaseOrgModel [SugarColumn(ColumnDescription = "鏄惁涓婄嚎id", IsNullable = true, DefaultValue = "0")] public CM_IsOnlineEnum? IsOnlineId { get; set; } = 0; - + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedRent.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedRent.cs index 11f88a64..3e4eac0b 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedRent.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedRent.cs @@ -116,5 +116,11 @@ public class VW_CM_RentOut_NeedRent : BaseOrgModelV2 /// [Description("鍒涘缓鏃堕棿")] public DateTime CreateTime { get; set; } + + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_SellCtn_NeedSell.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_SellCtn_NeedSell.cs index 2d6307b7..790998e1 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_SellCtn_NeedSell.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_SellCtn_NeedSell.cs @@ -141,5 +141,11 @@ public class VW_CM_SellCtn_NeedSell : BaseOrgModelV2 /// [SugarColumn(ColumnDescription = "璐叆浠锋牸", IsNullable = true, Length = 20, DecimalDigits = 2)] public decimal? CtnValue_BuyingPrice { get; set; } + + /// + /// 澶囨敞 + /// + [SqlSugar.SugarColumn(ColumnDescription = "澶囨敞", IsNullable = true, Length = 400)] + public string Remark { get; set; } } diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Interface/ICM_BaseInfoService.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Interface/ICM_BaseInfoService.cs index d7cc3492..3c08c3b7 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Interface/ICM_BaseInfoService.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Interface/ICM_BaseInfoService.cs @@ -45,5 +45,12 @@ public interface ICM_BaseInfoService /// /// DataResult CM_DealExcel(CM_DealExcelReq model); - + + /// + /// 鍒ゆ柇绠卞彿鐨勭鍨嬩笌褰撳墠鐨勮绠卞熀纭淇℃伅鐨勭鍨嬫槸鍚︿竴鑷 + /// + /// + /// + //DataResult CM_CheckCtnCtnall(CM_DealExcelReq model); + } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs index a5a768ba..3adb95ec 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs @@ -435,7 +435,12 @@ public class CM_State_ChangeService : CMServiceBase, ICM_State_ChangeService newCurrState.CtnReleaseNo = change.CtnReleaseNo; } - + if (change.Remark != null) + { + newCurrState.Remark = change.Remark; + } + + newCurrState.StateTime = change.ChangeTime; diff --git a/ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs b/ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs index 8428e821..5b28ca7b 100644 --- a/ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs +++ b/ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs @@ -35,33 +35,33 @@ public class ContainerManagementTest saasService = _serviceProvider.GetRequiredService(); } - [Fact] - public void ContainerManagementTest1() - { - Type[] types = Assembly - .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe - .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Op.Entity.")) - //.GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity.") || it.FullName.Contains("DS.WMS.Core.Info.Entity.") || it.FullName.Contains("DS.WMS.Core.Flow.Entity.") - //|| it.FullName.Contains("DS.WMS.Core.Check.Entity.") || it.FullName.Contains("DS.WMS.Core.Map.Entity."))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 - .ToArray(); - //Type[] types = Assembly - // .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe - // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity."))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 - // .ToArray(); - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - // var temp = tenantDb.CodeFirst.GetDifferenceTables(types); || it.FullName.Contains("DS.WMS.Core.Op.Entity.") - // var diffString= tenantDb.CodeFirst.GetDifferenceTables(types).ToDiffString(); - StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 - //types = types.Where(it => it.Name != "BusinessFeeStatus").ToArray(); - //types = types.Where(it => it.Name != "BusinessOrderContact").ToArray(); + //[Fact] + //public void ContainerManagementTest1() + //{ + // Type[] types = Assembly + // .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe + // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Op.Entity.")) + // //.GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity.") || it.FullName.Contains("DS.WMS.Core.Info.Entity.") || it.FullName.Contains("DS.WMS.Core.Flow.Entity.") + // //|| it.FullName.Contains("DS.WMS.Core.Check.Entity.") || it.FullName.Contains("DS.WMS.Core.Map.Entity."))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 + // .ToArray(); + // //Type[] types = Assembly + // // .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe + // // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity."))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 + // // .ToArray(); + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + // // var temp = tenantDb.CodeFirst.GetDifferenceTables(types); || it.FullName.Contains("DS.WMS.Core.Op.Entity.") + // // var diffString= tenantDb.CodeFirst.GetDifferenceTables(types).ToDiffString(); + // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 + // //types = types.Where(it => it.Name != "BusinessFeeStatus").ToArray(); + // //types = types.Where(it => it.Name != "BusinessOrderContact").ToArray(); - tenantDb.CodeFirst.InitTables(types); - // //鍒濆鍖栨暟搴 - // tenantDb.DbMaintenance.CreateDatabase(); - // - // tenantDb.CodeFirst.InitTables(typeof(CodeCountry)); - Assert.True(true); - } + // tenantDb.CodeFirst.InitTables(types); + // // //鍒濆鍖栨暟搴 + // // tenantDb.DbMaintenance.CreateDatabase(); + // // + // // tenantDb.CodeFirst.InitTables(typeof(CodeCountry)); + // Assert.True(true); + //} /// @@ -79,29 +79,29 @@ public class ContainerManagementTest /// /// 鍒濆鍖栧崟琛 /// - [Fact] - public void InitTableTest() - { - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 + //[Fact] + //public void InitTableTest() + //{ + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 - tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState)); - //tenantDb.CodeFirst.InitTables(typeof(CM_BaseInfo)); - tenantDb.CodeFirst.InitTables(typeof(CM_State_Change)); + // tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_BaseInfo)); + // tenantDb.CodeFirst.InitTables(typeof(CM_State_Change)); - //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn)); - //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail)); - //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut)); - //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail)); - //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay)); - //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay)); + // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail)); - //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); - Assert.True(true); - } + // //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); + // Assert.True(true); + //} /// /// 鍒濆鍖栧崟琛 澶氳〃 @@ -120,9 +120,9 @@ public class ContainerManagementTest //tenantDb.CodeFirst.InitTables(types); //鎸囧畾琛ㄧ┖闂翠笅鐨勫疄浣 //tenantDb.CodeFirst.InitTables(typeof(OpLetterYard));//鎸囧畾鏇存柊鐗瑰畾瀹炰綋 - //tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState)); + tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState)); //tenantDb.CodeFirst.InitTables(typeof(CM_BaseInfo)); - //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change)); + tenantDb.CodeFirst.InitTables(typeof(CM_State_Change)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail)); @@ -132,9 +132,9 @@ public class ContainerManagementTest //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn)); - tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn_Detail)); + //tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn)); - tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn_Detail)); + //tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap)); //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail)); @@ -181,138 +181,138 @@ public class ContainerManagementTest } - [Fact] - public void SaasCheckTest() - { - Type[] types = Assembly - .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe - .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity"))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 - .ToArray(); - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 - //tenantDb.CodeFirst.InitTables(types); - Assert.True(true); - } - [Fact] - public void SaasFeeTest() - { - Type[] types = Assembly - .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe - .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Fee.Entity"))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 - .ToArray(); - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 - //tenantDb.CodeFirst.InitTables(types); - Assert.True(true); - } - [Fact] + //[Fact] + //public void SaasCheckTest() + //{ + // Type[] types = Assembly + // .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe + // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity"))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 + // .ToArray(); + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 + // //tenantDb.CodeFirst.InitTables(types); + // Assert.True(true); + //} + //[Fact] + //public void SaasFeeTest() + //{ + // Type[] types = Assembly + // .LoadFrom("DS.WMS.Core.dll")//濡傛灉 .dll鎶ラ敊锛屽彲浠ユ崲鎴 xxx.exe 鏈変簺鐢熸垚鐨勬槸exe + // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Fee.Entity"))//鍛藉悕绌洪棿杩囨护锛屽綋鐒朵綘涔熷彲浠ュ啓鍏朵粬鏉′欢杩囨护 + // .ToArray(); + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 + // //tenantDb.CodeFirst.InitTables(types); + // Assert.True(true); + //} + //[Fact] - public void ClientBatchEdit() - { - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + //public void ClientBatchEdit() + //{ + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - var info = tenantDb.Queryable().Filter(null, true).Where(x => x.Id == 1772138307266940928).First(); + // var info = tenantDb.Queryable().Filter(null, true).Where(x => x.Id == 1772138307266940928).First(); - var temp = new ClientTemp - { - Address = "4", - Name = "4", - }; - var dic = temp.GetPropertiesArray(); + // var temp = new ClientTemp + // { + // Address = "4", + // Name = "4", + // }; + // var dic = temp.GetPropertiesArray(); - info = temp.Adapt(info); - tenantDb.Updateable(info).UpdateColumns(dic).ExecuteCommand(); + // info = temp.Adapt(info); + // tenantDb.Updateable(info).UpdateColumns(dic).ExecuteCommand(); - Assert.True(true); - } - [Fact] + // Assert.True(true); + //} + //[Fact] - public void CopyColumnTest() - { - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + //public void CopyColumnTest() + //{ + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - var columns = "noBill,enName,copyNoBill"; + // var columns = "noBill,enName,copyNoBill"; - var list = columns.Split(","); - var list1 = new List(); - foreach (var item in list) - { - list1.Add(item.ToUpperCamelCase()); - } - Console.WriteLine(list1[0]); - Assert.True(true); - } + // var list = columns.Split(","); + // var list1 = new List(); + // foreach (var item in list) + // { + // list1.Add(item.ToUpperCamelCase()); + // } + // Console.WriteLine(list1[0]); + // Assert.True(true); + //} - public class ClientTemp - { - /// - /// Desc:瀹㈡埛涓枃鍚嶇О鎴栨弿杩颁俊鎭 - /// - public string Description { get; set; } - - /// - /// Desc:瀹㈡埛鑻辨枃绠绉 - /// - public string Name { get; set; } - - /// - /// Desc:瀹㈡埛鑻辨枃鍏ㄧО - /// - public string EnFullName { get; set; } - - /// - /// Desc:閫氳鍦板潃 - /// - public string Address { get; set; } - } + //public class ClientTemp + //{ + // /// + // /// Desc:瀹㈡埛涓枃鍚嶇О鎴栨弿杩颁俊鎭 + // /// + // public string Description { get; set; } + + // /// + // /// Desc:瀹㈡埛鑻辨枃绠绉 + // /// + // public string Name { get; set; } + + // /// + // /// Desc:瀹㈡埛鑻辨枃鍏ㄧО + // /// + // public string EnFullName { get; set; } + + // /// + // /// Desc:閫氳鍦板潃 + // /// + // public string Address { get; set; } + //} /// /// 鍒濆鍖栧崟琛 /// - [Fact] - public void InitTableTestJHQ() - { - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 - //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); - //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); - //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare)); - //tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage)); - //tenantDb.CodeFirst.InitTables(typeof(BookingLabel)); - //tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation)); - - //tenantDb.CodeFirst.InitTables(typeof(InfoClient)); - //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty)); - //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail)); - //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); - Assert.True(true); - } - /// - /// 鍒濆鍖栧崟琛 - /// - [Fact] - public void InitTableTestZXF() - { - var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); - StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 + //[Fact] + //public void InitTableTestJHQ() + //{ + // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); + // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//杈冮珮鐗堟湰鏀寔 + // //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); + // //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); + // //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingLabel)); + // //tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation)); + + // //tenantDb.CodeFirst.InitTables(typeof(InfoClient)); + // //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty)); + // //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail)); + // //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); + // 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); + // 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); - } + // //tenantDb.CodeFirst.InitTables(typeof(TaskFlowLog)); + // //tenantDb.CodeFirst.InitTables(typeof(TaskFlowLogDetail)); + // Assert.True(true); + //} } \ No newline at end of file