dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

'20221218'

Browse Source
临时发布20240103
dengyu 2 years ago
parent 06e0811d5a
commit 858242a560
121 changed files with 8029 additions and 7926 deletions
Show Stats Download Patch File Download Diff File

BIN
BookingJieFeng/obj/Debug/BookingJieFeng.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
BookingJieFeng/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
BookingJieFeng/obj/Release/BookingJieFeng.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
BookingWeb/obj/Debug/BookingWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
BookingWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
BookingWeb/obj/Release/BookingWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
D7MqClient/D7MqClient/obj/Debug/D7MqClient.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
D7MqClient/D7MqClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

1
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -1432,6 +1432,7 @@ namespace DSWeb.Common.DB
public decimal? SETTLERMB { get; set; }
public decimal? SETTLEUSD { get; set; }
public decimal? SETTLERATE { get; set; }
public string APPLICANT { get; set; }
public DateTime? APPLYTIME { get; set; }
public DateTime? ENTERTIME { get; set; }

BIN
DSWeb.Common/bin/Release/DSWeb.Common.dll
View File

Binary file not shown.

BIN
DSWeb.Common/bin/Release/DSWeb.Common.pdb
View File

Binary file not shown.

BIN
DSWeb.Common/obj/Debug/DSWeb.Common.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
86e121ff91eae4e8a0e70aecc796ab8a6d045f6a
aa4bd8239d6c2c69aa5ded6fda2df055da35f383

16
DSWeb.Common/obj/Debug/DSWeb.Common.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -126,3 +126,19 @@ H:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CoreCompileInputs.cache
H:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CopyComplete
H:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.dll
H:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.pdb
E:\DS7_CHJY\DSWeb.Common\bin\Debug\DSWeb.Common.dll.config
E:\DS7_CHJY\DSWeb.Common\bin\Debug\DSWeb.Common.dll
E:\DS7_CHJY\DSWeb.Common\bin\Debug\DSWeb.Common.pdb
E:\DS7_CHJY\DSWeb.Common\bin\Debug\EntityFramework.dll
E:\DS7_CHJY\DSWeb.Common\bin\Debug\EntityFramework.SqlServer.dll
E:\DS7_CHJY\DSWeb.Common\bin\Debug\log4net.dll
E:\DS7_CHJY\DSWeb.Common\bin\Debug\Newtonsoft.Json.dll
E:\DS7_CHJY\DSWeb.Common\bin\Debug\EntityFramework.xml
E:\DS7_CHJY\DSWeb.Common\bin\Debug\EntityFramework.SqlServer.xml
E:\DS7_CHJY\DSWeb.Common\bin\Debug\log4net.xml
E:\DS7_CHJY\DSWeb.Common\bin\Debug\Newtonsoft.Json.xml
E:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.AssemblyReference.cache
E:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CoreCompileInputs.cache
E:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.csproj.CopyComplete
E:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.dll
E:\DS7_CHJY\DSWeb.Common\obj\Debug\DSWeb.Common.pdb

BIN
DSWeb.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Debug/HcDBUtility.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Debug/HcDBUtility.pdb
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/DSWeb.Common.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/DSWeb.Common.pdb
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/DSWeb.Interface.pdb
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/HcDBUtility.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/HcDBUtility.pdb
View File

Binary file not shown.

2
DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
ba5fe1f9f0d9b8159fab664404734e9d37dc2539
b48f99bd0c123217fea27b4854478c3d134db780

20
DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -119,3 +119,23 @@ H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CoreCompileInputs.c
H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CopyComplete
H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.dll
H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.pdb
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\DSWeb.Interface.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\DSWeb.Interface.pdb
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\DSWeb.Common.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\HcDBUtility.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\Newtonsoft.Json.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\log4net.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Logging.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Data.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Common.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\Microsoft.Practices.ObjectBuilder2.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\Microsoft.Practices.Unity.dll
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\DSWeb.Common.pdb
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\DSWeb.Common.dll.config
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\HcDBUtility.pdb
E:\DS7_CHJY\DSWeb.Interface\bin\Debug\log4net.xml
E:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.AssemblyReference.cache
E:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CoreCompileInputs.cache
E:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CopyComplete
E:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.dll
E:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.pdb

BIN
DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
View File

Binary file not shown.

BIN
DSWeb.Interface/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
DSWeb.Job.Common/obj/Debug/DSWeb.Job.Common.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
DSWeb.Job.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
DSWeb.Job.Common/obj/Release/DSWeb.Job.Common.csproj.AssemblyReference.cache
View File

Binary file not shown.

16
DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs
Unescape Escape View File

@ -2040,6 +2040,7 @@ namespace DSWeb.MvcShipping.Controllers
//1 在其工作日志中 提单签入比提单签出的数量多1
//2 没有不成对的 【扣单】和【取消扣单】
//20221216 如果最后一次取消扣单之后没有新的扣单 则还是允许签出
//var cdc = new CommonDataContext();
@ -2082,6 +2083,21 @@ namespace DSWeb.MvcShipping.Controllers
}
if (扣单count - 取消扣单count != 0)
{
//
if (loglist.Exists(x => x.ACTNAME == "取消扣单")) {
var 最后取消扣单的时间Str = loglist.Where(x => x.ACTNAME == "取消扣单").Max(x => x.OPDATE);
var 最后取消扣单的时间 = Convert.ToDateTime(最后取消扣单的时间Str);
if (loglist.Exists(x => x.ACTNAME == "扣单" && Convert.ToDateTime(x.OPDATE)> 最后取消扣单的时间)) {
//如果有晚于最后一次取消扣单的扣单 那还是扣单状态
result.SetErrorInfo("目前处于扣单状态");
}
}
else
result.SetErrorInfo("目前处于扣单状态");
}

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>H:\DS7_CHJY\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>E:\DS7_CHJY\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />

15840
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

File diff suppressed because it is too large Load Diff

BIN
DSWeb/UploadFiles/SeaFee/ADMIN20221215170411886机密费用导入表格舱单服务费11月.xlsx
View File

Binary file not shown.

BIN
DSWeb/bin/DSWeb.XmlSerializers.dll
View File

Binary file not shown.

BIN
DSWeb/bin/DSWebComponent.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/OfficeHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/OfficeHelper.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.pdb
View File

Binary file not shown.

BIN
DSWebComponent/bin/Debug/DSWebComponent.dll
View File

Binary file not shown.

BIN
DSWebComponent/bin/Debug/DSWebComponent.pdb
View File

Binary file not shown.

BIN
DSWebComponent/bin/Release/DSWebComponent.dll
View File

Binary file not shown.

BIN
DSWebComponent/bin/Release/DSWebComponent.pdb
View File

Binary file not shown.

BIN
DispatchWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
DispatchWeb/obj/Debug/DispatchWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
DispatchWeb/obj/Release/DispatchWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
FrmHttpHelper/FrmHttpHelper/bin/Debug/FrmHttpHelper.dll
View File

Binary file not shown.

BIN
FrmHttpHelper/FrmHttpHelper/bin/Debug/FrmHttpHelper.pdb
View File

Binary file not shown.

BIN
HcDBUtility/bin/Debug/HcDBUtility.dll
View File

Binary file not shown.

BIN
HcDBUtility/bin/Debug/HcDBUtility.pdb
View File

Binary file not shown.

BIN
HcDBUtility/bin/Debug/JsonHelper.dll
View File

Binary file not shown.

BIN
HcDBUtility/bin/Debug/JsonHelper.pdb
View File

Binary file not shown.

BIN
HcDBUtility/bin/Release/HcDBUtility.dll
View File

Binary file not shown.

BIN
HcDBUtility/bin/Release/HcDBUtility.pdb
View File

Binary file not shown.

BIN
HcDBUtility/bin/Release/JsonHelper.dll
View File

Binary file not shown.

BIN
HcDBUtility/bin/Release/JsonHelper.pdb
View File

Binary file not shown.

BIN
JobAutoCreateFee/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
JobAutoCreateFee/obj/Debug/JobAutoCreateFee.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobAutoCreateFee/obj/Release/JobAutoCreateFee.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobPingTaiWork/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
JobPingTaiWork/obj/Debug/JobPingTaiWork.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobReqWebData/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
JobReqWebData/obj/Debug/JobReqWebData.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobReqWebData/obj/Release/JobReqWebData.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobYunDang/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
JobYunDang/obj/Debug/JobYunDang.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JobYunDang/obj/Release/JobYunDang.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Job_DSWMS_REPORT/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Job_DSWMS_REPORT/obj/Debug/Job_DSWMS_REPORT.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Job_DSWMS_REPORT/obj/Release/Job_DSWMS_REPORT.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Job_JieFeng_FTP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Job_JieFeng_FTP/obj/Debug/Job_JieFeng_FTP.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
JsonHelper/bin/Debug/JsonHelper.dll
View File

Binary file not shown.

BIN
JsonHelper/bin/Debug/JsonHelper.pdb
View File

Binary file not shown.

BIN
JsonHelper/bin/Release/JsonHelper.dll
View File

Binary file not shown.

BIN
JsonHelper/bin/Release/JsonHelper.pdb
View File

Binary file not shown.

BIN
JsonHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

6
JsonHelper/obj/Debug/JsonHelper.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -57,3 +57,9 @@ H:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.csproj.AssemblyReference.cache
H:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.csproj.CoreCompileInputs.cache
H:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.dll
H:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.pdb
E:\DS7_CHJY\JsonHelper\bin\Debug\JsonHelper.dll
E:\DS7_CHJY\JsonHelper\bin\Debug\JsonHelper.pdb
E:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.csproj.AssemblyReference.cache
E:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.csproj.CoreCompileInputs.cache
E:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.dll
E:\DS7_CHJY\JsonHelper\obj\Debug\JsonHelper.pdb

BIN
JsonHelper/obj/Debug/JsonHelper.dll
View File

Binary file not shown.

BIN
JsonHelper/obj/Debug/JsonHelper.pdb
View File

Binary file not shown.

6
JsonHelper/obj/Release/JsonHelper.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -57,3 +57,9 @@ H:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.csproj.AssemblyReference.cache
H:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.csproj.CoreCompileInputs.cache
H:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.dll
H:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.pdb
E:\DS7_CHJY\JsonHelper\bin\Release\JsonHelper.dll
E:\DS7_CHJY\JsonHelper\bin\Release\JsonHelper.pdb
E:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.csproj.AssemblyReference.cache
E:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.csproj.CoreCompileInputs.cache
E:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.dll
E:\DS7_CHJY\JsonHelper\obj\Release\JsonHelper.pdb

BIN
JsonHelper/obj/Release/JsonHelper.dll
View File

Binary file not shown.

BIN
JsonHelper/obj/Release/JsonHelper.pdb
View File

Binary file not shown.

BIN
OfficeHelper/bin/Debug/OfficeHelper.dll
View File

Binary file not shown.

BIN
OfficeHelper/bin/Debug/OfficeHelper.pdb
View File

Binary file not shown.

BIN
OfficeHelper/bin/Release/OfficeHelper.dll
View File

Binary file not shown.

BIN
OfficeHelper/bin/Release/OfficeHelper.pdb
View File

Binary file not shown.

BIN
OfficeHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

6
OfficeHelper/obj/Debug/OfficeHelper.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -45,3 +45,9 @@ H:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.csproj.AssemblyReference.cache
H:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.csproj.CoreCompileInputs.cache
H:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.dll
H:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.pdb
E:\DS7_CHJY\OfficeHelper\bin\Debug\OfficeHelper.dll
E:\DS7_CHJY\OfficeHelper\bin\Debug\OfficeHelper.pdb
E:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.csproj.AssemblyReference.cache
E:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.csproj.CoreCompileInputs.cache
E:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.dll
E:\DS7_CHJY\OfficeHelper\obj\Debug\OfficeHelper.pdb

BIN
OfficeHelper/obj/Debug/OfficeHelper.dll
View File

Binary file not shown.

BIN
OfficeHelper/obj/Debug/OfficeHelper.pdb
View File

Binary file not shown.

6
OfficeHelper/obj/Release/OfficeHelper.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -52,3 +52,9 @@ H:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.csproj.AssemblyReference.cache
H:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.csproj.CoreCompileInputs.cache
H:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.dll
H:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.pdb
E:\DS7_CHJY\OfficeHelper\bin\Release\OfficeHelper.dll
E:\DS7_CHJY\OfficeHelper\bin\Release\OfficeHelper.pdb
E:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.csproj.AssemblyReference.cache
E:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.csproj.CoreCompileInputs.cache
E:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.dll
E:\DS7_CHJY\OfficeHelper\obj\Release\OfficeHelper.pdb

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save