最新

huanghongfeng

3 天以前 1d8897348d578648421b024d0dc5ff3d626e05f9

最新

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d474d2fc-8705-44ed-9416-2a5d4a10218d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e4722492-2785-4853-a8e5-ba27c111bd71.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Release/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Release/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2025-06-06T01:46:56.2008561Z;True|2025-06-05T10:24:21.2252577+08:00;True|2025-06-05T10:13:02.8353633+08:00;False|2025-06-05T10:10:53.5813480+08:00;False|2025-06-05T10:09:56.6361882+08:00;False|2025-06-05T10:09:45.3577881+08:00;True|2025-06-04T16:01:30.2305542+08:00;True|2025-06-04T15:46:59.2311734+08:00;True|2025-06-04T15:42:36.6330137+08:00;True|2025-06-04T15:42:02.3261726+08:00;True|2025-06-04T15:20:40.1086790+08:00;True|2025-06-04T11:46:13.7119706+08:00;True|2025-06-04T09:06:21.3399904+08:00;True|2025-05-31T11:32:44.9026178+08:00;True|2025-05-31T11:26:13.0275896+08:00;True|2025-05-12T10:40:37.8197576+08:00;True|2025-04-17T19:07:27.5133822+08:00;True|2025-04-17T17:49:02.3914080+08:00;True|2025-04-17T17:40:48.2964354+08:00;True|2025-04-17T13:31:36.1856841+08:00;True|2025-04-05T15:46:20.0281187+08:00;True|2025-03-24T11:31:18.7154149+08:00;True|2025-03-10T22:53:24.5897272+08:00;True|2025-03-10T22:46:28.3712596+08:00;True|2025-02-18T11:12:12.2410836+08:00;True|2025-02-09T18:47:58.0052437+08:00;True|2025-02-09T18:44:24.2432838+08:00;True|2025-02-09T18:38:47.9116357+08:00;False|2025-02-09T18:38:25.5046157+08:00;False|2025-02-09T18:38:13.9772309+08:00;True|2025-02-05T13:52:12.6787236+08:00;True|2025-02-04T16:23:22.9410982+08:00;True|2024-12-24T23:34:05.8320633+08:00;True|2024-12-24T23:26:33.8235628+08:00;True|2024-12-24T23:21:37.1573145+08:00;True|2024-12-24T23:18:00.7494601+08:00;True|2024-12-24T23:14:47.2533828+08:00;True|2024-12-24T23:14:21.6534965+08:00;True|2024-12-24T23:04:47.3888307+08:00;True|2024-12-24T22:59:06.7543207+08:00;True|2024-12-24T22:55:22.7978944+08:00;True|2024-12-24T22:51:04.9454711+08:00;True|2024-12-24T22:42:40.3880585+08:00;True|2024-12-24T22:34:58.3885505+08:00;True|2024-12-24T22:11:08.1707363+08:00;True|2024-12-24T20:35:58.7418310+08:00;True|2024-12-11T16:11:12.1858626+08:00;True|2024-12-09T13:02:23.6771278+08:00;True|2024-12-08T19:44:59.3607897+08:00;True|2024-12-08T19:40:36.3774171+08:00;True|2024-12-08T19:23:29.7403370+08:00;True|2024-12-08T19:20:07.2145504+08:00;True|2024-12-07T15:49:46.5388885+08:00;True|2024-12-07T15:46:11.6626701+08:00;True|2024-12-07T15:42:02.2259028+08:00;True|2024-12-06T15:33:20.9138822+08:00;True|2024-12-05T14:23:06.4348342+08:00;True|2024-12-05T13:36:58.8542212+08:00;True|2024-12-05T10:07:56.3111164+08:00;True|2024-12-05T09:55:54.2652890+08:00;True|2024-12-04T15:56:34.9789719+08:00;True|2024-12-04T14:31:10.7799578+08:00;True|2024-12-02T16:23:40.6525322+08:00;True|2024-12-02T15:06:33.8398324+08:00;True|2024-12-02T09:55:44.1713285+08:00;True|2024-11-29T15:05:47.9497725+08:00;True|2024-11-28T11:00:49.8541290+08:00;True|2024-11-27T16:25:44.2279053+08:00;True|2024-11-27T16:23:10.3212041+08:00;True|2024-11-26T16:12:09.6441006+08:00;True|2024-11-25T15:56:05.5113682+08:00;True|2024-11-23T18:06:54.9268962+08:00;True|2024-11-23T15:51:50.1591773+08:00;True|2024-11-23T15:15:06.3720464+08:00;True|2024-11-23T09:48:55.7756397+08:00;True|2024-11-22T15:32:46.3942559+08:00;True|2024-11-22T15:02:47.9591615+08:00;True|2024-11-22T09:54:53.3849366+08:00;True|2024-11-21T09:21:57.2736424+08:00;True|2024-11-21T08:58:43.5819015+08:00;True|2024-11-21T08:55:10.4316119+08:00;True|2024-11-20T15:23:35.7301192+08:00;True|2024-11-20T15:09:01.0759113+08:00;True|2024-11-20T13:38:30.8480303+08:00;True|2024-11-20T11:51:52.1077333+08:00;True|2024-11-20T09:47:32.7369297+08:00;True|2024-11-20T09:23:04.3323615+08:00;True|2024-11-20T08:59:02.5867718+08:00;True|2024-11-19T16:59:32.6699681+08:00;True|2024-11-19T16:30:57.2361691+08:00;True|2024-11-18T13:44:52.7363955+08:00;True|2024-11-18T11:51:14.1304717+08:00;True|2024-11-18T09:54:17.2374656+08:00;True|2024-11-18T09:29:51.6325764+08:00;True|2024-11-16T11:58:14.5931276+08:00;True|2024-11-15T11:32:41.4603659+08:00;True|2024-11-15T10:59:45.9850927+08:00;True|2024-11-15T10:50:34.6323216+08:00;True|2024-11-15T09:19:20.2734979+08:00;True|2024-11-14T15:28:21.0515205+08:00;</History>
    <History>True|2025-06-13T05:12:18.5321171Z;True|2025-06-13T13:08:24.4516973+08:00;True|2025-06-06T09:46:56.2008561+08:00;True|2025-06-05T10:24:21.2252577+08:00;True|2025-06-05T10:13:02.8353633+08:00;False|2025-06-05T10:10:53.5813480+08:00;False|2025-06-05T10:09:56.6361882+08:00;False|2025-06-05T10:09:45.3577881+08:00;True|2025-06-04T16:01:30.2305542+08:00;True|2025-06-04T15:46:59.2311734+08:00;True|2025-06-04T15:42:36.6330137+08:00;True|2025-06-04T15:42:02.3261726+08:00;True|2025-06-04T15:20:40.1086790+08:00;True|2025-06-04T11:46:13.7119706+08:00;True|2025-06-04T09:06:21.3399904+08:00;True|2025-05-31T11:32:44.9026178+08:00;True|2025-05-31T11:26:13.0275896+08:00;True|2025-05-12T10:40:37.8197576+08:00;True|2025-04-17T19:07:27.5133822+08:00;True|2025-04-17T17:49:02.3914080+08:00;True|2025-04-17T17:40:48.2964354+08:00;True|2025-04-17T13:31:36.1856841+08:00;True|2025-04-05T15:46:20.0281187+08:00;True|2025-03-24T11:31:18.7154149+08:00;True|2025-03-10T22:53:24.5897272+08:00;True|2025-03-10T22:46:28.3712596+08:00;True|2025-02-18T11:12:12.2410836+08:00;True|2025-02-09T18:47:58.0052437+08:00;True|2025-02-09T18:44:24.2432838+08:00;True|2025-02-09T18:38:47.9116357+08:00;False|2025-02-09T18:38:25.5046157+08:00;False|2025-02-09T18:38:13.9772309+08:00;True|2025-02-05T13:52:12.6787236+08:00;True|2025-02-04T16:23:22.9410982+08:00;True|2024-12-24T23:34:05.8320633+08:00;True|2024-12-24T23:26:33.8235628+08:00;True|2024-12-24T23:21:37.1573145+08:00;True|2024-12-24T23:18:00.7494601+08:00;True|2024-12-24T23:14:47.2533828+08:00;True|2024-12-24T23:14:21.6534965+08:00;True|2024-12-24T23:04:47.3888307+08:00;True|2024-12-24T22:59:06.7543207+08:00;True|2024-12-24T22:55:22.7978944+08:00;True|2024-12-24T22:51:04.9454711+08:00;True|2024-12-24T22:42:40.3880585+08:00;True|2024-12-24T22:34:58.3885505+08:00;True|2024-12-24T22:11:08.1707363+08:00;True|2024-12-24T20:35:58.7418310+08:00;True|2024-12-11T16:11:12.1858626+08:00;True|2024-12-09T13:02:23.6771278+08:00;True|2024-12-08T19:44:59.3607897+08:00;True|2024-12-08T19:40:36.3774171+08:00;True|2024-12-08T19:23:29.7403370+08:00;True|2024-12-08T19:20:07.2145504+08:00;True|2024-12-07T15:49:46.5388885+08:00;True|2024-12-07T15:46:11.6626701+08:00;True|2024-12-07T15:42:02.2259028+08:00;True|2024-12-06T15:33:20.9138822+08:00;True|2024-12-05T14:23:06.4348342+08:00;True|2024-12-05T13:36:58.8542212+08:00;True|2024-12-05T10:07:56.3111164+08:00;True|2024-12-05T09:55:54.2652890+08:00;True|2024-12-04T15:56:34.9789719+08:00;True|2024-12-04T14:31:10.7799578+08:00;True|2024-12-02T16:23:40.6525322+08:00;True|2024-12-02T15:06:33.8398324+08:00;True|2024-12-02T09:55:44.1713285+08:00;True|2024-11-29T15:05:47.9497725+08:00;True|2024-11-28T11:00:49.8541290+08:00;True|2024-11-27T16:25:44.2279053+08:00;True|2024-11-27T16:23:10.3212041+08:00;True|2024-11-26T16:12:09.6441006+08:00;True|2024-11-25T15:56:05.5113682+08:00;True|2024-11-23T18:06:54.9268962+08:00;True|2024-11-23T15:51:50.1591773+08:00;True|2024-11-23T15:15:06.3720464+08:00;True|2024-11-23T09:48:55.7756397+08:00;True|2024-11-22T15:32:46.3942559+08:00;True|2024-11-22T15:02:47.9591615+08:00;True|2024-11-22T09:54:53.3849366+08:00;True|2024-11-21T09:21:57.2736424+08:00;True|2024-11-21T08:58:43.5819015+08:00;True|2024-11-21T08:55:10.4316119+08:00;True|2024-11-20T15:23:35.7301192+08:00;True|2024-11-20T15:09:01.0759113+08:00;True|2024-11-20T13:38:30.8480303+08:00;True|2024-11-20T11:51:52.1077333+08:00;True|2024-11-20T09:47:32.7369297+08:00;True|2024-11-20T09:23:04.3323615+08:00;True|2024-11-20T08:59:02.5867718+08:00;True|2024-11-19T16:59:32.6699681+08:00;True|2024-11-19T16:30:57.2361691+08:00;True|2024-11-18T13:44:52.7363955+08:00;True|2024-11-18T11:51:14.1304717+08:00;True|2024-11-18T09:54:17.2374656+08:00;True|2024-11-18T09:29:51.6325764+08:00;True|2024-11-16T11:58:14.5931276+08:00;True|2024-11-15T11:32:41.4603659+08:00;True|2024-11-15T10:59:45.9850927+08:00;True|2024-11-15T10:50:34.6323216+08:00;</History>
    <LastFailureDetails />
    <_PublishTargetUrl>F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl>
  </PropertyGroup>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/WIDESEAWCS_Server.deps.json

@@ -2180,7 +2180,7 @@
          "WIDESEAWCS_ITaskInfoService": "1.0.0"
        },
        "runtime": {
          "WIDESEAWCS_TaskInfoService.dll": {}
          "WIDESEAWCs_TaskInfoService.dll": {}
        }
      },
      "WIDESEAWCS_Tasks/1.0.0": {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/WIDESEAWCS_Server.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/WIDESEAWCS_Server.deps.json

@@ -2180,7 +2180,7 @@
          "WIDESEAWCS_ITaskInfoService": "1.0.0"
        },
        "runtime": {
          "WIDESEAWCS_TaskInfoService.dll": {}
          "WIDESEAWCs_TaskInfoService.dll": {}
        }
      },
      "WIDESEAWCS_Tasks/1.0.0": {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/WIDESEAWCS_Server.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/WIDESEAWCs_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0/publish/WIDESEAWCs_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/WIDESEAWCS_Server.deps.json

@@ -2180,7 +2180,7 @@
          "WIDESEAWCS_ITaskInfoService": "1.0.0"
        },
        "runtime": {
          "WIDESEAWCS_TaskInfoService.dll": {}
          "WIDESEAWCs_TaskInfoService.dll": {}
        }
      },
      "WIDESEAWCS_Tasks/1.0.0": {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/WIDESEAWCS_Server.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/WIDESEAWCs_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/WIDESEAWCs_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PublishOutputs.52afe10852.txt

@@ -158,10 +158,10 @@
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemRepository.dll
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemServices.dll
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_TaskInfoRepository.dll
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_TaskInfoService.dll
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCs_TaskInfoService.dll
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Tasks.dll
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemServices.pdb
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_TaskInfoService.pdb
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCs_TaskInfoService.pdb
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Tasks.pdb
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_BasicInfoRepository.pdb
F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_BasicInfoService.pdb

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/WIDESEAWCS_Server.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -168,7 +168,7 @@
                        task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                        task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                        BaseDal.AddData(task);
                        return content = WebResponseContent.Instance.Error();
                        return content;
                    }
                }


 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Release/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Release/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs

@@ -11,12 +11,12 @@
using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCs_TaskInfoService")]
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCs_TaskInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCs_TaskInfoService")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

// ç”± MSBuild WriteCodeFragment ç±»ç”Ÿæˆã€‚

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache

@@ -1 +1 @@
71b76655f6aae69f562c2ef4a854a0a0c95ae692
a9139fabd4084f38f9e277c0540025176f9e9dc5

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig

@@ -7,5 +7,5 @@
build_property.PlatformNeutralAssembly = 
build_property.EnforceExtendedAnalyzerRules = 
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WIDESEAWCs_TaskInfoService
build_property.ProjectDir = F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCs_TaskInfoService\
build_property.RootNamespace = WIDESEAWCS_TaskInfoService
build_property.ProjectDir = F:\外出项目\尖山\11-1\代码管理\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.assets.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Release/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Release/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Release/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1560157b-2454-4c4f-967d-8a6c0805acd4.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6b8852c7-e859-4314-b6df-0a4415eb3bd5.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/86dd81a8-d126-4a35-80d7-66c3b3b8b11b.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f85a5950-96f5-4e40-9738-05ac52c1fea7.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/obj/Release/net6.0/WIDESEA_BasicRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs

@@ -82,11 +82,13 @@
            return LocationDisableStatus(new int[] { key });
        }


        //传入巷道号2   è´§æž¶ç±»åž‹10
        public Dt_LocationInfo? GetLocation(string roadway,int Locationtype)
        {
            lock (_locker)
            {
                List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 10).ToList();//查询添加静态变量超过5分钟的货位
                List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 20).ToList();//查询添加静态变量超过20分钟的货位
                int count = removeItems.Count;
                for (int i = 0; i < count; i++)
                {
@@ -98,7 +100,7 @@
                List<Dt_LocationInfo> locationInfos = BaseDal.QueryData(x => x.RoadwayNo == roadway  && x.LocationType == Locationtype && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && !lockLocations.Contains(x.LocationCode));//查询巷道所有货位信息

                
                List<Dt_LocationInfo> emptyLocations = locationInfos.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()  && !lockLocations.Contains(x.LocationCode)).OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenByDescending(x => x.Depth).ThenBy(x => x.Row).ToList();//查询空货位信息并排除5分钟内分配的货位,根据层、列、深度、行排序
                List<Dt_LocationInfo> emptyLocations = locationInfos.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()  && !lockLocations.Contains(x.LocationCode)).OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenByDescending(x => x.Depth).ThenBy(x => x.Row).ToList();//查询空货位信息并排除20分钟内分配的货位,根据层、列、深度、行排序


                for (int i = 0; i < emptyLocations.Count; i++)
@@ -136,7 +138,7 @@
        {
            lock (_locker)
            {
                List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 10).ToList();//查询添加静态变量超过5分钟的货位
                List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 20).ToList();//查询添加静态变量超过5分钟的货位
                int count = removeItems.Count;
                for (int i = 0; i < count; i++)
                {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Release/net6.0/WIDESEA_BasicService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Release/net6.0/WIDESEA_BasicService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Release/net6.0/WIDESEA_BasicService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Release/net6.0/WIDESEA_BasicService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Release/net6.0/WIDESEA_BasicService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Debug/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Release/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Debug/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Release/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/obj/Release/net6.0/WIDESEA_IInboundRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Debug/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Release/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Debug/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Release/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/obj/Release/net6.0/WIDESEA_IOutboundService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Debug/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Release/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/obj/Release/net6.0/WIDESEA_IRecordService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/obj/Release/net6.0/WIDESEA_IStockRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/obj/Release/net6.0/WIDESEA_IStockService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/obj/Release/net6.0/WIDESEA_ISystemRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Debug/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Release/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/obj/Release/net6.0/WIDESEA_ITaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITask_HtyService.cs

@@ -23,4 +23,11 @@
    /// <returns>成功/失败</returns>
    bool InsertTask(Dt_Task_Hty task);
    WebResponseContent AddTaskHty(Dt_Task task);

    /// <summary>
    /// å…¥åº“查询目标货位，是否有入库或移库任务
    /// </summary>
    /// <param name="task"></param>
    /// <returns></returns>
    bool CrueeTaskHty(string TargetAddress);
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Release/net6.0/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Release/net6.0/WIDESEA_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Release/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Release/net6.0/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Release/net6.0/WIDESEA_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Release/net6.0/ref/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Release/net6.0/refint/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/obj/Release/net6.0/WIDESEA_InboundRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/obj/Release/net6.0/WIDESEA_InboundService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/obj/Release/net6.0/WIDESEA_OutboundRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Debug/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Release/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/obj/Release/net6.0/WIDESEA_RecordRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Debug/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Release/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/obj/Release/net6.0/WIDESEA_StockRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Release/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/obj/Release/net6.0/WIDESEA_SystemRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Debug/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Release/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/obj/Release/net6.0/WIDESEA_TaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs

@@ -261,30 +261,75 @@
                            Locationtype = 10;
                        }

                        if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.成品)
                        {
                            string[] targetCodes = dt_StockInfo.PalletCode.Split("*");
                            Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
                            if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
                            {
                                newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
                        

                                WriteLog.GetLog("库位获取日志，GetLocation").Write($"原材料入库获取库位，传入值,RoadwayNo:{newSourceAddress.RoadwayNo},类型：{Locationtype}，区间为：{dt_Inbound.Startingcolumn}与{dt_Inbound.Terminationcolumn}=============获取到的库位为：{newLocation.LocationCode}", $"库位获取日志，GetLocation2");

                        int maxRetries = 20;
                        int retryCount = 0;
                        bool needRetry;

                        do
                        {
                            needRetry = false;  // é»˜è®¤ä¸éœ€è¦é‡è¯•
                            retryCount++;


                            if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.成品)
                            {
                                string[] targetCodes = dt_StockInfo.PalletCode.Split("*");
                                Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodes[0]);
                                if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
                                {
                                    newLocation = _basicService.LocationInfoService.GetLocation2(newSourceAddress.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
                                }
                                else
                                {
                                    newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
                                }

                            }
                            else
                            {
                                newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
                                WriteLog.GetLog("库位获取日志，GetLocation").Write($"原材料入库获取库位，传入值,RoadwayNo:{newSourceAddress.RoadwayNo},类型：{Locationtype}，=============获取到的库位为：{newLocation.LocationCode}", $"库位获取日志，GetLocation,成品接口里面");
                            }
                            
                        }
                        else


                            if (newLocation == null)
                            {
                                return WebResponseContent.Instance.Error("无法获取库位");
                            }

                            // 2. æ£€æŸ¥åº“å­˜
                            if (_stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == newLocation.LocationCode) !=null)
                            {
                                needRetry = true;
                                continue;  // ç›´æŽ¥è¿›å…¥ä¸‹ä¸€æ¬¡å¾ªçŽ¯ï¼ˆé‡è¯•ï¼‰
                            }

                            // 3. æ£€æŸ¥ä»»åŠ¡
                            if (BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode) != null)
                            {
                                needRetry = true;
                                continue;
                            }

                            // 4. æ£€æŸ¥åŽ†å²ä»»åŠ¡
                            if (_taskHtyService.CrueeTaskHty(newLocation.LocationCode))
                            {
                                needRetry = true;
                                continue;
                            }

                        } while (needRetry && retryCount < maxRetries);

                        // æ£€æŸ¥æ˜¯å¦è¶…过最大重试次数
                        if (retryCount >= maxRetries)
                        {
                            newLocation = _basicService.LocationInfoService.GetLocation(newSourceAddress.RoadwayNo, Locationtype);
                            WriteLog.GetLog("库位获取日志，GetLocation").Write($"原材料入库获取库位，传入值,RoadwayNo:{newSourceAddress.RoadwayNo},类型：{Locationtype}，=============获取到的库位为：{newLocation.LocationCode}", $"库位获取日志，GetLocation");
                            return WebResponseContent.Instance.Error($"无法找到可用库位（已尝试 {retryCount} æ¬¡ï¼‰");
                        }

                        


                        //string[] Pallet = PalletCode.Split("-");
                        if (newLocation != null && newSourceAddress != null)
                        {
@@ -311,8 +356,13 @@
                            {
                                newLocation.LocationStatus = newSourceAddress.LocationType == (int)LocationTypeEnum.EmptyOut ? LocationStatusEnum.PalletLock.ObjToInt() : LocationStatusEnum.Lock.ObjToInt();
                            }
                            BaseDal.AddData(dt_Task);
                            else
                            {
                                return content = WebResponseContent.Instance.Error($"该库位{newSourceAddress.LocationCode}的货位状态异常，不可选");
                            }
                            _basicService.LocationInfoService.UpdateData(newLocation);
                            BaseDal.AddData(dt_Task);
                           

                            _unitOfWorkManage.CommitTran();

@@ -335,6 +385,7 @@
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return content = WebResponseContent.Instance.Error($"生成入库任务出错，出错信息:{ex.Message}");
                throw;
            }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -456,6 +456,17 @@
                                }


                                //目标货位查找库位是否有货
                                Dt_StockInfo dt_StockCurren = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == newLocation.LocationCode);
                                if (dt_StockCurren != null) return content = WebResponseContent.Instance.Error($"入库失败，托盘条码：{dt_StockInfo.PalletCode}，查找出的货位信息对应已有库存");

                                Dt_Task taskcurren = BaseDal.QueryFirst(x => x.TargetAddress == newLocation.LocationCode);
                                if (taskcurren != null) return content = WebResponseContent.Instance.Error($"入库失败，托盘条码：{dt_StockInfo.PalletCode}，查找出的货位信息已有入库任务");

                                bool crutaskthy = _taskHtyService.CrueeTaskHty(newLocation.LocationCode);
                                if (crutaskthy) return content = WebResponseContent.Instance.Error($"入库失败，托盘条码：{dt_StockInfo.PalletCode}，查找出的货位在任务历史信息中，有入库或移库信息");


                                if (newLocation != null)
                                {
                                    Dt_Task dt_Task = new()

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs

@@ -84,6 +84,16 @@
        return content;
    }

    public bool CrueeTaskHty(string TargetAddress)
    {
        Dt_Task_Hty task_Hty = BaseDal.QueryData(x => x.TargetAddress == TargetAddress).OrderByDescending(x => x.CreateDate).FirstOrDefault(); 
        if (task_Hty == null) return false;

        if(task_Hty.TaskType== TaskTypeEnum.Inbound.ObjToInt() || task_Hty.TaskType == TaskTypeEnum.Relocation.ObjToInt() || task_Hty.TaskType == TaskTypeEnum.PalletInbound.ObjToInt()) return true;

        return false;
    }

    //导出
    public override WebResponseContent Export(PageDataOptions options)
    {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Release/net6.0/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Release/net6.0/WIDESEA_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Release/net6.0/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Release/net6.0/WIDESEA_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Release/net6.0/WIDESEA_TaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Release/net6.0/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Release/net6.0/WIDESEA_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Release/net6.0/ref/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Release/net6.0/refint/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>F:\外出项目\尖山\11-1\代码管理\WMS\WIDESEA_WMSServer\WIDESEA_WMSServer\bin\Release\net6.0\publish\</_PublishTargetUrl>
    <History>True|2025-06-06T06:21:19.4780591Z;True|2025-06-06T08:29:38.8208945+08:00;True|2025-05-26T12:40:39.5908811+08:00;True|2025-05-22T15:40:06.9221100+08:00;True|2025-04-16T16:18:23.2501747+08:00;True|2025-03-15T12:21:53.8128491+08:00;True|2025-03-10T22:47:39.5569926+08:00;True|2025-02-10T12:37:27.2600657+08:00;True|2025-02-09T18:49:25.0496604+08:00;True|2025-02-07T09:37:40.3841146+08:00;True|2025-02-07T09:25:27.6774626+08:00;True|2025-02-05T17:06:56.1986613+08:00;True|2025-02-05T14:04:40.2095761+08:00;True|2025-02-05T11:11:51.8317423+08:00;True|2024-12-12T09:53:21.3519854+08:00;True|2024-12-11T16:44:05.8760305+08:00;True|2024-12-11T16:04:37.1979284+08:00;True|2024-12-09T14:08:58.2422281+08:00;True|2024-12-09T11:02:58.8555486+08:00;True|2024-12-09T10:52:48.1180415+08:00;True|2024-12-08T10:54:54.4909492+08:00;True|2024-12-08T10:47:28.4255763+08:00;True|2024-12-08T10:38:04.0058416+08:00;False|2024-12-08T10:37:24.0831533+08:00;True|2024-12-07T13:08:24.3740575+08:00;True|2024-12-07T12:21:44.8536450+08:00;True|2024-12-06T14:40:33.5437632+08:00;True|2024-12-06T12:58:11.3974988+08:00;True|2024-12-05T14:38:07.3513500+08:00;True|2024-12-05T10:47:43.1473101+08:00;True|2024-12-04T13:49:16.1276759+08:00;True|2024-12-04T10:06:17.5023383+08:00;True|2024-12-04T10:01:12.9891600+08:00;True|2024-12-03T16:52:41.7445725+08:00;True|2024-12-02T15:44:38.0506062+08:00;True|2024-12-02T15:22:09.3721298+08:00;True|2024-12-02T14:37:05.5318110+08:00;True|2024-12-02T11:40:39.8496952+08:00;True|2024-12-02T09:46:57.6060134+08:00;True|2024-11-30T10:44:16.7087028+08:00;True|2024-11-29T08:55:42.7723759+08:00;True|2024-11-27T15:45:28.2642685+08:00;True|2024-11-27T14:19:17.4496491+08:00;True|2024-11-26T15:11:25.4425171+08:00;True|2024-11-26T15:05:29.5184542+08:00;True|2024-11-26T14:00:09.5747278+08:00;True|2024-11-26T11:32:41.3925108+08:00;True|2024-11-25T11:51:55.7699046+08:00;True|2024-11-25T11:50:58.5567879+08:00;True|2024-11-23T17:57:57.6978230+08:00;True|2024-11-23T17:07:07.2699250+08:00;True|2024-11-23T16:53:48.5117380+08:00;True|2024-11-22T09:37:10.9616679+08:00;True|2024-11-20T17:06:17.7667129+08:00;True|2024-11-20T11:50:16.9071019+08:00;True|2024-11-20T11:49:57.5076449+08:00;True|2024-11-20T10:24:18.0981394+08:00;True|2024-11-19T17:20:03.0647106+08:00;True|2024-11-19T14:44:41.9256919+08:00;True|2024-11-19T12:16:25.9509077+08:00;True|2024-11-18T13:34:44.3658491+08:00;True|2024-11-18T08:50:42.7833216+08:00;True|2024-11-16T12:38:04.0732651+08:00;True|2024-11-16T11:58:35.8938457+08:00;True|2024-11-16T11:43:17.9228655+08:00;True|2024-11-16T11:18:12.6670096+08:00;True|2024-11-14T15:21:16.1012761+08:00;True|2024-11-14T15:08:52.0094800+08:00;True|2024-11-14T14:40:35.7689770+08:00;True|2024-11-14T09:45:39.2550446+08:00;True|2024-11-14T09:41:03.5831327+08:00;True|2024-11-14T09:31:53.0695293+08:00;True|2024-11-14T08:49:37.6482501+08:00;False|2024-11-14T08:49:13.2966884+08:00;True|2024-11-13T17:32:45.4958029+08:00;True|2024-11-13T17:01:46.7546428+08:00;True|2024-11-13T16:55:11.2746935+08:00;True|2024-11-13T16:05:45.6847218+08:00;True|2024-11-13T14:26:49.5321983+08:00;True|2024-11-13T12:21:45.2577000+08:00;True|2024-11-13T11:56:46.9979908+08:00;True|2024-11-13T11:42:35.7543618+08:00;True|2024-11-13T08:52:28.4195238+08:00;True|2024-11-12T14:41:49.5622837+08:00;</History>
    <History>True|2025-06-18T08:28:30.7702150Z;True|2025-06-13T13:15:56.5814787+08:00;True|2025-06-13T13:11:52.5715488+08:00;True|2025-06-06T14:21:19.4780591+08:00;True|2025-06-06T08:29:38.8208945+08:00;True|2025-05-26T12:40:39.5908811+08:00;True|2025-05-22T15:40:06.9221100+08:00;True|2025-04-16T16:18:23.2501747+08:00;True|2025-03-15T12:21:53.8128491+08:00;True|2025-03-10T22:47:39.5569926+08:00;True|2025-02-10T12:37:27.2600657+08:00;True|2025-02-09T18:49:25.0496604+08:00;True|2025-02-07T09:37:40.3841146+08:00;True|2025-02-07T09:25:27.6774626+08:00;True|2025-02-05T17:06:56.1986613+08:00;True|2025-02-05T14:04:40.2095761+08:00;True|2025-02-05T11:11:51.8317423+08:00;True|2024-12-12T09:53:21.3519854+08:00;True|2024-12-11T16:44:05.8760305+08:00;True|2024-12-11T16:04:37.1979284+08:00;True|2024-12-09T14:08:58.2422281+08:00;True|2024-12-09T11:02:58.8555486+08:00;True|2024-12-09T10:52:48.1180415+08:00;True|2024-12-08T10:54:54.4909492+08:00;True|2024-12-08T10:47:28.4255763+08:00;True|2024-12-08T10:38:04.0058416+08:00;False|2024-12-08T10:37:24.0831533+08:00;True|2024-12-07T13:08:24.3740575+08:00;True|2024-12-07T12:21:44.8536450+08:00;True|2024-12-06T14:40:33.5437632+08:00;True|2024-12-06T12:58:11.3974988+08:00;True|2024-12-05T14:38:07.3513500+08:00;True|2024-12-05T10:47:43.1473101+08:00;True|2024-12-04T13:49:16.1276759+08:00;True|2024-12-04T10:06:17.5023383+08:00;True|2024-12-04T10:01:12.9891600+08:00;True|2024-12-03T16:52:41.7445725+08:00;True|2024-12-02T15:44:38.0506062+08:00;True|2024-12-02T15:22:09.3721298+08:00;True|2024-12-02T14:37:05.5318110+08:00;True|2024-12-02T11:40:39.8496952+08:00;True|2024-12-02T09:46:57.6060134+08:00;True|2024-11-30T10:44:16.7087028+08:00;True|2024-11-29T08:55:42.7723759+08:00;True|2024-11-27T15:45:28.2642685+08:00;True|2024-11-27T14:19:17.4496491+08:00;True|2024-11-26T15:11:25.4425171+08:00;True|2024-11-26T15:05:29.5184542+08:00;True|2024-11-26T14:00:09.5747278+08:00;True|2024-11-26T11:32:41.3925108+08:00;True|2024-11-25T11:51:55.7699046+08:00;True|2024-11-25T11:50:58.5567879+08:00;True|2024-11-23T17:57:57.6978230+08:00;True|2024-11-23T17:07:07.2699250+08:00;True|2024-11-23T16:53:48.5117380+08:00;True|2024-11-22T09:37:10.9616679+08:00;True|2024-11-20T17:06:17.7667129+08:00;True|2024-11-20T11:50:16.9071019+08:00;True|2024-11-20T11:49:57.5076449+08:00;True|2024-11-20T10:24:18.0981394+08:00;True|2024-11-19T17:20:03.0647106+08:00;True|2024-11-19T14:44:41.9256919+08:00;True|2024-11-19T12:16:25.9509077+08:00;True|2024-11-18T13:34:44.3658491+08:00;True|2024-11-18T08:50:42.7833216+08:00;True|2024-11-16T12:38:04.0732651+08:00;True|2024-11-16T11:58:35.8938457+08:00;True|2024-11-16T11:43:17.9228655+08:00;True|2024-11-16T11:18:12.6670096+08:00;True|2024-11-14T15:21:16.1012761+08:00;True|2024-11-14T15:08:52.0094800+08:00;True|2024-11-14T14:40:35.7689770+08:00;True|2024-11-14T09:45:39.2550446+08:00;True|2024-11-14T09:41:03.5831327+08:00;True|2024-11-14T09:31:53.0695293+08:00;True|2024-11-14T08:49:37.6482501+08:00;False|2024-11-14T08:49:13.2966884+08:00;True|2024-11-13T17:32:45.4958029+08:00;True|2024-11-13T17:01:46.7546428+08:00;True|2024-11-13T16:55:11.2746935+08:00;True|2024-11-13T16:05:45.6847218+08:00;True|2024-11-13T14:26:49.5321983+08:00;True|2024-11-13T12:21:45.2577000+08:00;True|2024-11-13T11:56:46.9979908+08:00;True|2024-11-13T11:42:35.7543618+08:00;True|2024-11-13T08:52:28.4195238+08:00;True|2024-11-12T14:41:49.5622837+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_BasicService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_BasicService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_BasicService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_BasicService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_BasicService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_BasicService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.pdb

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.dll

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.pdb

Binary files differ