From c87ea81736b138f3969ab58850830ede2f060212 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期四, 05 六月 2025 14:30:17 +0800
Subject: [PATCH] 1
---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user | 4
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx/native/libSkiaSharp.dylib | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/web.config | 12 ++++
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 48 ++++++++--------
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssetEndpoints.props | 20 +++---
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libe_sqlite3.dylib | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user | 2
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 8 +-
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml | 15 +++++
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/WIDESEAWCS_Server.csproj.EntityFrameworkCore.targets | 28 +++++++++
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libe_sqlite3.dylib | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/favicon.ico | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/logo.jpg.jpg | 0
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 30 +++++-----
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib | 0
19 files changed, 111 insertions(+), 56 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 0000000..19f43e1
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,15 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
+<Project>
+ <PropertyGroup>
+ <DeleteExistingFiles>false</DeleteExistingFiles>
+ <ExcludeApp_Data>false</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 0cd948d..71b44de 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>E:\GIT\鐧炬鍐犲畤\BaiBuLiKu\3F\Code Management\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl>
- <History>True|2025-03-16T08:33:53.8651724Z;</History>
+ <_PublishTargetUrl>E:\GET\BaiBuSanLouNew\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl>
+ <History>True|2025-06-05T06:22:11.1558952Z||;True|2025-06-05T14:21:15.0801810+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user
index 2d1c8e5..7687d3c 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\newbaibu3F\BaiBuSanLouNew\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\GET\BaiBuSanLouNew\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a
new file mode 100644
index 0000000..c8e7c11
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib
new file mode 100644
index 0000000..e6612c5
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib
new file mode 100644
index 0000000..3ad1142
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib
new file mode 100644
index 0000000..974ae77
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libe_sqlite3.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libe_sqlite3.dylib
new file mode 100644
index 0000000..21a8f42
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libe_sqlite3.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib
new file mode 100644
index 0000000..96ba9bf
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libe_sqlite3.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libe_sqlite3.dylib
new file mode 100644
index 0000000..ffaf82f
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx-x64/native/libe_sqlite3.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx/native/libSkiaSharp.dylib b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx/native/libSkiaSharp.dylib
new file mode 100644
index 0000000..996a7b9
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/runtimes/osx/native/libSkiaSharp.dylib
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/web.config b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/web.config
new file mode 100644
index 0000000..4b6a553
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/web.config
@@ -0,0 +1,12 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <location path="." inheritInChildApplications="false">
+ <system.webServer>
+ <handlers>
+ <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+ </handlers>
+ <aspNetCore processPath="dotnet" arguments=".\WIDESEAWCS_Server.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
+ </system.webServer>
+ </location>
+</configuration>
+<!--ProjectGuid: 487FA45B-EA1A-4ACA-BB5B-0F6708F462C0-->
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/favicon.ico b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/favicon.ico
new file mode 100644
index 0000000..a3a7999
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/favicon.ico
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/logo.jpg.jpg b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/logo.jpg.jpg
new file mode 100644
index 0000000..d479f96
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/wwwroot/logo.jpg.jpg
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssetEndpoints.props b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssetEndpoints.props
index 2f44976..c4a5d34 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssetEndpoints.props
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssetEndpoints.props
@@ -4,61 +4,61 @@
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\css\style.css'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"integrity","Value":"sha256-ojYgJoVTfogYjwSWz2okx/GiSYK4uY5\u002BxR/CpMHP7aM="}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"no-cache"},{"Name":"Content-Length","Value":"2207"},{"Name":"Content-Type","Value":"text/css"},{"Name":"ETag","Value":"\u0022ojYgJoVTfogYjwSWz2okx/GiSYK4uY5\u002BxR/CpMHP7aM=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"no-cache"},{"Name":"Content-Length","Value":"2207"},{"Name":"Content-Type","Value":"text/css"},{"Name":"ETag","Value":"\u0022ojYgJoVTfogYjwSWz2okx/GiSYK4uY5\u002BxR/CpMHP7aM=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/css/style.q675ftcnvf.css">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\css\style.css'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"fingerprint","Value":"q675ftcnvf"},{"Name":"integrity","Value":"sha256-ojYgJoVTfogYjwSWz2okx/GiSYK4uY5\u002BxR/CpMHP7aM="},{"Name":"label","Value":"_content/WIDESEAWCS_Server/css/style.css"}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"2207"},{"Name":"Content-Type","Value":"text/css"},{"Name":"ETag","Value":"\u0022ojYgJoVTfogYjwSWz2okx/GiSYK4uY5\u002BxR/CpMHP7aM=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"2207"},{"Name":"Content-Type","Value":"text/css"},{"Name":"ETag","Value":"\u0022ojYgJoVTfogYjwSWz2okx/GiSYK4uY5\u002BxR/CpMHP7aM=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/favicon.90yqlj465b.ico">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\favicon.ico'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"fingerprint","Value":"90yqlj465b"},{"Name":"integrity","Value":"sha256-qU\u002BKhVPK6oQw3UyjzAHU4xjRmCj3TLZUU/\u002B39dni9E0="},{"Name":"label","Value":"_content/WIDESEAWCS_Server/favicon.ico"}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"32038"},{"Name":"Content-Type","Value":"image/x-icon"},{"Name":"ETag","Value":"\u0022qU\u002BKhVPK6oQw3UyjzAHU4xjRmCj3TLZUU/\u002B39dni9E0=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"32038"},{"Name":"Content-Type","Value":"image/x-icon"},{"Name":"ETag","Value":"\u0022qU\u002BKhVPK6oQw3UyjzAHU4xjRmCj3TLZUU/\u002B39dni9E0=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/favicon.ico">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\favicon.ico'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"integrity","Value":"sha256-qU\u002BKhVPK6oQw3UyjzAHU4xjRmCj3TLZUU/\u002B39dni9E0="}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=3600, must-revalidate"},{"Name":"Content-Length","Value":"32038"},{"Name":"Content-Type","Value":"image/x-icon"},{"Name":"ETag","Value":"\u0022qU\u002BKhVPK6oQw3UyjzAHU4xjRmCj3TLZUU/\u002B39dni9E0=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=3600, must-revalidate"},{"Name":"Content-Length","Value":"32038"},{"Name":"Content-Type","Value":"image/x-icon"},{"Name":"ETag","Value":"\u0022qU\u002BKhVPK6oQw3UyjzAHU4xjRmCj3TLZUU/\u002B39dni9E0=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/js/anime.min.4gydw0gnuq.js">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\js\anime.min.js'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"fingerprint","Value":"4gydw0gnuq"},{"Name":"integrity","Value":"sha256-pM9M2VDqcpZMOGfXDtWCHf6k73o7ILXz3NE30H6vp9o="},{"Name":"label","Value":"_content/WIDESEAWCS_Server/js/anime.min.js"}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"14452"},{"Name":"Content-Type","Value":"text/javascript"},{"Name":"ETag","Value":"\u0022pM9M2VDqcpZMOGfXDtWCHf6k73o7ILXz3NE30H6vp9o=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"14452"},{"Name":"Content-Type","Value":"text/javascript"},{"Name":"ETag","Value":"\u0022pM9M2VDqcpZMOGfXDtWCHf6k73o7ILXz3NE30H6vp9o=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/js/anime.min.js">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\js\anime.min.js'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"integrity","Value":"sha256-pM9M2VDqcpZMOGfXDtWCHf6k73o7ILXz3NE30H6vp9o="}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"no-cache"},{"Name":"Content-Length","Value":"14452"},{"Name":"Content-Type","Value":"text/javascript"},{"Name":"ETag","Value":"\u0022pM9M2VDqcpZMOGfXDtWCHf6k73o7ILXz3NE30H6vp9o=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"no-cache"},{"Name":"Content-Length","Value":"14452"},{"Name":"Content-Type","Value":"text/javascript"},{"Name":"ETag","Value":"\u0022pM9M2VDqcpZMOGfXDtWCHf6k73o7ILXz3NE30H6vp9o=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/logo.jpg.jpg">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\logo.jpg.jpg'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"integrity","Value":"sha256-WVXTFWYiOzXViKykiIhVGzCir\u002BFgkDqs0FP9p\u002BXTQNs="}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=3600, must-revalidate"},{"Name":"Content-Length","Value":"24181"},{"Name":"Content-Type","Value":"image/jpeg"},{"Name":"ETag","Value":"\u0022WVXTFWYiOzXViKykiIhVGzCir\u002BFgkDqs0FP9p\u002BXTQNs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=3600, must-revalidate"},{"Name":"Content-Length","Value":"24181"},{"Name":"Content-Type","Value":"image/jpeg"},{"Name":"ETag","Value":"\u0022WVXTFWYiOzXViKykiIhVGzCir\u002BFgkDqs0FP9p\u002BXTQNs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/logo.jpg.vy0bt5i1fn.jpg">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\logo.jpg.jpg'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"fingerprint","Value":"vy0bt5i1fn"},{"Name":"integrity","Value":"sha256-WVXTFWYiOzXViKykiIhVGzCir\u002BFgkDqs0FP9p\u002BXTQNs="},{"Name":"label","Value":"_content/WIDESEAWCS_Server/logo.jpg.jpg"}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"24181"},{"Name":"Content-Type","Value":"image/jpeg"},{"Name":"ETag","Value":"\u0022WVXTFWYiOzXViKykiIhVGzCir\u002BFgkDqs0FP9p\u002BXTQNs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"24181"},{"Name":"Content-Type","Value":"image/jpeg"},{"Name":"ETag","Value":"\u0022WVXTFWYiOzXViKykiIhVGzCir\u002BFgkDqs0FP9p\u002BXTQNs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/swg-login.html">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\swg-login.html'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"integrity","Value":"sha256-HydoZTPS7iz465rEIvr3Z3I\u002BNW1Vm9nL1C740TE/kFs="}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"no-cache"},{"Name":"Content-Length","Value":"5100"},{"Name":"Content-Type","Value":"text/html"},{"Name":"ETag","Value":"\u0022HydoZTPS7iz465rEIvr3Z3I\u002BNW1Vm9nL1C740TE/kFs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"no-cache"},{"Name":"Content-Length","Value":"5100"},{"Name":"Content-Type","Value":"text/html"},{"Name":"ETag","Value":"\u0022HydoZTPS7iz465rEIvr3Z3I\u002BNW1Vm9nL1C740TE/kFs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
<StaticWebAssetEndpoint Include="_content/WIDESEAWCS_Server/swg-login.lj2ouuyezj.html">
<AssetFile>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\staticwebassets\swg-login.html'))</AssetFile>
<Selectors><![CDATA[[]]]></Selectors>
<EndpointProperties><![CDATA[[{"Name":"fingerprint","Value":"lj2ouuyezj"},{"Name":"integrity","Value":"sha256-HydoZTPS7iz465rEIvr3Z3I\u002BNW1Vm9nL1C740TE/kFs="},{"Name":"label","Value":"_content/WIDESEAWCS_Server/swg-login.html"}]]]></EndpointProperties>
- <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"5100"},{"Name":"Content-Type","Value":"text/html"},{"Name":"ETag","Value":"\u0022HydoZTPS7iz465rEIvr3Z3I\u002BNW1Vm9nL1C740TE/kFs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 03 Jun 2025 07:55:40 GMT"}]]]></ResponseHeaders>
+ <ResponseHeaders><![CDATA[[{"Name":"Accept-Ranges","Value":"bytes"},{"Name":"Cache-Control","Value":"max-age=31536000, immutable"},{"Name":"Content-Length","Value":"5100"},{"Name":"Content-Type","Value":"text/html"},{"Name":"ETag","Value":"\u0022HydoZTPS7iz465rEIvr3Z3I\u002BNW1Vm9nL1C740TE/kFs=\u0022"},{"Name":"Last-Modified","Value":"Tue, 25 Mar 2025 01:57:55 GMT"}]]]></ResponseHeaders>
</StaticWebAssetEndpoint>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/WIDESEAWCS_Server.csproj.EntityFrameworkCore.targets b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/WIDESEAWCS_Server.csproj.EntityFrameworkCore.targets
new file mode 100644
index 0000000..7d6485d
--- /dev/null
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/WIDESEAWCS_Server.csproj.EntityFrameworkCore.targets
@@ -0,0 +1,28 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Target Name="GetEFProjectMetadata">
+ <MSBuild Condition=" '$(TargetFramework)' == '' "
+ Projects="$(MSBuildProjectFile)"
+ Targets="GetEFProjectMetadata"
+ Properties="TargetFramework=$(TargetFrameworks.Split(';')[0]);EFProjectMetadataFile=$(EFProjectMetadataFile)" />
+ <ItemGroup Condition=" '$(TargetFramework)' != '' ">
+ <EFProjectMetadata Include="AssemblyName: $(AssemblyName)" />
+ <EFProjectMetadata Include="Language: $(Language)" />
+ <EFProjectMetadata Include="OutputPath: $(OutputPath)" />
+ <EFProjectMetadata Include="Platform: $(Platform)" />
+ <EFProjectMetadata Include="PlatformTarget: $(PlatformTarget)" />
+ <EFProjectMetadata Include="ProjectAssetsFile: $(ProjectAssetsFile)" />
+ <EFProjectMetadata Include="ProjectDir: $(ProjectDir)" />
+ <EFProjectMetadata Include="RootNamespace: $(RootNamespace)" />
+ <EFProjectMetadata Include="RuntimeFrameworkVersion: $(RuntimeFrameworkVersion)" />
+ <EFProjectMetadata Include="TargetFileName: $(TargetFileName)" />
+ <EFProjectMetadata Include="TargetFrameworkMoniker: $(TargetFrameworkMoniker)" />
+ <EFProjectMetadata Include="Nullable: $(Nullable)" />
+ <EFProjectMetadata Include="TargetFramework: $(TargetFramework)" />
+ <EFProjectMetadata Include="TargetPlatformIdentifier: $(TargetPlatformIdentifier)" />
+ </ItemGroup>
+ <WriteLinesToFile Condition=" '$(TargetFramework)' != '' "
+ File="$(EFProjectMetadataFile)"
+ Lines="@(EFProjectMetadata)" />
+ </Target>
+</Project>
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index f25346f..17cd702 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -331,24 +331,24 @@
{
// 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
var next = task.NextAddress;
- // 灏嗕换鍔℃槧灏勪负鍛戒护
- var taskCommand = MapTaskCommand(task, command);
- // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
- task.NextAddress = next;
- // 鍙戦�佸懡浠ゅ埌瀛愯澶�
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // 灏嗕换鍔℃槧灏勪负鍛戒护
+ var taskCommand = MapTaskCommand(task, command);
+ // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
+ task.NextAddress = next;
+ // 鍙戦�佸懡浠ゅ埌瀛愯澶�
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
- // 杈撳嚭璀﹀憡淇℃伅锛岃〃绀轰换鍔″凡鍒拌揪瀛愯澶囧苟璇锋眰鎵爜鍏ュ簱锛屼笅涓�鐩爣鍦板潃
- var logs = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
- ConsoleHelper.WriteWarningLine(logs);
+ // 杈撳嚭璀﹀憡淇℃伅锛岃〃绀轰换鍔″凡鍒拌揪瀛愯澶囧苟璇锋眰鎵爜鍏ュ簱锛屼笅涓�鐩爣鍦板潃
+ var logs = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
+ ConsoleHelper.WriteWarningLine(logs);
- await _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, logs);
+ await _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
+ WriteInfo(conveyorLine.DeviceName, logs);
- // 鍙戦�佷换鍔″畬鎴愰�氱煡
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- // 鏇存柊浠诲姟鐘舵�佷负涓嬩竴鐘舵��
- _taskService.UpdateTaskStatusToNext(task);
+ // 鍙戦�佷换鍔″畬鎴愰�氱煡
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // 鏇存柊浠诲姟鐘舵�佷负涓嬩竴鐘舵��
+ _taskService.UpdateTaskStatusToNext(task);
}
}
}
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index 6dddfda..0af8f2e 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -101,10 +101,10 @@
{
// 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶇被浼� -鏁板瓧 鐨勬ā寮忥紝骞舵浛鎹负绌哄瓧绗︿覆
task.NextAddress = Regex.Replace(task.NextAddress, @"-(\d+)", "");
- if (Convert.ToInt32(task.NextAddress) > 1999)
- {
- task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
- }
+ //if (Convert.ToInt32(task.NextAddress) > 2999)
+ //{
+ // task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
+ //}
var comm = _mapper.Map<ConveyorLineTaskCommand>(task);
comm.InteractiveSignal = command.InteractiveSignal;
return comm;
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 05a4a49..7cf111a 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -2155,32 +2155,32 @@
}
#region 鏇存柊搴撳瓨淇℃伅锛堟殏鏃朵笉闇�瑕侊級
- if (stock.IsFull)
- {
- // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
- var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+ //if (stock.IsFull)
+ //{
+ // // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
+ // var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
- // 鏌ヨ浠诲姟淇℃伅
- var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
+ // // 鏌ヨ浠诲姟淇℃伅
+ // var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
- if (stocks != null && stocks.Count > 0)
- {
- // 杩囨护鍑洪渶瑕佹洿鏂扮殑搴撳瓨淇℃伅
- var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
- foreach (var item in stocksToUpdate)
- {
- // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
- item.SpecialParameterDuration = stock.SpecialParameterDuration;
- item.ParameterInfos = stock.ParameterInfos;
- item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
- }
- if (stocksToUpdate.Count > 0)
- {
- // 寮傛鏇存柊搴撳瓨淇℃伅
- var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
- }
- }
- }
+ // if (stocks != null && stocks.Count > 0)
+ // {
+ // // 杩囨护鍑洪渶瑕佹洿鏂扮殑搴撳瓨淇℃伅
+ // var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
+ // foreach (var item in stocksToUpdate)
+ // {
+ // // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
+ // item.SpecialParameterDuration = stock.SpecialParameterDuration;
+ // item.ParameterInfos = stock.ParameterInfos;
+ // item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
+ // }
+ // if (stocksToUpdate.Count > 0)
+ // {
+ // // 寮傛鏇存柊搴撳瓨淇℃伅
+ // var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
+ // }
+ // }
+ //}
#endregion
// 娣诲姞鍘嗗彶浠诲姟
--
Gitblit v1.9.3