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

往来单位修改

Browse Source
usertest
cjy 3 months ago
parent 183d6ec7bb
commit 57dc467723
4 changed files with 89 additions and 218 deletions
Show Stats Download Patch File Download Diff File

51
ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoReq.cs
Unescape Escape View File

@ -72,20 +72,7 @@ public class ClientInfoReq
/// </summary>
public string Chief { get; set; }
/// <summary>
/// Desc:所属揽货人
/// </summary>
public long SaleId { get; set; }
/// <summary>
/// Desc:所属操作人
/// </summary>
public long Op { get; set; }
/// <summary>
/// Desc:所属单证
/// </summary>
public long Doc { get; set; }
/// <summary>
@ -375,12 +362,7 @@ public class ClientInfoReq
/// </summary>
public string CtnType { get; set; }
/// <summary>
/// Desc: 客服
/// </summary>
public long CustomerService { get; set; }
/// <summary>
/// Desc:英文简称
/// </summary>
@ -412,22 +394,37 @@ public class ClientInfoReq
public bool IsShared { get; set; }
/// <summary>
/// 揽货人名字
/// 揽货人Id
/// </summary>
public string SaleName { get; set; }
public long? SaleId { get; set; }
/// <summary>
/// 操作名字
/// 揽货人
/// </summary>
public string OpName { get; set; }
public string Sale { get; set; }
/// <summary>
/// Desc:单证
/// </summary>
public long? Doc { get; set; }
/// <summary>
/// 单证名字
/// Desc:单证人员
/// </summary>
public string DocName { get; set; }
/// <summary>
/// 操作员
/// </summary>
public long? OperatorId { get; set; }
/// <summary>
/// 操作员名称
/// </summary>
public string OperatorName { get; set; }
/// <summary>
/// 客服
/// </summary>
public long? CustomerService { get; set; }
/// <summary>
/// 客服名字
/// 客服名称
/// </summary>
public string CustomerServiceName { get; set; }

53
ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using DS.Module.Core.Enums;
using DS.Module.Core.Extensions;
using DS.WMS.Core.Info.Entity;
using Masuit.Tools.Systems;
using SqlSugar;
namespace DS.WMS.Core.Info.Dtos;
@ -72,20 +73,7 @@ public class ClientInfoRes
/// </summary>
public string Chief { get; set; }
/// <summary>
/// Desc:所属揽货人
/// </summary>
public long SaleId { get; set; }
/// <summary>
/// Desc:所属操作人
/// </summary>
public long Op { get; set; }
/// <summary>
/// Desc:所属单证
/// </summary>
public long Doc { get; set; }
/// <summary>
/// Desc:国家
@ -375,11 +363,7 @@ public class ClientInfoRes
/// Desc:集装箱尺寸
/// </summary>
public string CtnType { get; set; }
/// <summary>
/// Desc: 客服
/// </summary>
public long CustomerService { get; set; }
/// <summary>
/// Desc:英文简称
@ -417,22 +401,37 @@ public class ClientInfoRes
public List<ClientContactRes> ClientContactList { get; set; }
/// <summary>
/// 揽货人名字
/// 揽货人Id
/// </summary>
public string SaleName { get; set; }
public long? SaleId { get; set; }
/// <summary>
/// 操作名字
/// 揽货人
/// </summary>
public string OpName { get; set; }
public string Sale { get; set; }
/// <summary>
/// Desc:单证
/// </summary>
public long? Doc { get; set; }
/// <summary>
/// 单证名字
/// Desc:单证人员
/// </summary>
public string DocName { get; set; }
/// <summary>
/// 操作员
/// </summary>
public long? OperatorId { get; set; }
/// <summary>
/// 操作员名称
/// </summary>
public string OperatorName { get; set; }
/// <summary>
/// 客服
/// </summary>
public string DocName { get; set; }
public long? CustomerService { get; set; }
/// <summary>
/// 客服名字
/// 客服名称
/// </summary>
public string CustomerServiceName { get; set; }

201
ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs
Unescape Escape View File

@ -82,24 +82,8 @@ public class InfoClient : BaseModelV2<long>
/// </summary>
[SugarColumn(ColumnDescription = "负责人", IsNullable = true, Length = 20)]
public string? Chief { get; set; }
/// <summary>
/// Desc:所属揽货人
/// </summary>
[SugarColumn(ColumnDescription = "所属揽货人", IsNullable = true)]
public long? SaleId { get; set; }
/// <summary>
/// Desc:所属操作人
/// </summary>
[SugarColumn(ColumnDescription = "所属操作人", IsNullable = true)]
public long? Op { get; set; }
/// <summary>
/// Desc:所属单证
/// </summary>
[SugarColumn(ColumnDescription = "所属单证", IsNullable = true)]
public long? Doc { get; set; }
/// <summary>
/// Desc:国家
@ -131,133 +115,7 @@ public class InfoClient : BaseModelV2<long>
/// </summary>
[SugarColumn(ColumnDescription = "是否停用该客户信息", DefaultValue = "0")]
public bool IsStop { get; set; }
///// <summary>
///// Desc:发票抬头1
///// </summary>
//[SugarColumn(ColumnDescription = "发票抬头1", Length = 60, IsNullable = true)]
//public string BillRises1 { get; set; }
///// <summary>
///// Desc:发票抬头2
///// </summary>
//[SugarColumn(ColumnDescription = "发票抬头2", Length = 60, IsNullable = true)]
//public string BillRises2 { get; set; }
///// <summary>
///// Desc:美元支票抬头
///// </summary>
//[SugarColumn(ColumnDescription = "美元支票抬头", Length = 60, IsNullable = true)]
//public string USDBillRises { get; set; }
///// <summary>
///// Desc:人民币支票抬头
///// </summary>
//[SugarColumn(ColumnDescription = "人民币支票抬头", Length = 60, IsNullable = true)]
//public string RMBBillRises { get; set; }
///// <summary>
///// Desc:人民币开户银行
///// </summary>
//[SugarColumn(ColumnDescription = "人民币开户银行", Length = 60, IsNullable = true)]
//public string RMBBank { get; set; }
///// <summary>
///// Desc:人民币账号
///// </summary>
//[SugarColumn(ColumnDescription = "人民币账号", Length = 30, IsNullable = true)]
//public string RMBAccount { get; set; }
///// <summary>
///// Desc:人民币联机行号
///// </summary>
//[SugarColumn(ColumnDescription = "人民币联机行号", Length = 20, IsNullable = true)]
//public string RMBOnlineNO { get; set; }
///// <summary>
///// Desc:美元开户银行
///// </summary>
//[SugarColumn(ColumnDescription = "美元开户银行", Length = 60, IsNullable = true)]
//public string USDBank { get; set; }
///// <summary>
///// Desc:美元账号
///// </summary>
//[SugarColumn(ColumnDescription = "美元账号", Length = 30, IsNullable = true)]
//public string USDAccount { get; set; }
///// <summary>
///// Desc:美元联机行号
///// </summary>
//[SugarColumn(ColumnDescription = "美元联机行号", Length = 20, IsNullable = true)]
//public string USDOnlineNO { get; set; }
///// <summary>
///// Desc:自定义属性1
///// </summary>
//[SugarColumn(ColumnDescription = "自定义属性1", Length = 12, IsNullable = true)]
//public string CustomAttributes1 { get; set; }
///// <summary>
///// Desc:自定义属性2
///// </summary>
//[SugarColumn(ColumnDescription = "自定义属性2", Length = 12, IsNullable = true)]
//public string CustomAttributes2 { get; set; }
///// <summary>
///// Desc:美元信用最大金额
///// </summary>
//[SugarColumn(ColumnDescription = "美元信用最大金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
//public decimal? USDMaxAmountCredit { get; set; } = 0;
///// <summary>
///// Desc:人民币信用最大金额
///// </summary>
//[SugarColumn(ColumnDescription = "人民币信用最大金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
//public decimal? RMBMaxAmountCredit { get; set; } = 0;
///// <summary>
///// Desc:信用最大金额（RMB+USD）
///// </summary>
//[SugarColumn(ColumnDescription = "信用最大金额（RMB+USD）", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
//public decimal? MaxAmountCredit { get; set; } = 0;
///// <summary>
///// Desc:结算方式编码
///// </summary>
//[SugarColumn(ColumnDescription = "结算方式编码", Length = 30, IsNullable = true)]
//public string StlName { get; set; }
///// <summary>
///// Desc:美金汇率
///// </summary>
//[SugarColumn(ColumnDescription = "美金汇率", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
//public decimal? USDExchangeRate { get; set; }
///// <summary>
///// Desc:月结算时间
///// </summary>
//[SugarColumn(ColumnDescription = "月结算时间", Length = 2, IsNullable = true)]
//public string StlDate { get; set; }
///// <summary>
///// Desc:上半月结算时间
///// </summary>
//[SugarColumn(ColumnDescription = "上半月结算时间", Length = 2, IsNullable = true)]
//public string StlFirstHalfDate { get; set; }
///// <summary>
///// Desc:下半月结算时间
///// </summary>
//[SugarColumn(ColumnDescription = "下半月结算时间", Length = 2, IsNullable = true)]
//public string StlMiddleDate { get; set; }
///// <summary>
///// Desc:票结结算时间
///// </summary>
//[SugarColumn(ColumnDescription = "发票结算时间", Length = 2, IsNullable = true)]
//public string InvoiceStlDate { get; set; }
/// <summary>
/// Desc:等级
@ -433,12 +291,7 @@ public class InfoClient : BaseModelV2<long>
[SugarColumn(ColumnDescription = "集装箱尺寸", Length = 50, IsNullable = true)]
public string? CtnType { get; set; }
/// <summary>
/// Desc: 客服
/// </summary>
[SugarColumn(ColumnDescription = "客服")]
public long CustomerService { get; set; }
/// <summary>
/// Desc:英文简称
/// </summary>
@ -452,28 +305,50 @@ public class InfoClient : BaseModelV2<long>
public string? WMSFeeRateType { get; set; }
/// <summary>
/// 揽货人名字
/// 揽货人Id
/// </summary>
[SugarColumn(ColumnDescription = "揽货人Id", IsNullable = true, DefaultValue = "0")]
public long? SaleId { get; set; }
/// <summary>
/// 揽货人
/// </summary>
[SugarColumn(ColumnDescription = "揽货人", IsNullable = true, Length = 100)]
public string Sale { get; set; }
/// <summary>
/// Desc:单证
/// </summary>
[SugarColumn(ColumnDescription = "揽货人名字", Length = 50, IsNullable = true)]
public string? SaleName { get; set; }
[SugarColumn(ColumnDescription = "单证", IsNullable = true, DefaultValue = "0")]
public long? Doc { get; set; }
/// <summary>
/// 操作名字
/// Desc:单证人员
/// </summary>
[SugarColumn(ColumnDescription = "操作名字", Length = 50, IsNullable = true)]
public string? OpName { get; set; }
[SugarColumn(ColumnDescription = "单证人员", IsNullable = true, Length = 30)]
public string DocName { get; set; }
/// <summary>
/// 单证名字
/// 操作员
/// </summary>
[SugarColumn(ColumnDescription = "操作员", IsNullable = true, DefaultValue = "0")]
public long? OperatorId { get; set; }
/// <summary>
/// 操作员名称
/// </summary>
[SugarColumn(ColumnDescription = "操作员", IsNullable = true, Length = 30)]
public string OperatorName { get; set; }
/// <summary>
/// 客服
/// </summary>
[SugarColumn(ColumnDescription = "单证名字", Length = 50, IsNullable = true)]
public string? DocName { get; set; }
[SugarColumn(ColumnDescription = "客服", IsNullable = true, DefaultValue = "0")]
public long? CustomerService { get; set; }
/// <summary>
/// 客服名字
/// 客服名称
/// </summary>
[SugarColumn(ColumnDescription = "客服名字", Length = 50, IsNullable = true)]
public string? CustomerServiceName { get; set; }
[SugarColumn(ColumnDescription = "客服名称", IsNullable = true, Length = 30)]
public string CustomerServiceName { get; set; }
/// <summary>
/// 是否共享

2
ds-wms-service/DS.WMS.Test/SaasDBUpdateTest.cs
Unescape Escape View File

@ -60,7 +60,7 @@ public class SaasDBUpdateTest
var tenantDb = saasService.GetBizDbScopeById(item.TenantId).CopyNew();
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci"; //较高版本支持
//tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体
tenantDb.CodeFirst.InitTables(typeof(BusinessCtnPrice));//指定更新特定实体
tenantDb.CodeFirst.InitTables(typeof(InfoClient));//指定更新特定实体
}
Assert.True(true);

Write Preview
Loading…
Cancel
Save