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

修改

Browse Source
usertest
ZR20090193-陈敬勇 6 months ago
parent c090d10690
commit 0b8f3c0d5c
3 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File

20
ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
Unescape Escape View File

@ -50,16 +50,16 @@ public class SeaExport : BaseOrgModel<long>
//public int FeeStatus { get; set; }
///// <summary>
///// Desc:是否业务锁定
///// </summary>
//[SugarColumn(ColumnDescription = "是否业务锁定", DefaultValue = "0")]
//public bool? IsBusinessLocking { get; set; } = false;
///// <summary>
///// Desc:是否费用锁定
///// </summary>
//[SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")]
//public bool? IsFeeLocking { get; set; } = false;
/// <summary>
/// Desc:是否业务锁定
/// </summary>
[SugarColumn(ColumnDescription = "是否业务锁定", DefaultValue = "0")]
public bool? IsBusinessLocking { get; set; } = false;
/// <summary>
/// Desc:是否费用锁定
/// </summary>
[SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")]
public bool? IsFeeLocking { get; set; } = false;
/// <summary>
/// 录入日期
/// </summary>

2
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
Unescape Escape View File

@ -399,7 +399,7 @@ public class SeaExportService : ISeaExportService
entity.Cntr8 = 0;
entity.Cntr9 = 0;
entity.Cntr10 = 0;
entity.OtherCntr = "";
entity.OtherCntr = 0;
entity.TEU = 0;
entity.CntrTotal = "";
#region 处理箱型箱量

23
ds-wms-service/ds-wms-service.sln
Unescape Escape View File

@ -31,14 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.SMS", "DS.Module.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.AdminApi", "DS.WMS.AdminApi\DS.WMS.AdminApi.csproj", "{47195E8A-8E39-4575-AC53-8901710CB6CC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ds.Module.DynamicApi", "Ds.Module.DynamicApi\Ds.Module.DynamicApi.csproj", "{BC74BBAF-8959-4872-924A-D45B743ABDF2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.Nuget", "DS.Module.Nuget\DS.Module.Nuget.csproj", "{B2CA3885-C3D5-4A67-AA1C-18EF0B80F3B6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ds.Module.AppStartup", "Ds.Module.AppStartup\Ds.Module.AppStartup.csproj", "{C9345967-044E-40E3-AFB6-B3AE881D9777}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ds.Module.MediatR", "Ds.Module.MediatR\Ds.Module.MediatR.csproj", "{DD6DD9CA-6309-42B3-91A1-9EF355759C57}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.Test", "DS.WMS.Test\DS.WMS.Test.csproj", "{A8749917-1B4C-4976-98F7-C0A1B043DE38}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.MultiLanguage", "DS.Module.MultiLanguage\DS.Module.MultiLanguage.csproj", "{FE82ABD4-CE11-49F6-823C-6E0B64135FFC}"
@ -55,7 +49,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.FeeApi", "DS.WMS.Fee
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.CrawlerData", "DS.Module.CrawlerData\DS.Module.CrawlerData.csproj", "{AB3034D8-91F4-42A6-BFE9-497B238D65AD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.Module.DjyServiceStatus", "DS.Module.DjyServiceStatus\DS.Module.DjyServiceStatus.csproj", "{86AF9895-D98D-4BFD-BEB9-CE291A382426}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.DjyServiceStatus", "DS.Module.DjyServiceStatus\DS.Module.DjyServiceStatus.csproj", "{86AF9895-D98D-4BFD-BEB9-CE291A382426}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -107,22 +101,10 @@ Global
{47195E8A-8E39-4575-AC53-8901710CB6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47195E8A-8E39-4575-AC53-8901710CB6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47195E8A-8E39-4575-AC53-8901710CB6CC}.Release|Any CPU.Build.0 = Release|Any CPU
{BC74BBAF-8959-4872-924A-D45B743ABDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC74BBAF-8959-4872-924A-D45B743ABDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC74BBAF-8959-4872-924A-D45B743ABDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC74BBAF-8959-4872-924A-D45B743ABDF2}.Release|Any CPU.Build.0 = Release|Any CPU
{B2CA3885-C3D5-4A67-AA1C-18EF0B80F3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2CA3885-C3D5-4A67-AA1C-18EF0B80F3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2CA3885-C3D5-4A67-AA1C-18EF0B80F3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2CA3885-C3D5-4A67-AA1C-18EF0B80F3B6}.Release|Any CPU.Build.0 = Release|Any CPU
{C9345967-044E-40E3-AFB6-B3AE881D9777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9345967-044E-40E3-AFB6-B3AE881D9777}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9345967-044E-40E3-AFB6-B3AE881D9777}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9345967-044E-40E3-AFB6-B3AE881D9777}.Release|Any CPU.Build.0 = Release|Any CPU
{DD6DD9CA-6309-42B3-91A1-9EF355759C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD6DD9CA-6309-42B3-91A1-9EF355759C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD6DD9CA-6309-42B3-91A1-9EF355759C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD6DD9CA-6309-42B3-91A1-9EF355759C57}.Release|Any CPU.Build.0 = Release|Any CPU
{A8749917-1B4C-4976-98F7-C0A1B043DE38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8749917-1B4C-4976-98F7-C0A1B043DE38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8749917-1B4C-4976-98F7-C0A1B043DE38}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -175,10 +157,7 @@ Global
{56BF02EA-69E3-4B3E-A014-03233C36CB6E} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{CAC28C2C-3FCF-49BE-B6F3-5CC26CFCE3BC} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{47195E8A-8E39-4575-AC53-8901710CB6CC} = {65D75DB2-12D5-4D1F-893D-9750905CE5E4}
{BC74BBAF-8959-4872-924A-D45B743ABDF2} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{B2CA3885-C3D5-4A67-AA1C-18EF0B80F3B6} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{C9345967-044E-40E3-AFB6-B3AE881D9777} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{DD6DD9CA-6309-42B3-91A1-9EF355759C57} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{A8749917-1B4C-4976-98F7-C0A1B043DE38} = {EB351D25-8071-4AE1-B981-EA52B5C2C06E}
{FE82ABD4-CE11-49F6-823C-6E0B64135FFC} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}
{B0351554-748F-4DF8-8C22-152646937EFE} = {518DB9B5-80A8-4B2C-8570-52BD406458DE}

Write Preview
Loading…
Cancel
Save