ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json
@@ -1,8 +1,9 @@ { "Version": 1, "WorkspaceRootPath": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\", "WorkspaceRootPath": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\", "Documents": [ { <<<<<<< HEAD "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -15,6 +16,32 @@ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { ======= <<<<<<< HEAD "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\git\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\git\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\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:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\wideseawcs_model\\models\\system\\dt_outstockinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\system\\dt_outstockinfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" ======= >>>>>>> 387a84895ddaa66a8a51f576ad3bb9fff11a7ec9 "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskhtyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskhtyservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -49,6 +76,7 @@ { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\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}" >>>>>>> d55ce3e970b15ba683fc75824a5f0725e2a9d3ad } ], "DocumentGroupContainers": [ @@ -58,7 +86,26 @@ "DocumentGroups": [ { "DockedWidth": 200, <<<<<<< HEAD "SelectedChildIndex": 0, ======= <<<<<<< HEAD "SelectedChildIndex": 0, "Children": [ { "$type": "Document", "DocumentIndex": 0, "Title": "TaskStatusEnum.cs", "DocumentMoniker": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", "ToolTip": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", "ViewState": "AQIAAEMAAAAAAAAAAAAUwBkAAAAWAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-04T07:35:25.414Z", ======= "SelectedChildIndex": 5, >>>>>>> 387a84895ddaa66a8a51f576ad3bb9fff11a7ec9 "Children": [ { "$type": "Document", @@ -109,17 +156,49 @@ "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\System\\Sys_DictionaryController.cs", "ViewState": "AgIAAI8AAAAAAAAAAAAgwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", <<<<<<< HEAD "WhenOpened": "2025-03-04T12:20:03.832Z" }, { "$type": "Document", "DocumentIndex": 7, ======= "WhenOpened": "2025-03-04T12:20:03.832Z", >>>>>>> d55ce3e970b15ba683fc75824a5f0725e2a9d3ad "EditorCaption": "" }, { "$type": "Document", <<<<<<< HEAD "DocumentIndex": 5, "Title": "dt_outstockinfo.cs", "DocumentMoniker": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\dt_outstockinfo.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\dt_outstockinfo.cs", "ToolTip": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\System\\dt_outstockinfo.cs", "RelativeToolTip": "WIDESEAWCS_Model\\Models\\System\\dt_outstockinfo.cs", "ViewState": "AQIAAAYAAAAAAAAAAADwvxkAAAASAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-04T05:45:05.882Z" }, { "$type": "Document", "DocumentIndex": 4, "Title": "TaskService.cs", "DocumentMoniker": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs", "ToolTip": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs", "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs", "ViewState": "AQIAAFcCAAAAAAAAAAAcwEUCAAAlAAAA", ======= "DocumentIndex": 4, >>>>>>> 387a84895ddaa66a8a51f576ad3bb9fff11a7ec9 "Title": "TaskController.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAATAAAAAAAAAA==", >>>>>>> d55ce3e970b15ba683fc75824a5f0725e2a9d3ad "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-04T11:38:08.63Z" }, @@ -149,7 +228,35 @@ }, { "$type": "Document", <<<<<<< HEAD "DocumentIndex": 8, ======= <<<<<<< HEAD "DocumentIndex": 2, "Title": "ZXJJob.cs", "DocumentMoniker": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "ToolTip": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "ViewState": "AQIAACoAAAAAAAAAAAAqwCwAAAAIAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-03T06:27:45.31Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 1, "Title": "GZJJob.cs", "DocumentMoniker": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "ToolTip": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "ViewState": "AQIAAFEAAAAAAAAAAAAuwOoAAAA5AAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-02T07:23:03.899Z", ======= "DocumentIndex": 5, >>>>>>> 387a84895ddaa66a8a51f576ad3bb9fff11a7ec9 "Title": "Dt_Task_hty.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\TaskInfo\\Dt_Task_hty.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\TaskInfo\\Dt_Task_hty.cs", @@ -170,11 +277,27 @@ "ViewState": "AgIAAAkAAAAAAAAAAAAkwBUAAAAVAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-03T14:07:21.001Z", >>>>>>> d55ce3e970b15ba683fc75824a5f0725e2a9d3ad "EditorCaption": "" }, { "$type": "Document", <<<<<<< HEAD "DocumentIndex": 4, ======= <<<<<<< HEAD "DocumentIndex": 3, "Title": "OHTJob.cs", "DocumentMoniker": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "ToolTip": "F:\\Git\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "ViewState": "AQIAADMAAAAAAAAAAAAuwH8AAAAgAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-01T14:47:49.318Z", ======= "DocumentIndex": 1, >>>>>>> 387a84895ddaa66a8a51f576ad3bb9fff11a7ec9 "Title": "ITaskhtyService.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskhtyService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskhtyService.cs", @@ -206,7 +329,13 @@ "RelativeToolTip": "WIDESEAWCS_SystemServices\\dt_stationinfoService.cs", "ViewState": "AgIAAAoAAAAAAAAAAAAowBYAAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", <<<<<<< HEAD "WhenOpened": "2025-03-03T13:10:11.273Z" ======= "WhenOpened": "2025-03-03T13:10:11.273Z", >>>>>>> d55ce3e970b15ba683fc75824a5f0725e2a9d3ad "EditorCaption": "" >>>>>>> 387a84895ddaa66a8a51f576ad3bb9fff11a7ec9 } ] } ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs
@@ -39,9 +39,9 @@ [Description("åºåº")] Outbound = 100, /// <summary> /// çç¹åºåº /// ç´æ¥åºåº /// </summary> [Description("çç¹åºåº")] [Description("ç´æ¥åºåº")] OutInventory = 101, /// <summary> /// åæ£åºåº ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/dt_outstockinfo.cs
@@ -17,9 +17,15 @@ public int Id { get; set; } /// <summary> /// æ¯å¦åºåº 0ä¸åºåº 1åºåº /// æ¯å¦åºåº 0ä¸åºåº 1åºåº 2ç´æ¥ä»å ¥åºå£åè´§å°åºåºå£ /// </summary> [SugarColumn(IsNullable = false, ColumnDescription = "æ¯å¦åºåº")] public int isout { get; set; } /// <summary> /// 1å å ¥åº 2ç´æ¥ä»å ¥åºå£åè´§å°åºåºå£ /// </summary> [SugarColumn(IsNullable = false, ColumnDescription = "æ¯å¦åºåº")] public int InOut { get; set; } } } ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -19,7 +19,7 @@ //è¿æ¥å符串 //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=", //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST555;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ConnectionString": "server=localhost;Database=widereawcs_yangji;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true", "ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=123456;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
@@ -264,7 +264,7 @@ } else if (workTpe.Equals("Out")) { task = BaseDal.QueryData(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First(); task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First(); } } catch (Exception) @@ -415,7 +415,7 @@ { task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting; } else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound) else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)) { task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting; } @@ -423,7 +423,7 @@ { task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting; } else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound) else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) { task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting; } @@ -653,7 +653,7 @@ taskhty.TaskNum = nawtask.TaskNum; taskhty.Roadway = nawtask.Roadway; taskhty.TaskType = nawtask.TaskType; taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish; taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish; taskhty.SourceAddress = nawtask.SourceAddress; taskhty.TargetAddress = nawtask.TargetAddress; taskhty.ExceptionMessage = nawtask.ExceptionMessage; @@ -674,6 +674,26 @@ //æ交äºå¡ _unitOfWorkManage.CommitTran(); } else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory) { //å¤çä»»å¡ä¿¡æ¯ Dt_Task_hty taskhty = new Dt_Task_hty(); taskhty.TaskNum = nawtask.TaskNum; taskhty.Roadway = nawtask.Roadway; taskhty.TaskType = nawtask.TaskType; taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish; taskhty.SourceAddress = nawtask.SourceAddress; taskhty.TargetAddress = nawtask.TargetAddress; taskhty.ExceptionMessage = nawtask.ExceptionMessage; taskhty.Grade = nawtask.Grade; taskhty.Dispatchertime = nawtask.Dispatchertime; taskhty.Remark = nawtask.Remark; taskhty.PalletCode = nawtask.PalletCode; taskhty.NextAddress = nawtask.NextAddress; taskhty.CurrentAddress = nawtask.CurrentAddress; _taskhtyRepository.AddData(taskhty); BaseDal.DeleteData(nawtask); } content = WebResponseContent.Instance.OK(); } catch (Exception ex) ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs
@@ -29,6 +29,7 @@ using WIDESEAWCS_QuartzJob.StackerCrane.Enum; using WIDESEAWCS_TaskInfoService; using WIDESEAWCS_Tasks.OHT; using static System.Collections.Specialized.BitVector32; namespace WIDESEAWCS_Tasks { @@ -88,83 +89,138 @@ { throw new Exception($"è§æ´æºæå ¥ä½¿ç¨ä¿¡å·ä¸ºfalse"); } Dt_Task task = new Dt_Task(); var storagemode = _storagemodeRepository.QueryFirst(v=>v.Id==1); if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGVä¸æ模å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å· var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1); if (Inisout.InOut==1) { var station=_dt_stationInfoRepository.QueryFirst(v=>v.msg== "ä¸è·¨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; Dt_Task task = new Dt_Task(); var storagemode = _storagemodeRepository.QueryFirst(v => v.Id == 1); if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGVä¸æ模å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; task.Grade = 1; task.Remark = (int)MateTypeEnum.ZiChan; } else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGVä¸æ模å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); string address = DKstation.Row + "-" + DKstation.Column + "-1"; var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address); if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew) { task.Grade = 2; } else { task.Grade = 1; } task.Remark = (int)MateTypeEnum.ZiChan; } else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//人工å车ä¸æ模å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; task.Grade = 1; task.Remark = (int)MateTypeEnum.WaiGou; } else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//人工å车ä¸æ模å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); string address = XKstation.Row + "-" + XKstation.Column + "-1"; var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address); if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew) { task.Grade = 2; } else { task.Grade = 1; } task.Remark = (int)MateTypeEnum.WaiGou; } else { throw new Exception($"è§æ´æºå½åä¿¡å·ä¸æ»¡è¶³å ¥åºä»»å¡çææ¡ä»¶"); } //æ¥æ¾ç¸é»çåºä½ Dt_LocationInfo Towlocation = new Dt_LocationInfo(); var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress); if (Onelocation.Depth == 1) { Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2); } else { Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1); } task.NextAddress = Towlocation.LocationCode; task.Roadway = "TC01"; task.TaskType = (int)TaskInboundTypeEnum.Inbound; task.TaskState = (int)TaskInStatusEnum.InNew; task.PalletCode = "text"; task.CurrentAddress = "text"; task.WMSId = 3; var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress); if (oldhtytask == null) { _dt_taskRepositiry.AddData(task); } } else if(Inisout.InOut == 2) { if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork) { throw new Exception($"æ´å½¢æºä¸å±äºå¤©è½¦ä¸æ模å¼æ天车æ¾æ¿ä¿¡å·ä¸ºfalse"); } Dt_Task outtask = new Dt_Task(); if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready ) { var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1"; } else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready) { var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1"; } else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready) { var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1"; } else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready) { var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1"; } task.Grade = 1; task.Remark = (int)MateTypeEnum.ZiChan; } else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGVä¸æ模å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); string address= DKstation.Row + "-" + DKstation.Column + "-1"; var oldtask = _dt_taskRepositiry.QueryFirst(v=>v.SourceAddress== address); if (oldtask!=null && oldtask.TaskState== (int)TaskInStatusEnum.InNew) var Endstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "æ´å½¢æºæ¾æä½"); outtask.TargetAddress = Endstation.Row + "-" + Endstation.Column + "-1"; outtask.Grade = 1; outtask.NextAddress = Endstation.Row + "-" + Endstation.Column + "-1"; outtask.Roadway = "TC01"; outtask.TaskType = (int)TaskOutboundTypeEnum.OutInventory; outtask.TaskState = (int)TaskOutStatusEnum.OutNew; outtask.WMSId = 3; outtask.PalletCode = "text"; outtask.CurrentAddress = "text"; var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.SourceAddress); if (oldtask == null) { task.Grade = 2; _dt_taskRepositiry.AddData(outtask); } else { task.Grade = 1; } task.Remark = (int)MateTypeEnum.ZiChan; } else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//人工å车ä¸æ模å¼ï¼ä¸è¥¿è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; task.Grade = 1; task.Remark = (int)MateTypeEnum.WaiGou; } else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//人工å车ä¸æ模å¼ï¼ä¸ä¸è·¨æ¶åæä¸æä¿¡å· { var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "ä¸è·¨æ¶å"); task.SourceAddress = station.Row + "-" + station.Column + "-1"; task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode; var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨æ¶å"); string address= XKstation.Row + "-" + XKstation.Column + "-1"; var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address); if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew) { task.Grade = 2; } else { task.Grade = 1; } task.Remark = (int)MateTypeEnum.WaiGou; } else { throw new Exception($"è§æ´æºå½åä¿¡å·ä¸æ»¡è¶³å ¥åºä»»å¡çææ¡ä»¶"); } //æ¥æ¾ç¸é»çåºä½ Dt_LocationInfo Towlocation = new Dt_LocationInfo(); var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress); if (Onelocation.Depth == 1) { Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2); } else { Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1); } task.NextAddress = Towlocation.LocationCode; task.Roadway = "TC01"; task.TaskType = (int)TaskInboundTypeEnum.Inbound; task.TaskState = (int)TaskInStatusEnum.InNew; task.PalletCode = "text"; task.CurrentAddress = "text"; _dt_taskRepositiry.AddData(task); #endregion } @@ -181,70 +237,70 @@ throw new Exception($"æ´å½¢æºæå ¥ä½¿ç¨ä¿¡å·ä¸ºfalse"); } var isout = _outStockRepository.QueryFirst(v => v.Id == 1); if (isout.isout != 1) if (isout.isout == 1) { throw new Exception($"å½åç³»ç»è®¾ç½®ä¸ºä¸åºåºæ¨¡å¼"); } if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork) { throw new Exception($"æ´å½¢æºä¸å±äºå¤©è½¦ä¸æ模å¼æ天车æ¾æ¿ä¿¡å·ä¸ºfalse"); } //æ¥è¯¢å½åä»»å¡æ± ä¸æ¯å¦åå¨åºåºä»»å¡ï¼åºåºä»»å¡åªè½åå¨ä¸æ¡ var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); if (oldtask != null) { throw new Exception($"å½åä»»å¡æ± ä¸å·²åå¨ä¸æ¡åºåºä»»å¡"); } //æ¥è¯¢å½åéè¦åºåºçæ¹æ¬¡å·ï¼ä»¥ååºåºç©æç±»å var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1); //æ¥è¯¢åºåç©æåºåä¿¡æ¯ var stocks = _StockInfoRepository.QueryData(v => v.Remark == batch.materType && v.BatchNo == batch.OutBatch && v.StockStatus==0) .OrderBy(v => v.CreateDate).ToList(); if (stocks.Count <= 0) { throw new Exception($"å½ååºåä¸æ²¡æã{batch.materType}ãï¼0èªäº§ 1å¤è´ï¼ä¸æ¹æ¬¡ä¸ºã{batch.OutBatch}ãçç©æ"); } //æ¥è¯¢è´§ä½ var locaOne=_LocationInfoRepository.QueryFirst(v=>v.LocationCode== stocks[0].LocationCode); //æ¥è¯¢ç¸é»çè´§ä½ Dt_LocationInfo locaTow = new Dt_LocationInfo(); if (locaOne.Depth==1) { locaTow = _LocationInfoRepository.QueryFirst(v => v.Row == locaOne.Row &&v.Column== locaOne.Column && v.Depth==2); } else { locaTow = _LocationInfoRepository.QueryFirst(v => v.Row == locaOne.Row && v.Column == locaOne.Column && v.Depth == 1); } locaOne.LocationStatus = (int)LocationStatusEnum.Lock; locaTow.LocationStatus = (int)LocationStatusEnum.Lock; //æ¥è¯¢ç¸é»çåºå var BBstock = _StockInfoRepository.QueryFirst(v=>v.LocationCode== locaTow.LocationCode); BBstock.StockStatus = 1; stocks[0].StockStatus = 1; //æ¥è¯¢ç»ç¹ç«å°ä¿¡æ¯ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "æ´å½¢æºæ¾æä½"); //å¼å§åå»ºä»»å¡ Dt_Task outtask = new Dt_Task(); outtask.Roadway = "TC01"; outtask.TaskType = (int)TaskOutboundTypeEnum.Outbound; outtask.TaskState = (int)TaskOutStatusEnum.OutNew; outtask.SourceAddress = stocks[0].LocationCode; outtask.TargetAddress = station.Row + "-" + station.Column + "-1"; outtask.NextAddress = locaTow.LocationCode; outtask.Grade = 1; outtask.WMSId = 3; outtask.Remark = batch.materType; outtask.PalletCode = "text"; outtask.CurrentAddress = "text"; if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork) { throw new Exception($"æ´å½¢æºä¸å±äºå¤©è½¦ä¸æ模å¼æ天车æ¾æ¿ä¿¡å·ä¸ºfalse"); } //æ¥è¯¢å½åä»»å¡æ± ä¸æ¯å¦åå¨åºåºä»»å¡ï¼åºåºä»»å¡åªè½åå¨ä¸æ¡ var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); if (oldtask != null) { throw new Exception($"å½åä»»å¡æ± ä¸å·²åå¨ä¸æ¡åºåºä»»å¡"); } //æ¥è¯¢å½åéè¦åºåºçæ¹æ¬¡å·ï¼ä»¥ååºåºç©æç±»å var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1); //æ¥è¯¢åºåç©æåºåä¿¡æ¯ var stocks = _StockInfoRepository.QueryData(v => v.Remark == batch.materType && v.BatchNo == batch.OutBatch && v.StockStatus == 0) .OrderBy(v => v.CreateDate).ToList(); if (stocks.Count <= 0) { throw new Exception($"å½ååºåä¸æ²¡æã{batch.materType}ãï¼0èªäº§ 1å¤è´ï¼ä¸æ¹æ¬¡ä¸ºã{batch.OutBatch}ãçç©æ"); } //æ¥è¯¢è´§ä½ var locaOne = _LocationInfoRepository.QueryFirst(v => v.LocationCode == stocks[0].LocationCode); //æ¥è¯¢ç¸é»çè´§ä½ Dt_LocationInfo locaTow = new Dt_LocationInfo(); if (locaOne.Depth == 1) { locaTow = _LocationInfoRepository.QueryFirst(v => v.Row == locaOne.Row && v.Column == locaOne.Column && v.Depth == 2); } else { locaTow = _LocationInfoRepository.QueryFirst(v => v.Row == locaOne.Row && v.Column == locaOne.Column && v.Depth == 1); } locaOne.LocationStatus = (int)LocationStatusEnum.Lock; locaTow.LocationStatus = (int)LocationStatusEnum.Lock; //æ¥è¯¢ç¸é»çåºå var BBstock = _StockInfoRepository.QueryFirst(v => v.LocationCode == locaTow.LocationCode); BBstock.StockStatus = 1; stocks[0].StockStatus = 1; //æ¥è¯¢ç»ç¹ç«å°ä¿¡æ¯ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "æ´å½¢æºæ¾æä½"); //å¼å§åå»ºä»»å¡ Dt_Task outtask = new Dt_Task(); outtask.Roadway = "TC01"; outtask.TaskType = (int)TaskOutboundTypeEnum.Outbound; outtask.TaskState = (int)TaskOutStatusEnum.OutNew; outtask.SourceAddress = stocks[0].LocationCode; outtask.TargetAddress = station.Row + "-" + station.Column + "-1"; outtask.NextAddress = locaTow.LocationCode; outtask.Grade = 1; outtask.WMSId = 3; outtask.Remark = batch.materType; outtask.PalletCode = "text"; outtask.CurrentAddress = "text"; _unitOfWorkManage.BeginTran(); _LocationInfoRepository.UpdateData(locaOne); _LocationInfoRepository.UpdateData(locaTow); _StockInfoRepository.UpdateData(BBstock); _dt_taskRepositiry.AddData(outtask); _StockInfoRepository.UpdateData(stocks[0]); _unitOfWorkManage.CommitTran(); _unitOfWorkManage.BeginTran(); _LocationInfoRepository.UpdateData(locaOne); _LocationInfoRepository.UpdateData(locaTow); _StockInfoRepository.UpdateData(BBstock); _dt_taskRepositiry.AddData(outtask); _StockInfoRepository.UpdateData(stocks[0]); _unitOfWorkManage.CommitTran(); } #endregion } catch (Exception ex) ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs
@@ -95,6 +95,14 @@ } } } else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory) { WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask); if (result.Status) { device.SetValue(DeviceDBName.W_ConfirmSignal, 3); } } return Task.CompletedTask; } else if (oHTReadData.R_RunState == (int)RunStateEnum.PutCompleted && oHTReadData.R_TaskState == (int)TaskStateEnum.TaskComplete)
