From 26f2e904ba44c900e6c61ebf15f97b063324f65b Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期三, 18 十二月 2024 16:59:37 +0800 Subject: [PATCH] 更新代码 --- 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2f4187bd-8911-48bb-9104-01eaf1e80abd.vsidx | 0 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvTaskModel.cs | 72 ++++++++++++ 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs | 73 ++++++++++++ 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/WIDESEA_External.csproj | 2 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ad14622-4b05-4fc3-abc0-0f0df9191418.vsidx | 0 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs | 17 ++ 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs | 56 +++++++++ /dev/null | 0 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs | 45 +++++++ 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/AGV/AgvResponseContent.cs | 28 ++++ 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs | 25 ++++ 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/efdfd79b-e601-448c-a03c-b67eceb80782.vsidx | 0 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c11191d7-3a6f-4b94-8bef-d18e80535b88.vsidx | 0 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Customer.cs | 2 14 files changed, 319 insertions(+), 1 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0f2de342-959b-4075-9776-5b88fd484124.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0f2de342-959b-4075-9776-5b88fd484124.vsidx" deleted file mode 100644 index 56db219..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0f2de342-959b-4075-9776-5b88fd484124.vsidx" +++ /dev/null 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/2f4187bd-8911-48bb-9104-01eaf1e80abd.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2f4187bd-8911-48bb-9104-01eaf1e80abd.vsidx" new file mode 100644 index 0000000..aed892f --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2f4187bd-8911-48bb-9104-01eaf1e80abd.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/4ad14622-4b05-4fc3-abc0-0f0df9191418.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ad14622-4b05-4fc3-abc0-0f0df9191418.vsidx" new file mode 100644 index 0000000..d12eba4 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ad14622-4b05-4fc3-abc0-0f0df9191418.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/4b9d13b5-464a-47d4-8dae-9937d5273cc6.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b9d13b5-464a-47d4-8dae-9937d5273cc6.vsidx" deleted file mode 100644 index b4217cb..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b9d13b5-464a-47d4-8dae-9937d5273cc6.vsidx" +++ /dev/null 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/5023b4f8-50f2-4301-b3ca-8d83fa478bdc.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5023b4f8-50f2-4301-b3ca-8d83fa478bdc.vsidx" deleted file mode 100644 index 6878405..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5023b4f8-50f2-4301-b3ca-8d83fa478bdc.vsidx" +++ /dev/null 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/9b53cffc-065b-40ee-a779-a99d0cdd29b8.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9b53cffc-065b-40ee-a779-a99d0cdd29b8.vsidx" deleted file mode 100644 index 08bc741..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9b53cffc-065b-40ee-a779-a99d0cdd29b8.vsidx" +++ /dev/null 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/bb9c5c98-5de4-43c8-8a36-34ad166b9c7a.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bb9c5c98-5de4-43c8-8a36-34ad166b9c7a.vsidx" deleted file mode 100644 index f1f7a5f..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bb9c5c98-5de4-43c8-8a36-34ad166b9c7a.vsidx" +++ /dev/null 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/c11191d7-3a6f-4b94-8bef-d18e80535b88.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c11191d7-3a6f-4b94-8bef-d18e80535b88.vsidx" new file mode 100644 index 0000000..1cd1e1e --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c11191d7-3a6f-4b94-8bef-d18e80535b88.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/d6701bb1-0090-4502-a2ca-a4e0726e92d8.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d6701bb1-0090-4502-a2ca-a4e0726e92d8.vsidx" deleted file mode 100644 index 6256f40..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d6701bb1-0090-4502-a2ca-a4e0726e92d8.vsidx" +++ /dev/null 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/efdfd79b-e601-448c-a03c-b67eceb80782.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/efdfd79b-e601-448c-a03c-b67eceb80782.vsidx" new file mode 100644 index 0000000..56af93e --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/efdfd79b-e601-448c-a03c-b67eceb80782.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/ffdc57a2-11a0-4784-96ef-3f73a9839656.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ffdc57a2-11a0-4784-96ef-3f73a9839656.vsidx" deleted file mode 100644 index 7bbc7ae..0000000 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ffdc57a2-11a0-4784-96ef-3f73a9839656.vsidx" +++ /dev/null Binary files differ diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs" new file mode 100644 index 0000000..347bd94 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_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 WIDESEA_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/WMS/WIDESEA_WMSServer/WIDESEA_DTO/AGV/AgvResponseContent.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/AGV/AgvResponseContent.cs" new file mode 100644 index 0000000..edeb942 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_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/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs" new file mode 100644 index 0000000..979dd92 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs" @@ -0,0 +1,73 @@ +锘縰sing Autofac.Core; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Common.APIEnum; +using WIDESEA_Core; +using WIDESEA_Core.Helper; +using WIDESEA_DTO.AGV; +using WIDESEA_External.Model; + +namespace WIDESEA_External.AGVService +{ + public class InvokeAGVService : IInvokeAGVService + { + public static IInvokeAGVService Intance + { + get { return App.GetService<IInvokeAGVService>(); } + } + /// <summary> + /// 鍙戦�丄GV浠诲姟 + /// </summary> + /// <param name="taskModel"></param> + /// <returns></returns> + public WebResponseContent SendAgvTask(AgvTaskModel 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; + } + public WebResponseContent AGVSecureReply(AgvSecureModel secureModel) + { + WebResponseContent content = new WebResponseContent(); + try + { + string apiAddress = AppSettings.Get(APIEnum.AGVSecureReply.ToString()); + string response = HttpHelper.Post(apiAddress, secureModel.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; + } + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs" new file mode 100644 index 0000000..06401f2 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs" @@ -0,0 +1,25 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WIDESEA_Core; +using WIDESEA_External.Model; + +namespace WIDESEA_External.AGVService +{ + public interface IInvokeAGVService:IDependency + { + /// <summary> + /// 鍙戦�丄GV浠诲姟 + /// </summary> + /// <param name="taskModel"></param> + /// <returns></returns> + WebResponseContent SendAgvTask(AgvTaskModel taskModel); + /// <summary> + /// AGV瀹夊叏淇″彿鍥炲 + /// </summary> + /// <returns></returns> + WebResponseContent AGVSecureReply(AgvSecureModel secureModel); + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs" new file mode 100644 index 0000000..315c7ff --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs" @@ -0,0 +1,56 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_External.Model +{ + public class AgvSecureModel + { + /// <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:浠h〃 nextPositionCode鏄竴涓綅缃� + /// 02:浠h〃 nextPositionCode鏄竴涓瓥鐣� + /// </summary> + public object nextPositionCode { get; set; } + } +} diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvTaskModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvTaskModel.cs" new file mode 100644 index 0000000..de9f3a9 --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvTaskModel.cs" @@ -0,0 +1,72 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WIDESEA_External.Model +{ + /// <summary> + /// AGV浠诲姟 + /// </summary> + public class AgvTaskModel + { + /// <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/WMS/WIDESEA_WMSServer/WIDESEA_External/WIDESEA_External.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/WIDESEA_External.csproj" index e096efb..d2229c6 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/WIDESEA_External.csproj" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/WIDESEA_External.csproj" @@ -7,7 +7,9 @@ </PropertyGroup> <ItemGroup> + <ProjectReference Include="..\WIDESEA_Common\WIDESEA_Common.csproj" /> <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" /> + <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" /> </ItemGroup> </Project> diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Customer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Customer.cs" index ec7b638..172481c 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Customer.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Customer.cs" @@ -6,7 +6,7 @@ using System.Threading.Tasks; using WIDESEA_Core.DB.Models; -namespace WIDESEA_Model.Models.Basic +namespace WIDESEA_Model.Models { [SugarTable(nameof(Dt_Customer),"瀹㈡埛淇℃伅")] public class Dt_Customer : BaseEntity diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs" new file mode 100644 index 0000000..fdbc47f --- /dev/null +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs" @@ -0,0 +1,45 @@ +锘縰sing Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using WIDESEA_Common.CommonEnum; +using WIDESEA_Common.MaterielEnum; +using WIDESEA_Common.OrderEnum; +using WIDESEA_Core; +using WIDESEA_Core.Attributes; +using WIDESEA_Core.Helper; +using WIDESEA_DTO; +using WIDESEA_DTO.Basic; +using WIDESEA_DTO.ERP; +using WIDESEA_External.AGVService; +using WIDESEA_External.ERPService; +using WIDESEA_External.Model; +using WIDESEA_IBasicRepository; +using WIDESEA_IBasicService; +using WIDESEA_IInboundRepository; +using WIDESEA_IInboundService; +using WIDESEA_IOutboundService; +using WIDESEA_Model.Models; +using static WIDESEA_DTO.ErpResponseContent; + +namespace WIDESEA_WMSServer.Controllers.ERP +{ + [Route("api/Agv")] + [ApiController] + public class AgvController : ControllerBase + { + public AgvController() + { + } + /// <summary> + /// 鍙戦�丄GV浠诲姟 + /// </summary> + /// <param name="taskModel"></param> + /// <returns></returns> + [HttpPost,Route("SendAgvTask"),AllowAnonymous] + public WebResponseContent SendAgvTask([FromBody] AgvTaskModel taskModel) + { + return InvokeAGVService.Intance.SendAgvTask(taskModel); + } + } +} -- Gitblit v1.9.3