chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

Browse Source
dev
zhangxiaofeng 2 months ago
parent ca170e4dc7 2e7e2ae9b6
commit 2f1265e258
20 changed files with 262 additions and 169 deletions
Show Stats Download Patch File Download Diff File

6
ds-wms-service/DS.WMS.ContainerManagementApi/Program.cs
Unescape Escape View File

@ -12,6 +12,8 @@ using DS.Module.Swagger;
using DS.Module.UserModule; using DS.Module.UserModule;
using NLog.Web; using NLog.Web;
using Swashbuckle.AspNetCore.SwaggerUI; using Swashbuckle.AspNetCore.SwaggerUI;
using DS.Module.DjyRulesEngine;
using DS.Module.PrintModule;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
var environment = builder.Environment.EnvironmentName; var environment = builder.Environment.EnvironmentName;
@ -44,6 +46,10 @@ builder.Services.AddMultiLanguageInstall();//
//builder.Services.AddCrawlerModuleInstall();//ÔË×Ù·þÎñ //builder.Services.AddCrawlerModuleInstall();//ÔË×Ù·þÎñ
builder.Services.AddDjyModuleInstall();//Djy·þÎñ
builder.Services.AddRuleEngineModuleInstall();//Djy¹æÔòÒýÇæУÑé·þÎñ
var app = builder.Build(); var app = builder.Build();
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateReq.cs
Unescape Escape View File

@ -195,6 +195,11 @@ public class CM_CurrentStateReq
/// 购入价格 /// 购入价格
/// </summary> /// </summary>
public decimal? CtnValue_BuyingPrice { get; set; } = 0; public decimal? CtnValue_BuyingPrice { get; set; } = 0;
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
/// <summary> /// <summary>

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CurrentStateRes.cs
Unescape Escape View File

@ -189,4 +189,9 @@ public class CM_CurrentStateRes: BaseFieldRes
/// Desc:箱生产时间 /// Desc:箱生产时间
/// </summary> /// </summary>
public DateTime? ProductionDate { get; set; } public DateTime? ProductionDate { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeReq.cs
Unescape Escape View File

@ -208,6 +208,11 @@ public class CM_State_ChangeReq
/// </summary> /// </summary>
public DateTime? ProductionDate { get; set; } public DateTime? ProductionDate { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary> /// <summary>
/// 用于判断是否是相同的变动 /// 用于判断是否是相同的变动
/// 依据是： /// 依据是：

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeRes.cs
Unescape Escape View File

@ -184,4 +184,9 @@ public class CM_State_ChangeRes : BaseFieldRes
/// 箱初期成本 /// 箱初期成本
/// </summary> /// </summary>
public decimal? CtnValue_Base { get; set; } = 0; public decimal? CtnValue_Base { get; set; } = 0;
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_FeeBase_DetailRes.cs
Unescape Escape View File

@ -193,5 +193,8 @@ public class VW_CM_FeeBase_DetailRes
/// Desc:箱流转状态 /// Desc:箱流转状态
/// </summary> /// </summary>
public string CtnFlowState => CtnFlowStateId?.GetDescription(); public string CtnFlowState => CtnFlowStateId?.GetDescription();
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

4
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_NeedEndLease_DetailRes.cs
Unescape Escape View File

@ -178,4 +178,8 @@ public class VW_CM_NeedEndLease_DetailRes
/// Desc:箱业务状态id: 短租租出 长租租出 单程 卖箱 /// Desc:箱业务状态id: 短租租出 长租租出 单程 卖箱
/// </summary> /// </summary>
public CM_CtnBizStateEnum? CtnBizStateId { get; set; } public CM_CtnBizStateEnum? CtnBizStateId { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedEndLeaseRes.cs
Unescape Escape View File

@ -201,5 +201,8 @@ public class VW_CM_RentOut_NeedEndLeaseRes
public string VesselVoyno { get; set; } public string VesselVoyno { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOut_NeedRentRes.cs
Unescape Escape View File

@ -122,4 +122,9 @@ public class VW_CM_RentOut_NeedRentRes
/// Desc:关联放箱单号 /// Desc:关联放箱单号
/// </summary> /// </summary>
public string? CtnReleaseNo { get; set; } public string? CtnReleaseNo { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

4
ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_SellCtn_NeedSellRes.cs
Unescape Escape View File

@ -144,4 +144,8 @@ public class VW_CM_SellCtn_NeedSellRes
/// Desc:关联放箱单号 /// Desc:关联放箱单号
/// </summary> /// </summary>
public string? CtnReleaseNo { get; set; } public string? CtnReleaseNo { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_CurrentState.cs
Unescape Escape View File

@ -200,5 +200,10 @@ public class CM_CurrentState : BaseOrgModel<long>
[SugarColumn(ColumnDescription = "状态时间", IsNullable = true)] [SugarColumn(ColumnDescription = "状态时间", IsNullable = true)]
public DateTime? StateTime { get; set; } public DateTime? StateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

6
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change.cs
Unescape Escape View File

@ -206,7 +206,11 @@ public class CM_State_Change : BaseOrgModel<long>
[SugarColumn(ColumnDescription = "状态变动时间", IsNullable = true)] [SugarColumn(ColumnDescription = "状态变动时间", IsNullable = true)]
public DateTime? ChangeTime { get; set; } public DateTime? ChangeTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

6
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_FeeBase_Detail.cs
Unescape Escape View File

@ -226,5 +226,11 @@ public class VW_CM_FeeBase_Detail : BaseOrgModel<long>
/// </summary> /// </summary>
[Description("创建时间")] [Description("创建时间")]
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_NeedEndLease_Detail.cs
Unescape Escape View File

@ -231,5 +231,10 @@ public class VW_CM_NeedEndLease_Detail : BaseOrgModel<long>
[SugarColumn(ColumnDescription = "箱流转状态Id", IsNullable = true)] [SugarColumn(ColumnDescription = "箱流转状态Id", IsNullable = true)]
public CMCtnFlowStateEnum? CtnFlowStateId { get; set; } public CMCtnFlowStateEnum? CtnFlowStateId { get; set; }
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

6
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedEndLease.cs
Unescape Escape View File

@ -219,6 +219,10 @@ public class VW_CM_RentOut_NeedEndLease : BaseOrgModel<long>
[SugarColumn(ColumnDescription = "是否上线id", IsNullable = true, DefaultValue = "0")] [SugarColumn(ColumnDescription = "是否上线id", IsNullable = true, DefaultValue = "0")]
public CM_IsOnlineEnum? IsOnlineId { get; set; } = 0; public CM_IsOnlineEnum? IsOnlineId { get; set; } = 0;
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

6
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_RentOut_NeedRent.cs
Unescape Escape View File

@ -116,5 +116,11 @@ public class VW_CM_RentOut_NeedRent : BaseOrgModelV2<long>
/// </summary> /// </summary>
[Description("创建时间")] [Description("创建时间")]
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

6
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/VW_CM_SellCtn_NeedSell.cs
Unescape Escape View File

@ -141,5 +141,11 @@ public class VW_CM_SellCtn_NeedSell : BaseOrgModelV2<long>
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "购入价格", IsNullable = true, Length = 20, DecimalDigits = 2)] [SugarColumn(ColumnDescription = "购入价格", IsNullable = true, Length = 20, DecimalDigits = 2)]
public decimal? CtnValue_BuyingPrice { get; set; } public decimal? CtnValue_BuyingPrice { get; set; }
/// <summary>
/// 备注
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 400)]
public string Remark { get; set; }
} }

7
ds-wms-service/DS.WMS.Core/ContainerManagement/Interface/ICM_BaseInfoService.cs
Unescape Escape View File

@ -46,4 +46,11 @@ public interface ICM_BaseInfoService
/// <returns></returns> /// <returns></returns>
DataResult CM_DealExcel(CM_DealExcelReq model); DataResult CM_DealExcel(CM_DealExcelReq model);
/// <summary>
/// 判断箱号的箱型与当前的该箱基础信息的箱型是否一致
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
//DataResult CM_CheckCtnCtnall(CM_DealExcelReq model);
} }

5
ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs
Unescape Escape View File

@ -435,6 +435,11 @@ public class CM_State_ChangeService : CMServiceBase, ICM_State_ChangeService
newCurrState.CtnReleaseNo = change.CtnReleaseNo; newCurrState.CtnReleaseNo = change.CtnReleaseNo;
} }
if (change.Remark != null)
{
newCurrState.Remark = change.Remark;
}
newCurrState.StateTime = change.ChangeTime; newCurrState.StateTime = change.ChangeTime;

324
ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs
Unescape Escape View File

@ -35,33 +35,33 @@ public class ContainerManagementTest
saasService = _serviceProvider.GetRequiredService<ISaasDbService>(); saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
} }
[Fact] //[Fact]
public void ContainerManagementTest1() //public void ContainerManagementTest1()
{ //{
Type[] types = Assembly // 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 // .LoadFrom("DS.WMS.Core.dll")//如果 .dll报错，可以换成 xxx.exe 有些生成的是exe
// .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity."))//命名空间过滤，当然你也可以写其他条件过滤 // .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(); // .ToArray();
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); // //Type[] types = Assembly
// var temp = tenantDb.CodeFirst.GetDifferenceTables(types); || it.FullName.Contains("DS.WMS.Core.Op.Entity.") // // .LoadFrom("DS.WMS.Core.dll")//如果 .dll报错，可以换成 xxx.exe 有些生成的是exe
// var diffString= tenantDb.CodeFirst.GetDifferenceTables(types).ToDiffString(); // // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity."))//命名空间过滤，当然你也可以写其他条件过滤
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 // // .ToArray();
//types = types.Where(it => it.Name != "BusinessFeeStatus").ToArray(); // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
//types = types.Where(it => it.Name != "BusinessOrderContact").ToArray(); // // var temp = tenantDb.CodeFirst.GetDifferenceTables(types); || it.FullName.Contains("DS.WMS.Core.Op.Entity.")
// // var diffString= tenantDb.CodeFirst.GetDifferenceTables(types).ToDiffString();
tenantDb.CodeFirst.InitTables(types); // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
// //初始化数库 // //types = types.Where(it => it.Name != "BusinessFeeStatus").ToArray();
// tenantDb.DbMaintenance.CreateDatabase(); // //types = types.Where(it => it.Name != "BusinessOrderContact").ToArray();
//
// tenantDb.CodeFirst.InitTables(typeof(CodeCountry)); // tenantDb.CodeFirst.InitTables(types);
Assert.True(true); // // //初始化数库
} // // tenantDb.DbMaintenance.CreateDatabase();
// //
// // tenantDb.CodeFirst.InitTables(typeof(CodeCountry));
// Assert.True(true);
//}
/// <summary> /// <summary>
@ -79,29 +79,29 @@ public class ContainerManagementTest
/// <summary> /// <summary>
/// 初始化单表 /// 初始化单表
/// </summary> /// </summary>
[Fact] //[Fact]
public void InitTableTest() //public void InitTableTest()
{ //{
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState)); // tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState));
//tenantDb.CodeFirst.InitTables(typeof(CM_BaseInfo)); // //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));
//tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail)); // //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail));
//tenantDb.CodeFirst.InitTables(typeof(CM_RentOut)); // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut));
//tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail)); // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail));
//tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay)); // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay));
//tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail)); // //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail));
//db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); // //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn));
Assert.True(true); // Assert.True(true);
} //}
/// <summary> /// <summary>
/// 初始化单表 多表 /// 初始化单表 多表
@ -120,9 +120,9 @@ public class ContainerManagementTest
//tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体 //tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体
//tenantDb.CodeFirst.InitTables(typeof(OpLetterYard));//指定更新特定实体 //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_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));
//tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail)); //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_RentOneWay_Detail));
//tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn)); //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));
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));
//tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail));
@ -181,138 +181,138 @@ public class ContainerManagementTest
} }
[Fact] //[Fact]
public void SaasCheckTest() //public void SaasCheckTest()
{ //{
Type[] types = Assembly // Type[] types = Assembly
.LoadFrom("DS.WMS.Core.dll")//如果 .dll报错，可以换成 xxx.exe 有些生成的是exe // .LoadFrom("DS.WMS.Core.dll")//如果 .dll报错，可以换成 xxx.exe 有些生成的是exe
.GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity"))//命名空间过滤，当然你也可以写其他条件过滤 // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Code.Entity"))//命名空间过滤，当然你也可以写其他条件过滤
.ToArray(); // .ToArray();
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
//tenantDb.CodeFirst.InitTables(types); // //tenantDb.CodeFirst.InitTables(types);
Assert.True(true); // Assert.True(true);
} //}
[Fact] //[Fact]
public void SaasFeeTest() //public void SaasFeeTest()
{ //{
Type[] types = Assembly // Type[] types = Assembly
.LoadFrom("DS.WMS.Core.dll")//如果 .dll报错，可以换成 xxx.exe 有些生成的是exe // .LoadFrom("DS.WMS.Core.dll")//如果 .dll报错，可以换成 xxx.exe 有些生成的是exe
.GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Fee.Entity"))//命名空间过滤，当然你也可以写其他条件过滤 // .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.Fee.Entity"))//命名空间过滤，当然你也可以写其他条件过滤
.ToArray(); // .ToArray();
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
//tenantDb.CodeFirst.InitTables(types); // //tenantDb.CodeFirst.InitTables(types);
Assert.True(true); // Assert.True(true);
} //}
[Fact] //[Fact]
public void ClientBatchEdit()
{
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
var info = tenantDb.Queryable<InfoClient>().Filter(null, true).Where(x => x.Id == 1772138307266940928).First();
var temp = new ClientTemp
{
Address = "4",
Name = "4",
};
var dic = temp.GetPropertiesArray();
info = temp.Adapt(info); //public void ClientBatchEdit()
tenantDb.Updateable(info).UpdateColumns(dic).ExecuteCommand(); //{
// var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
// var info = tenantDb.Queryable<InfoClient>().Filter(null, true).Where(x => x.Id == 1772138307266940928).First();
Assert.True(true); // var temp = new ClientTemp
} // {
[Fact] // Address = "4",
// Name = "4",
// };
// var dic = temp.GetPropertiesArray();
public void CopyColumnTest() // info = temp.Adapt(info);
{ // tenantDb.Updateable(info).UpdateColumns(dic).ExecuteCommand();
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
var columns = "noBill,enName,copyNoBill";
// Assert.True(true);
//}
//[Fact]
var list = columns.Split(","); //public void CopyColumnTest()
var list1 = new List<string>(); //{
foreach (var item in list) // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
{
list1.Add(item.ToUpperCamelCase());
}
Console.WriteLine(list1[0]);
Assert.True(true);
}
// var columns = "noBill,enName,copyNoBill";
public class ClientTemp
{
/// <summary>
/// Desc:客户中文名称或描述信息
/// </summary>
public string Description { get; set; }
/// <summary> // var list = columns.Split(",");
/// Desc:客户英文简称 // var list1 = new List<string>();
/// </summary> // foreach (var item in list)
public string Name { get; set; } // {
// list1.Add(item.ToUpperCamelCase());
// }
// Console.WriteLine(list1[0]);
// Assert.True(true);
//}
/// <summary>
/// Desc:客户英文全称
/// </summary>
public string EnFullName { get; set; }
/// <summary> //public class ClientTemp
/// Desc:通讯地址 //{
/// </summary> // /// <summary>
public string Address { get; set; } // /// Desc:客户中文名称或描述信息
} // /// </summary>
// public string Description { get; set; }
// /// <summary>
// /// Desc:客户英文简称
// /// </summary>
// public string Name { get; set; }
// /// <summary>
// /// Desc:客户英文全称
// /// </summary>
// public string EnFullName { get; set; }
// /// <summary>
// /// Desc:通讯地址
// /// </summary>
// public string Address { get; set; }
//}
/// <summary> /// <summary>
/// 初始化单表 /// 初始化单表
/// </summary> /// </summary>
[Fact] //[Fact]
public void InitTableTestJHQ() //public void InitTableTestJHQ()
{ //{
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
//tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); // //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
//tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); // //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn));
//tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); // //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare)); // //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare));
//tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage)); // //tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage));
//tenantDb.CodeFirst.InitTables(typeof(BookingLabel)); // //tenantDb.CodeFirst.InitTables(typeof(BookingLabel));
//tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation)); // //tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation));
//tenantDb.CodeFirst.InitTables(typeof(InfoClient)); // //tenantDb.CodeFirst.InitTables(typeof(InfoClient));
//tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty)); // //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty));
//tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail)); // //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail));
//db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); // //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn));
Assert.True(true); // Assert.True(true);
} //}
/// <summary> ///// <summary>
/// 初始化单表 ///// 初始化单表
/// </summary> ///// </summary>
[Fact] //[Fact]
public void InitTableTestZXF() //public void InitTableTestZXF()
{ //{
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); // var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 // StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
var ass = Assembly.Load("DS.WMS.Core"); // var ass = Assembly.Load("DS.WMS.Core");
var types = ass.GetTypes().Where(it => it.FullName?.Contains("DS.WMS.Core.TaskPlat.Entity") == true).ToArray(); // var types = ass.GetTypes().Where(it => it.FullName?.Contains("DS.WMS.Core.TaskPlat.Entity") == true).ToArray();
//tenantDb.CodeFirst.InitTables(types); // //tenantDb.CodeFirst.InitTables(types);
//tenantDb.CodeFirst.InitTables(typeof(TaskFlowLog)); // //tenantDb.CodeFirst.InitTables(typeof(TaskFlowLog));
//tenantDb.CodeFirst.InitTables(typeof(TaskFlowLogDetail)); // //tenantDb.CodeFirst.InitTables(typeof(TaskFlowLogDetail));
Assert.True(true); // Assert.True(true);
} //}
} }
Write Preview
Loading…
Cancel
Save