From 6f3ed7ad5ff997a5515d831d1cfb377e3dcbb72f Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期二, 10 六月 2025 12:50:05 +0800 Subject: [PATCH] 1 --- CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs index 2323fa3..499baeb 100644 --- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs +++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs @@ -1082,37 +1082,36 @@ #region 鐏鍑哄簱 - public WebResponseContent EmergencyTask(object obj) + public WebResponseContent EmergencyTask(Object obj) { WebResponseContent content = new WebResponseContent(); var emergencyTask = new DTSEmergencyTask(); try { emergencyTask = JsonConvert.DeserializeObject<DTSEmergencyTask>(obj.ToString()); - if (emergencyTask == null) throw new Exception("鐏鍙傛暟涓虹┖"); - string[] strings = emergencyTask.LocationCode.Split("-"); - - string[] Roadways = strings[0].Select(x => x.ToString()).ToArray(); - string Roadway = string.Empty; - switch (Roadways[0]) - { - case "J": - Roadway = "JZSC" + Roadways[1]; - break; - case "G": - Roadway = "GWSC" + Roadways[1]; - break; - case "C": - Roadway = "CWSC" + Roadways[1]; - break; - default: throw new Exception("鏈瘑鍒簱浣嶇紪鐮�"); - } - + string Roadway = strings[0]; + //switch (Roadways[0]) + //{ + // case "J": + // Roadway = "JZSC" + Roadways[1]; + // break; + // case "G": + // Roadway = "GWSC" + Roadways[1]; + // break; + // case "C": + // Roadway = "CWSC" + Roadways[1]; + // break; + // default: throw new Exception("鏈瘑鍒簱浣嶇紪鐮�"); + //} + int Row = Convert.ToInt16(strings[1]); + int Column = Convert.ToInt16(strings[2]); + int Layer = Convert.ToInt16(strings[3]); + if (!strings[0].Contains("SC")) throw new Exception("鏈煡搴撳尯"); for (int i = 0; i < 2; i++) { - DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Convert.ToInt16(strings[1]) && x.Column == Convert.ToInt16(strings[2]) && x.Layer == (i == 0 ? Convert.ToInt16(strings[3]) * 2 - 1 : Convert.ToInt16(strings[3]) * 2) && x.RoadwayNo == Roadway); + DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Row && x.Column == Column && x.Layer == (i == 0 ? Layer - 1 : Layer) && x.RoadwayNo == Roadway); if (locationInfo == null) { throw new Exception("鏈煡搴撲綅"); @@ -1181,7 +1180,7 @@ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress); var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue; - var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue; + var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue; if (ReceiveByWMSTask == null || ipAddress == null) { throw new Exception("WMS IP 鏈厤缃�"); -- Gitblit v1.9.3