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

放单 20231018

Browse Source
临时发布20240103
dengyu 1 year ago
parent 014f41013a
commit 3bc3590ef0
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -185,3 +185,4 @@ DSWeb/ocr_temp_files/*
/OfficeHelper/obj/Release/OfficeHelper.csproj.AssemblyReference.cache
/WebSqlHelper/obj/Debug/WebSqlHelper.csproj.AssemblyReference.cache
/WebSqlHelper/obj/Release/WebSqlHelper.csproj.AssemblyReference.cache
/DSWeb/bin/DSWeb.rar

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>
</PropertyGroup>
<ProjectExtensions>

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>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

2
DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
Unescape Escape View File

@ -4479,7 +4479,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
var 本票已扣 = 本票是否被扣货(head);
if (本票已扣.Success)
if (本票已扣.Success && (bool)本票已扣.Data==true)
{
var loglist = 提单动作日志(head);

2
DSWeb/Areas/MvcShipping/Models/MsOp_BLISSUE/MsOp_BLISSUE.cs
Unescape Escape View File

@ -957,7 +957,7 @@ namespace DSWeb.MvcShipping.Models.MsOp_BLISSUE
public const string 放单通知 = "可放单";
public const string 提单签出 = "提单签出";
public const string 已放货 = "已放货";
public const string 解除扣单 = "解除扣单";
public const string 解除扣单 = "取消扣单";
/// <summary>
/// 是否可以撤销签入

8
DSWeb/Web.config
Unescape Escape View File

@ -90,14 +90,14 @@
<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 正式库 rainbow admin admin
<!-- 深圳彩虹捷运 正式库 rainbow admin admin -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456 -->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=1016;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=1016;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库0 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

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>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

Write Preview
Loading…
Cancel
Save