From 369b0450f83c4efaee4efec7a1356d16c790a722 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 23 十二月 2024 09:07:00 +0800
Subject: [PATCH] agv接口迁移到WCS，新增接口表
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fde68f49-1fc8-44c8-8785-4d80e9e536c1.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/00a56665-6752-4d06-b9b6-0852d20709ee.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureReplyDTO.cs | 56 ++++++
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 26 ++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7a833a68-07df-4786-a4b8-e9726236f98d.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2c5380f0-67c1-41e2-940e-3a1dd36603f2.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureApplyDTO.cs | 28 +++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ApiInfo.cs | 40 ++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvResponseContent.cs | 28 +++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs | 91 ++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/APIEnum/APIEnum.cs | 17 +
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/94b1eced-02e0-42fa-a704-73db3cda704b.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvUpdateDTO.cs | 111 ++++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvTaskDTO.cs | 72 ++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_ApiInfo.cs | 40 ++++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a005823-c1a7-4703-9472-7a90323886f9.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 2
19 files changed, 509 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/00a56665-6752-4d06-b9b6-0852d20709ee.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/00a56665-6752-4d06-b9b6-0852d20709ee.vsidx"
new file mode 100644
index 0000000..6913cde
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/00a56665-6752-4d06-b9b6-0852d20709ee.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a005823-c1a7-4703-9472-7a90323886f9.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a005823-c1a7-4703-9472-7a90323886f9.vsidx"
new file mode 100644
index 0000000..2e70448
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a005823-c1a7-4703-9472-7a90323886f9.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/APIEnum/APIEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/APIEnum/APIEnum.cs"
new file mode 100644
index 0000000..589a379
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/APIEnum/APIEnum.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_Common.APIEnum
+{
+ public enum APIEnum
+ {
+ [Description("AGV鍙戦�佷换鍔℃帴鍙�")]
+ AgvSendTask,
+ [Description("AGV瀹夊叏淇″彿鍥炲")]
+ AgvSecureReply
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvResponseContent.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvResponseContent.cs"
new file mode 100644
index 0000000..4344974
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvResponseContent.cs"
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Agv
+{
+ public class AgvResponseContent
+ {
+ /// <summary>
+ /// 杩斿洖鐮�
+ /// </summary>
+ public string Code { get; set; }
+ /// <summary>
+ /// 杩斿洖娑堟伅
+ /// </summary>
+ public string Message { get; set; }
+ /// <summary>
+ /// 璇锋眰缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 鑷畾涔夎繑鍥烇紙杩斿洖浠诲姟鍗曞彿锛�
+ /// </summary>
+ public string Data { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureApplyDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureApplyDTO.cs"
new file mode 100644
index 0000000..52a076c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureApplyDTO.cs"
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Agv
+{
+ public class AgvSecureApplyDTO
+ {
+ /// <summary>
+ /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜や娇鐢ㄥ悓涓�缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 鐩爣浣�
+ /// </summary>
+ public string WbCode { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string TaskCode { get; set; }
+ /// <summary>
+ /// 鎵规
+ /// </summary>
+ public string MaterialLot { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureReplyDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureReplyDTO.cs"
new file mode 100644
index 0000000..a1f200a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvSecureReplyDTO.cs"
@@ -0,0 +1,56 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Agv
+{
+ public class AgvSecureReplyDTO
+ {
+ /// <summary>
+ /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜�,浣跨敤鍚屼竴缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 璇锋眰鏃堕棿 鏍煎紡:yyyy-MM-dd HH:mm:ss
+ /// </summary>
+ public string ReqTime { get; set; }
+ /// <summary>
+ /// 瀹㈡埛绔紪鍙�
+ /// </summary>
+ public string ClientCode { get; set; }
+ /// <summary>
+ /// 浠ょ墝鍙� 鐢辫皟搴︾郴缁熼鍙�
+ /// </summary>
+ public string TokenCode { get; set; }
+ /// <summary>
+ /// 宸ヤ綔浣� 涓嶳CS-2000绔厤缃殑浣嶇疆鍚嶇О涓�鑷�
+ /// </summary>
+ public string WbCode { get; set; }
+ /// <summary>
+ /// 杞藉叿缂栧彿
+ /// </summary>
+ public string podCode { get; set; }
+ /// <summary>
+ /// AGV缂栧彿
+ /// </summary>
+ public string agvCode { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string taskCode { get; set; }
+ /// <summary>
+ /// 涓嬩竴涓瓙浠诲姟搴忓垪 鎸囧畾绗嚑涓瓙浠诲姟寮�濮嬫墽琛�,鏍￠獙瀛愪换鍔℃墽琛屾槸鍚︽纭�,涓嶅～榛樿鎵ц涓嬩竴涓瓙浠诲姟銆�
+ /// </summary>
+ public string taskSeq { get; set; }
+ /// <summary>
+ /// 涓嬩竴涓綅缃俊鎭�
+ /// positionCode:浣嶇疆缂栧彿
+ /// type:瀵硅薄绫诲瀷瀹氫箟:
+ /// 00:浠ｈ〃 nextPositionCode鏄竴涓綅缃�
+ /// 02:浠ｈ〃 nextPositionCode鏄竴涓瓥鐣�
+ /// </summary>
+ public object nextPositionCode { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvTaskDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvTaskDTO.cs"
new file mode 100644
index 0000000..583c83c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvTaskDTO.cs"
@@ -0,0 +1,72 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Agv
+{
+ /// <summary>
+ /// AGV浠诲姟
+ /// </summary>
+ public class AgvTaskDTO
+ {
+ /// <summary>
+ /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜�,浣跨敤鍚屼竴缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string TaskTyp { get; set; }
+ /// <summary>
+ /// 宸ヤ綔浣�
+ /// </summary>
+ public string WbCode { get; set; }
+ /// <summary>
+ /// 浣嶇疆璺緞
+ /// </summary>
+ public List<object> PositionCodePath { get; set; }
+ /// <summary>
+ /// 杞藉叿缂栧彿
+ /// </summary>
+ public string PodCode { get; set; }
+ /// <summary>
+ /// 杞藉叿绫诲瀷
+ /// </summary>
+ public string PodTyp { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎵规
+ /// </summary>
+ public string MaterialLot { get; set; }
+ /// <summary>
+ /// 浼樺厛绾�(1~127)鏈�澶т紭鍏堢骇鏈�楂� 涓虹┖鏃�,閲囩敤浠诲姟妯℃澘鐨勪紭鍏堢骇
+ /// </summary>
+ public string Priority { get; set; }
+ /// <summary>
+ /// AGV浠诲姟鍙�
+ /// </summary>
+ public string TaskCode { get; set; }
+ /// <summary>
+ /// AGV璁惧缂栧彿 濉啓鍙寚瀹氭煇涓�缂栧彿鐨凙GV鎵ц璇ヤ换鍔�
+ /// </summary>
+ public string AgvCode { get; set; }
+ /// <summary>
+ /// AGV璁惧绫诲瀷
+ /// </summary>
+ public string AgvTyp { get; set; }
+ /// <summary>
+ /// 鍖哄煙/绛栫暐<br/>
+ /// 鎸戦�夎揣鏋朵互鍙婃牴鎹墿鏂欐壒娆℃寫閫夎揣鏋舵椂鐨勫厛杩涘厛鍑鸿鍒欙紝鏀寔浠ヤ笅4涓�硷細<br/>
+ /// 1锛氭寜鐓ц揣鏋跺埌杈惧偍浣嶇殑鏃堕棿椤哄簭锛屽厛杩涘厛鍑�<br/>
+ /// 2锛氭寜鐓ц揣鏋跺埌杈惧偍浣嶇殑鏃堕棿椤哄簭锛屽厛杩涘悗鍑�<br/>
+ /// 9锛氭寜鐓ц揣鏋剁粦瀹氱墿鏂欐壒娆＄殑鏃堕棿椤哄簭锛屽厛杩涘厛鍑�<br/>
+ /// 10锛氭寜鐓ц揣鏋剁粦瀹氱墿鏂欐壒娆＄殑鏃堕棿椤哄簭锛屽厛杩涘悗鍑�<br/>
+ /// </summary>
+ public string PositionSelStrategy { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�
+ /// </summary>
+ public string Data { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvUpdateDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvUpdateDTO.cs"
new file mode 100644
index 0000000..4c8f9d0
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Agv/AgvUpdateDTO.cs"
@@ -0,0 +1,111 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Agv
+{
+ public class AgvUpdateDTO
+ {
+ /// <summary>
+ /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜や娇鐢ㄥ悓涓�缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 璇锋眰鏃堕棿 鏍煎紡:yyyy-MM-dd HH:mm:ss
+ /// </summary>
+ public string ReqTime { get; set; }
+ /// <summary>
+ /// 浣嶇疆X鍧愭爣 浠诲姟瀹屾垚鏃舵湁鍊�
+ /// </summary>
+ public int CooX { get; set; }
+ /// <summary>
+ /// 浣嶇疆Y鍧愭爣 浠诲姟瀹屾垚鏃舵湁鍊�
+ /// </summary>
+ public int CooY { get; set; }
+ /// <summary>
+ /// 褰撳墠浣嶇疆缂栧彿<br/>
+ /// 浠诲姟寮�濮嬶細璇ヤ綅缃负浠诲姟璧风偣<br/>
+ /// 璧板嚭鍌ㄤ綅锛氳浣嶇疆涓轰换鍔¤捣鐐�<br/>
+ /// 浠诲姟鍗曞彇娑堬細璇ヤ綅缃负宸ヤ綔浣嶇紪鍙�<br/>
+ /// 浠诲姟缁撴潫锛氳浣嶇疆涓轰换鍔＄粓鐐�<br/>
+ /// 鍙栨斁鐢宠锛氬彇鏀炬枡绠辩殑鐐�<br/>
+ /// </summary>
+ public string CurrentPositionCode { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�
+ /// </summary>
+ public string Data { get; set; }
+ /// <summary>
+ /// 鍦板浘缂栧彿
+ /// </summary>
+ public string MapCode { get; set; }
+ /// <summary>
+ /// 鍦扮爜缂栧彿 浠诲姟瀹屾垚鏃舵湁鍊�
+ /// </summary>
+ public string MapDataCode { get; set; }
+ /// <summary>
+ /// 浠撲綅缂栫爜 鍙夎溅涓嶤TU浠诲姟鏃舵湁鍊�
+ /// </summary>
+ public string StgBinCode { get; set; }
+ /// <summary>
+ /// 鏂规硶鍚�<br/>
+ /// start : 浠诲姟寮�濮�<br/>
+ /// outbin : 璧板嚭鍌ㄤ綅<br/>
+ /// end : 浠诲姟缁撴潫<br/>
+ /// cancel : 浠诲姟鍗曞彇娑�<br/>
+ /// apply锛欳TU鏂欑鍙栨斁鐢宠<br/>
+ /// </summary>
+ public string Method { get; set; }
+ /// <summary>
+ /// 杞藉叿缂栧彿
+ /// </summary>
+ public string PodCode { get; set; }
+ /// <summary>
+ /// 杞藉叿鏂瑰悜
+ /// </summary>
+ public string PodDir { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎵规鍙�
+ /// </summary>
+ public string MaterialLot { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public string MaterialType { get; set; }
+ /// <summary>
+ /// AGV缂栧彿
+ /// </summary>
+ public string RobotCode { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string TaskCode { get; set; }
+ /// <summary>
+ /// 宸ヤ綔鍙扮紪鍙� 浠诲姟瀹屾垚鏃舵湁鍊�,涓庣敓鎴愪换鍔″崟鎺ュ彛涓殑wbCode涓�鑷�
+ /// </summary>
+ public string WbCode { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒缂栧彿
+ /// </summary>
+ public string CtnrCode { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ public string CtnrType { get; set; }
+ /// <summary>
+ /// 宸烽亾缂栧彿
+ /// </summary>
+ public string RoadWayCode { get; set; }
+ /// <summary>
+ /// 宸烽亾鍐呴『搴忓彿<br/>
+ /// 宸烽亾灏炬槸0渚濇鍒板贩閬撳ご渚濇閫掑1
+ /// </summary>
+ public string Seq { get; set; }
+ /// <summary>
+ /// 璁惧缂栧彿
+ /// </summary>
+ public string EqpCode { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 675e229..6b97c18 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -22,6 +22,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_DTO.Agv;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
@@ -118,12 +119,35 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent TaskStatusRecovery(int taskNum);
-
/// <summary>
/// 鍥炴粴浠诲姟鐘舵��
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent RollbackTaskStatusToLast(int taskNum);
+ /// <summary>
+ /// 鍙戦�丄GV浠诲姟
+ /// </summary>
+ /// <param name="taskModel"></param>
+ /// <returns></returns>
+ WebResponseContent AgvSendTask(AgvTaskDTO taskModel);
+ /// <summary>
+ /// 瀹夊叏淇″彿鐢宠
+ /// </summary>
+ /// <param name="secureApplyModel"></param>
+ /// <returns></returns>
+ AgvResponseContent AgvSecureApply(AgvSecureApplyDTO secureApplyModel);
+ /// <summary>
+ /// 瀹夊叏淇″彿鍥炲 WCS-AGV
+ /// </summary>
+ /// <param name="secureModel"></param>
+ /// <returns></returns>
+ WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel);
+ /// <summary>
+ /// AGV浠诲姟鐘舵�佸埛鏂�
+ /// </summary>
+ /// <param name="agvUpdateModel"></param>
+ /// <returns></returns>
+ AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ApiInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ApiInfo.cs"
new file mode 100644
index 0000000..a2ab325
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ApiInfo.cs"
@@ -0,0 +1,40 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core.DB.Models;
+
+namespace WIDESEAWCS_Model.Models
+{
+ [SugarTable(nameof(Dt_ApiInfo), "鎺ュ彛淇℃伅")]
+ public class Dt_ApiInfo : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+ /// <summary>
+ /// 鎺ュ彛缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎺ュ彛缂栧彿")]
+ public string ApiCode { get; set; }
+ /// <summary>
+ /// 鎺ュ彛鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎺ュ彛鍚嶇О")]
+ public string ApiName { get; set; }
+ /// <summary>
+ /// 鎺ュ彛鍦板潃
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鎺ュ彛鍦板潃")]
+ public string ApiAddress { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
new file mode 100644
index 0000000..fa13d12
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
@@ -0,0 +1,91 @@
+锘縰sing Autofac.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_DTO.Agv;
+using WIDESEAWCS_Common.APIEnum;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.Helper;
+
+namespace WIDESEAWCS_TaskInfoService
+{
+ public partial class TaskService
+ {
+ /// <summary>
+ /// 鍙戦�丄GV浠诲姟
+ /// </summary>
+ /// <param name="taskModel"></param>
+ /// <returns></returns>
+ public WebResponseContent AgvSendTask(AgvTaskDTO taskModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string apiAddress = AppSettings.Get(APIEnum.AgvSendTask.ToString());
+ string response = HttpHelper.Post(apiAddress, taskModel.Serialize());
+ AgvResponseContent agvContent= response.DeserializeObject<AgvResponseContent>();
+ if (agvContent.Code=="200")
+ {
+ content.OK(agvContent.Message);
+ }
+ else
+ {
+ content.Error(agvContent.Message);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ /// <summary>
+ /// 瀹夊叏淇″彿鐢宠 AGV-WCS
+ /// </summary>
+ public AgvResponseContent AgvSecureApply(AgvSecureApplyDTO secureApplyModel)
+ {
+
+ return new AgvResponseContent();
+ }
+ /// <summary>
+ /// 瀹夊叏淇″彿鍥炲 WCS-AGV
+ /// </summary>
+ /// <param name="secureModel"></param>
+ /// <returns></returns>
+ public WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string apiAddress = AppSettings.Get(APIEnum.AgvSecureReply.ToString());
+ string response = HttpHelper.Post(apiAddress, secureReplyModel.Serialize());
+ AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
+ if (agvContent.Code == "200")
+ {
+ content.OK(agvContent.Message);
+ }
+ else
+ {
+ content.Error(agvContent.Message);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ /// <summary>
+ /// AGV浠诲姟鐘舵�佸埛鏂�
+ /// </summary>
+ /// <param name="agvUpdateModel"></param>
+ /// <returns></returns>
+ public AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel)
+ {
+
+ return new AgvResponseContent();
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 633738c..af188c5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -41,7 +41,7 @@
namespace WIDESEAWCS_TaskInfoService
{
- public class TaskService : ServiceBase<Dt_Task, ITaskRepository>, ITaskService
+ public partial class TaskService : ServiceBase<Dt_Task, ITaskRepository>, ITaskService
{
private readonly IRouterService _routerService;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2c5380f0-67c1-41e2-940e-3a1dd36603f2.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2c5380f0-67c1-41e2-940e-3a1dd36603f2.vsidx"
new file mode 100644
index 0000000..1602e1f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2c5380f0-67c1-41e2-940e-3a1dd36603f2.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7a833a68-07df-4786-a4b8-e9726236f98d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7a833a68-07df-4786-a4b8-e9726236f98d.vsidx"
new file mode 100644
index 0000000..a2544ac
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7a833a68-07df-4786-a4b8-e9726236f98d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/94b1eced-02e0-42fa-a704-73db3cda704b.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/94b1eced-02e0-42fa-a704-73db3cda704b.vsidx"
new file mode 100644
index 0000000..45f1eb1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/94b1eced-02e0-42fa-a704-73db3cda704b.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fde68f49-1fc8-44c8-8785-4d80e9e536c1.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fde68f49-1fc8-44c8-8785-4d80e9e536c1.vsidx"
new file mode 100644
index 0000000..a1dd018
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fde68f49-1fc8-44c8-8785-4d80e9e536c1.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_ApiInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_ApiInfo.cs"
new file mode 100644
index 0000000..9b42375
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_ApiInfo.cs"
@@ -0,0 +1,40 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ [SugarTable(nameof(Dt_ApiInfo), "鎺ュ彛淇℃伅")]
+ public class Dt_ApiInfo : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+ /// <summary>
+ /// 鎺ュ彛缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎺ュ彛缂栧彿")]
+ public string ApiCode { get; set; }
+ /// <summary>
+ /// 鎺ュ彛鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎺ュ彛鍚嶇О")]
+ public string ApiName { get; set; }
+ /// <summary>
+ /// 鎺ュ彛鍦板潃
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鎺ュ彛鍦板潃")]
+ public string ApiAddress { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+ }
+}
--
Gitblit v1.9.3