From c200233f68393549ce2fee57aaeb6f671d6c2d14 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 22 三月 2025 10:08:17 +0800
Subject: [PATCH] 更新 .gitignore 和重构 RequestInbound.cs
---
/dev/null | 0
.gitignore | 9 ++
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 201 +++++++++++++++++++++++++++++++++++++++-----------
3 files changed, 165 insertions(+), 45 deletions(-)
diff --git a/.gitignore b/.gitignore
index 97081fd..8c16369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54991,3 +54991,12 @@
*.v2
CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Release/net6.0/WIDESEAWCS_Common.GlobalUsings.g.cs
+/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/copilot-chat/bef6627e/sessions/2923046d-159a-498d-ad80-1f1082024059
+/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2
+/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json
+/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/fileList.bin
+/CodeManagement/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin
+/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2
+/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo
+/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json
+/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2 b/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2
deleted file mode 100644
index 996fedb..0000000
--- a/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2
+++ /dev/null
Binary files differ
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json b/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json
deleted file mode 100644
index 0a07adf..0000000
--- a/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\",
- "Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob_after\\commonconveyorline_afterjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob_after\\commonconveyorline_afterjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\partial\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\partial\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_tasks\\stackerstationjob\\commonstackerstationcranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\stackerstationjob\\commonstackerstationcranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_quartzjob\\service\\routerservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|solutionrelative:wideseawcs_quartzjob\\service\\routerservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\git\\baibusanlou\\codemanagement\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
- }
- ],
- "DocumentGroupContainers": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": 1,
- "Children": [
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "TaskService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\Partial\\TaskService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\Partial\\TaskService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\Partial\\TaskService.cs",
- "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\Partial\\TaskService.cs",
- "ViewState": "AgIAAMoAAAAAAAAAAAAcwNcAAAANAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:55:25.281Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "CommonConveyorLine_AfterJob.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob_After\\CommonConveyorLine_AfterJob.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob_After\\CommonConveyorLine_AfterJob.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob_After\\CommonConveyorLine_AfterJob.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob_After\\CommonConveyorLine_AfterJob.cs",
- "ViewState": "AgIAAIUAAAAAAAAAAAAswJIAAAB3AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:53:56.096Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "CommonStackerStationCraneJob.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerStationJob\\CommonStackerStationCraneJob.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerStationJob\\CommonStackerStationCraneJob.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerStationJob\\CommonStackerStationCraneJob.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\StackerStationJob\\CommonStackerStationCraneJob.cs",
- "ViewState": "AgIAACoAAAAAAAAAAAAcwEQAAABIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:50:55.485Z",
- "EditorCaption": ""
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{40ea2e6b-2121-4bb8-a43e-c83c04b51041}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "RouterService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\RouterService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_QuartzJob\\Service\\RouterService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\RouterService.cs",
- "RelativeToolTip": "WIDESEAWCS_QuartzJob\\Service\\RouterService.cs",
- "ViewState": "AgIAAFEAAAAAAAAAAAAcwGYAAAAvAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.714Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "TaskService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AQIAAPIAAAAAAAAAAAD4vwYBAACZAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:52.063Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "CommonStackerCraneJob.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
- "ViewState": "AQIAAFwAAAAAAAAAAAAAACsBAAAZAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:52.073Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "RequestInbound.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "ViewState": "AQIAADkAAAAAAAAAAAArwDwAAAAhAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:52.079Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "CommonConveyorLineJob.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "ViewState": "AQIAALMCAAAAAAAAAAAWwI8CAAApAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:52.086Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "appsettings.json",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
- "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
- "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
- "ViewState": "AQIAAAAAAAAAAAAAAADwvxQAAAA4AAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-03-19T01:44:52.094Z"
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/fileList.bin b/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/fileList.bin
deleted file mode 100644
index 4088056..0000000
--- a/CodeManagement/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/fileList.bin
+++ /dev/null
Binary files differ
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 ba5dfc1..2383341 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -1,5 +1,6 @@
-锘縰sing HslCommunication;
+锘�//using HslCommunication;
using Mapster;
+using Masuit.Tools;
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Newtonsoft.Json;
using System.Text.RegularExpressions;
@@ -282,8 +283,18 @@
private async Task RequestWmsTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, Dt_StationManager stationManager)
{
string isTrue = string.Empty;
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
+ if(result.SerialNos.Count == 0)
+ {
+ var Traycontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
+ if (Traycontent.Status)
+ {
+ ConsoleHelper.WriteSuccessLine("璇锋眰鍥炴祦闈欑疆");
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
+ }
List<string> strings = stationManager.Roadway.Split(",").ToList();
foreach (string item in strings)
@@ -504,61 +515,161 @@
}
}
}
- public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue ,string childDeviceCode)
+
+ /// <summary>
+ /// 鎵ц杈撻�佺嚎浠诲姟
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀵硅薄</param>
+ /// <param name="command">杈撻�佺嚎浠诲姟鍛戒护</param>
+ /// <param name="ProtocalDetailValue">鍗忚鏄庣粏鍊�</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ //public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue, string childDeviceCode)
+ //{
+ // var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
+ // if (task != null)
+ // {
+ // var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+ // var valueList = value.Split(',').ToList();
+ // if (valueList.Contains(task.SourceAddress))
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
+
+ // var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵1000}銆�";
+ // ConsoleHelper.WriteWarningLine(log);
+
+ // _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ // WriteInfo(conveyorLine.DeviceName, log);
+
+ // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // }
+ // else
+ // {
+ // if (task.Roadway.Contains("JZ"))
+ // {
+ // var outJZTask = _taskRepository.QueryData(x => x.Roadway== task.Roadway && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting || x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting || x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish);
+ // if (outJZTask.IsNullOrEmpty())
+ // {
+ // var next = task.NextAddress;
+ // var taskCommand = MapTaskCommand(task, command);
+ // task.NextAddress = next;
+
+ // var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
+ // ConsoleHelper.WriteWarningLine(log);
+
+ // _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ // WriteInfo(conveyorLine.DeviceName, log);
+
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // _taskService.UpdateTaskStatusToNext(task);
+ // }
+ // else
+ // {
+ // ConsoleHelper.WriteWarningLine("宸插瓨鍦ㄩ潤缃嚭搴撲换鍔�,闈欑疆鍏ュ簱浠诲姟鏃犳硶涓嬪彂绾夸綋");
+ // }
+ // }
+ // else
+ // {
+ // var next = task.NextAddress;
+ // var taskCommand = MapTaskCommand(task, command);
+ // task.NextAddress = next;
+ // var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
+ // ConsoleHelper.WriteWarningLine(log);
+ // _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ // WriteInfo(conveyorLine.DeviceName, log);
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // _taskService.UpdateTaskStatusToNext(task);
+ // }
+ // }
+ // }
+ //}
+
+ /// <summary>
+ /// 鎵ц杈撻�佺嚎浠诲姟
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀵硅薄</param>
+ /// <param name="command">杈撻�佺嚎浠诲姟鍛戒护</param>
+ /// <param name="ProtocalDetailValue">鍗忚鏄庣粏鍊�</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue, string childDeviceCode)
{
+ // 鏌ヨ浠诲姟淇℃伅
var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
- if (task != null)
+ if (task == null) return;
+
+ // 鑾峰彇閰嶇疆鍊煎苟杞崲涓哄垪琛�
+ var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+ var valueList = value.Split(',').ToList();
+
+ // 鏃ュ織妯℃澘
+ var logMessage = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵{0}}銆�";
+
+ // 鍒ゆ柇浠诲姟鐨勮捣濮嬪湴鍧�鏄惁鍦ㄩ厤缃垪琛ㄤ腑
+ if (valueList.Contains(task.SourceAddress))
{
- var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
- var valueList = value.Split(',').ToList();
- if (valueList.Contains(task.SourceAddress))
+ // 璁剧疆鐩爣鍦板潃涓� "1000"
+ conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
+ // 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, "1000");
+ }
+ else if (task.Roadway.Contains("JZ"))
+ {
+ // 鏌ヨ鏄惁瀛樺湪闈欑疆鍑哄簱浠诲姟
+ var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+ (x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting ||
+ x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting ||
+ x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish));
+
+ if (outJZTask.IsNullOrEmpty())
{
- conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
-
- var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵1000}銆�";
- ConsoleHelper.WriteWarningLine(log);
-
- _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, log);
-
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- }
- else if (task.TargetAddress == "1020-1")
- {
- var next = task.NextAddress;
+ // 鏄犲皠浠诲姟鍛戒护
var taskCommand = MapTaskCommand(task, command);
- task.NextAddress = next;
-
- var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
- ConsoleHelper.WriteWarningLine(log);
-
- _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, log);
-
+ // 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, taskCommand.TargetAddress.ToString());
+ // 鍙戦�佷换鍔″懡浠�
conveyorLine.SendCommand(taskCommand, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
- var taskHty = task.Adapt<Dt_Task_Hty>();
- _task_HtyRepository.AddData(taskHty);
- _taskService.DeleteData(task);
+ // 鏇存柊浠诲姟鐘舵��
+ _taskService.UpdateTaskStatusToNext(task);
}
else
{
- var next = task.NextAddress;
- var taskCommand = MapTaskCommand(task, command);
- task.NextAddress = next;
-
- var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
- ConsoleHelper.WriteWarningLine(log);
-
- _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, log);
-
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- _taskService.UpdateTaskStatusToNext(task);
+ ConsoleHelper.WriteWarningLine("宸插瓨鍦ㄩ潤缃嚭搴撲换鍔�,闈欑疆鍏ュ簱浠诲姟鏃犳硶涓嬪彂鑷崇嚎浣�");
}
}
+ else
+ {
+ // 鏄犲皠浠诲姟鍛戒护
+ var taskCommand = MapTaskCommand(task, command);
+ // 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, taskCommand.TargetAddress.ToString());
+ // 鍙戦�佷换鍔″懡浠�
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // 鏇存柊浠诲姟鐘舵��
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
+
+ /// <summary>
+ /// 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀵硅薄</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ /// <param name="ProtocalDetailValue">鍗忚鏄庣粏鍊�</param>
+ /// <param name="logMessage">鏃ュ織娑堟伅妯℃澘</param>
+ /// <param name="targetAddress">鐩爣鍦板潃</param>
+ private void LogAndSendFinish(CommonConveyorLine conveyorLine, string childDeviceCode, int ProtocalDetailValue, string logMessage, string targetAddress)
+ {
+ // 鏍煎紡鍖栨棩蹇楁秷鎭�
+ var log = string.Format(logMessage, targetAddress);
+ // 杈撳嚭璀﹀憡鏃ュ織
+ ConsoleHelper.WriteWarningLine(log);
+ // 璁板綍鏃ュ織
+ _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log, time = DateTime.Now.ToString("G"), color = "red" });
+ WriteInfo(conveyorLine.DeviceName, log);
+ // 鍙戦�佸畬鎴愪俊鍙�
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+
}
}
\ No newline at end of file
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin b/CodeManagement/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin
deleted file mode 100644
index ab515eb..0000000
--- a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin
+++ /dev/null
Binary files differ
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 b/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2
deleted file mode 100644
index 1910f7b..0000000
--- a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2
+++ /dev/null
Binary files differ
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo b/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo
deleted file mode 100644
index 1597202..0000000
--- a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo
+++ /dev/null
Binary files differ
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json b/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json
deleted file mode 100644
index 69973e3..0000000
--- a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json
+++ /dev/null
@@ -1,253 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\",
- "Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\partial\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{4BDE58B2-5B2E-480B-932F-D63C2A7D557C}|WIDESEA_StorageBasicServices\\WIDESEA_StorageBasicServices.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_storagebasicservices\\location\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{4BDE58B2-5B2E-480B-932F-D63C2A7D557C}|WIDESEA_StorageBasicServices\\WIDESEA_StorageBasicServices.csproj|solutionrelative:widesea_storagebasicservices\\location\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}|WIDESEA_Cache\\WIDESEA_Cache.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_cache\\const\\cacheconst.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}|WIDESEA_Cache\\WIDESEA_Cache.csproj|solutionrelative:widesea_cache\\const\\cacheconst.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\mom\\error\\momerrormsg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\mom\\error\\momerrormsg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_wmsserver\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\task\\dt_taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\integration\\aginginoroutcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\integration\\aginginoroutcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\dt_areainfocontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\dt_areainfocontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_model\\models\\basicmodel\\dtlocationinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basicmodel\\dtlocationinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\globalusing.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\globalusing.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_model\\models\\mom\\momerrormessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\mom\\momerrormessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|d:\\git\\baibusanlou\\codemanagement\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\mom\\cellstate\\cellstateservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\mom\\cellstate\\cellstateservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- }
- ],
- "DocumentGroupContainers": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": 4,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{40ea2e6b-2121-4bb8-a43e-c83c04b51041}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "LocationInfoService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Location\\LocationInfoService.cs",
- "RelativeDocumentMoniker": "WIDESEA_StorageBasicServices\\Location\\LocationInfoService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageBasicServices\\Location\\LocationInfoService.cs",
- "RelativeToolTip": "WIDESEA_StorageBasicServices\\Location\\LocationInfoService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAPkAAAAEAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.655Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "appsettings.json",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AQIAAAYAAAAAAAAAAAAAAAoAAAAJAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-03-19T01:44:51.912Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "Dt_TaskService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs",
- "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs",
- "RelativeToolTip": "WIDESEA_StorageTaskServices\\Task\\Partial\\Dt_TaskService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABgDAAAXAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.917Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "MoMErrorMsg.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\MOM\\Error\\MoMErrorMsg.cs",
- "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\MOM\\Error\\MoMErrorMsg.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\MOM\\Error\\MoMErrorMsg.cs",
- "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\MOM\\Error\\MoMErrorMsg.cs",
- "ViewState": "AQIAADkAAAAAAAAAAAAYwA0AAAA3AAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.923Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "CacheConst.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_Cache\\Const\\CacheConst.cs",
- "RelativeDocumentMoniker": "WIDESEA_Cache\\Const\\CacheConst.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_Cache\\Const\\CacheConst.cs",
- "RelativeToolTip": "WIDESEA_Cache\\Const\\CacheConst.cs",
- "ViewState": "AQIAACAAAAAAAAAAAAAIwAAAAAAAAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.928Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "TaskController.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskController.cs",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\TaskController.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\TaskController.cs",
- "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\TaskController.cs",
- "ViewState": "AQIAAIkAAAAAAAAAAAAnwJsAAAAvAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.936Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "AgingInOrOutController.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Integration\\AgingInOrOutController.cs",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Integration\\AgingInOrOutController.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Integration\\AgingInOrOutController.cs",
- "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Integration\\AgingInOrOutController.cs",
- "ViewState": "AQIAABMAAAAAAAAAAAAnwCMAAAApAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.936Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "Dt_TaskService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs",
- "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs",
- "RelativeToolTip": "WIDESEA_StorageTaskServices\\Task\\Dt_TaskService.cs",
- "ViewState": "AQIAACEBAAAAAAAAAAAiwKwFAAAiAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.936Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "Program.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Program.cs",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Program.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Program.cs",
- "RelativeToolTip": "WIDESEA_WMSServer\\Program.cs",
- "ViewState": "AQIAALYAAAAAAAAAAAArwMsAAAAEAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.946Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
- "Title": "Dt_AreaInfoController.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Dt_AreaInfoController.cs",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Dt_AreaInfoController.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Dt_AreaInfoController.cs",
- "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Dt_AreaInfoController.cs",
- "ViewState": "AQIAAAAAAAAAAAAAAADwvxQAAAAAAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.948Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "DtLocationInfo.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\BasicModel\\DtLocationInfo.cs",
- "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\BasicModel\\DtLocationInfo.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\BasicModel\\DtLocationInfo.cs",
- "RelativeToolTip": "WIDESEA_Model\\Models\\BasicModel\\DtLocationInfo.cs",
- "ViewState": "AQIAAAAAAAAAAAAAAADwvwAAAAAAAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.953Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "GlobalUsing.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\GlobalUsing.cs",
- "RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\GlobalUsing.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\GlobalUsing.cs",
- "RelativeToolTip": "WIDESEA_StorageTaskServices\\GlobalUsing.cs",
- "ViewState": "AQIAAAAAAAAAAAAAAADwvwAAAAAAAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.957Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "Title": "MOMErrorMessage.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\MOM\\MOMErrorMessage.cs",
- "RelativeDocumentMoniker": "WIDESEA_Model\\Models\\MOM\\MOMErrorMessage.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\MOM\\MOMErrorMessage.cs",
- "RelativeToolTip": "WIDESEA_Model\\Models\\MOM\\MOMErrorMessage.cs",
- "ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAgAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.959Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 13,
- "Title": "CellStateService.cs",
- "DocumentMoniker": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\MOM\\CellState\\CellStateService.cs",
- "RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\MOM\\CellState\\CellStateService.cs",
- "ToolTip": "D:\\Git\\BaiBuSanlou\\CodeManagement\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\MOM\\CellState\\CellStateService.cs",
- "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\MOM\\CellState\\CellStateService.cs",
- "ViewState": "AQIAAFAAAAAAAAAAAAAgwGsAAABkAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-19T01:44:51.961Z"
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin b/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin
deleted file mode 100644
index 5b36bf1..0000000
--- a/CodeManagement/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3