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

1

Browse Source
DS7_HYRD
hanxuntao 10 months ago
parent 6811851dd0
commit 684781f089
6 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

10
DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlChFee/MsCwVouchersGlChFeeDAL.cs
Unescape Escape View File

@ -9486,8 +9486,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
#region 摘要内容
strEXPLAN = "";
if (dsVWChFeeAR.Tables[0].Rows[i]["FEETYPE"].ToString().Trim() == "收")
strEXPLAN = DREXPLAN;
else strEXPLAN = CREXPLAN;
strEXPLAN = MBINCOMEEXPLAN;
else strEXPLAN = MBSPENDINGEXPLAN;
var ISEXPLAN = false;
if (strEXPLAN != "") ISEXPLAN = true;
@ -10614,8 +10614,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
#region 摘要内容
strEXPLAN = "";
if (dsVWChFeeAR.Tables[0].Rows[i]["FEETYPE"].ToString().Trim() == "收")
strEXPLAN = DREXPLAN;
else strEXPLAN = CREXPLAN;
strEXPLAN = MBINCOMEEXPLAN;
else strEXPLAN = MBSPENDINGEXPLAN;
var ISEXPLAN = false;
if (strEXPLAN != "") ISEXPLAN = true;
@ -12091,7 +12091,7 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
}
else
{
if (sMB.IndexOf(enumValue.ACCID) > -1)
if (string.IsNullOrEmpty(MBINCOMEEXPLAN)&& string.IsNullOrEmpty(MBSPENDINGEXPLAN) && sMB.IndexOf(enumValue.ACCID) > -1)
{
enumValue.EXPLAN = sEXPLAN;
}

2
DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceDAL.cs
Unescape Escape View File

@ -643,7 +643,7 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlInvoiceDAL
for (int j = 0; j < dsVWChFeeARExChange.Tables[0].Rows.Count; j++)
{
ORIGCURRENCY = dsVWChFeeARExChange.Tables[0].Rows[j]["ORIGCURRENCY"].ToString().Trim();
ORIGEXCHANGE = Decimal.Parse(dsVWChFeeARExChange.Tables[0].Rows[i]["EXCHANGERATE"].ToString().Trim());
ORIGEXCHANGE = Decimal.Parse(dsVWChFeeARExChange.Tables[0].Rows[j]["EXCHANGERATE"].ToString().Trim());
}
}

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

@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

Write Preview
Loading…
Cancel
Save