From 90ec40a018b15475f111ead9796a2409702129f4 Mon Sep 17 00:00:00 2001 From: jl Date: Wed, 27 Nov 2024 10:39:18 +0800 Subject: [PATCH] --- Common/EncryptHelper.cs | 32 ++++- Epost.DAL/InboundOrdersDAL.cs | 2 +- Epost.Model/TaskModel.cs | 62 +++++++++ .../Controllers/UnitTest1.cs | 13 +- .../Controllers/AgvTaskApiController.cs | 10 +- .../Controllers/TaskAPIController.cs | 119 ++++++++++++++++-- Epost.TestToolsWeb/Epost.DPS.csproj.user | 2 +- .../PublishProfiles/Toolsweb.pubxml.user | 30 ++--- 8 files changed, 233 insertions(+), 37 deletions(-) diff --git a/Common/EncryptHelper.cs b/Common/EncryptHelper.cs index 12a2a04..a528246 100644 --- a/Common/EncryptHelper.cs +++ b/Common/EncryptHelper.cs @@ -53,7 +53,7 @@ namespace Epost.Common sb.Append(b.ToString("x2")); } //所有字符转为大写 - return sb.ToString().ToUpper(); + return sb.ToString(); } #endregion @@ -232,6 +232,36 @@ namespace Epost.Common #endregion #endregion + + #region 对字符串进行Base64编码 + + /// + /// 对字符串进行Base64编码 + /// + /// + /// string + public static string Base64EnCode(string source) + { + byte[] bytes = UTF8Encoding.UTF8.GetBytes(source); + return Convert.ToBase64String(bytes); + } + + #endregion + + #region 对字符串进行Base64解码 + + /// + /// 对字符串进行Base64解码 + /// + /// + /// string + public static string Base64Decode(string source) + { + byte[] bytes = Convert.FromBase64String(source); + return UTF8Encoding.UTF8.GetString(bytes); + } + + #endregion } #endregion } diff --git a/Epost.DAL/InboundOrdersDAL.cs b/Epost.DAL/InboundOrdersDAL.cs index 76a90ac..bbb4aa5 100644 --- a/Epost.DAL/InboundOrdersDAL.cs +++ b/Epost.DAL/InboundOrdersDAL.cs @@ -92,7 +92,7 @@ namespace Epost.DAL public bool UpInOrderList(string id,string state,string data) { string upstr = string.Empty; - if (string.IsNullOrEmpty(data)) + if (!string.IsNullOrEmpty(data)) { upstr = ",agvid='"+data+"'"; } diff --git a/Epost.Model/TaskModel.cs b/Epost.Model/TaskModel.cs index 87939cf..cea3a06 100644 --- a/Epost.Model/TaskModel.cs +++ b/Epost.Model/TaskModel.cs @@ -93,4 +93,66 @@ namespace Epost.Model } #endregion + + #region 取消任务 + + public class AgvCancleModel + { + public CancleData data { get; set; } + } + + public class CancleData + { + public List header { get; set; } + } + + public class CancleHeader + { + public string warehouseId { get; set; } + public string groupTaskId { get; set; } + public string palletId { get; set; } + public string userId { get; set; } + public string userName { get; set; } + public string notes { get; set; } + public string reason { get; set; } + public string udf01 { get; set; } + public string udf02 { get; set; } + public string udf03 { get; set; } + public string udf04 { get; set; } + public string udf05 { get; set; } + public string udf06 { get; set; } + } + + #endregion + + #region 绑定解绑 + + public class agvBindPodModel + { + public agvBindData data { get; set; } + } + + public class agvBindData + { + public List header { get; set; } + } + + public class agvBindHeader + { + public string warehouseId { get; set; } + public string indBind { get; set; } + public string palletId { get; set; } + public string positionCode { get; set; } + public string userId { get; set; } + public string userName { get; set; } + public string notes { get; set; } + public string udf01 { get; set; } + public string udf02 { get; set; } + public string udf03 { get; set; } + public string udf04 { get; set; } + public string udf05 { get; set; } + public string udf06 { get; set; } + } + + #endregion } diff --git a/Epost.TestToolsWeb.Tests/Controllers/UnitTest1.cs b/Epost.TestToolsWeb.Tests/Controllers/UnitTest1.cs index a14d123..3a710e1 100644 --- a/Epost.TestToolsWeb.Tests/Controllers/UnitTest1.cs +++ b/Epost.TestToolsWeb.Tests/Controllers/UnitTest1.cs @@ -9,6 +9,7 @@ using Epost.Common; using System.Web.Helpers; using System.Data; using System.Configuration; +using System.Web; namespace Epost.TestToolsWeb.Tests.Controllers { @@ -19,14 +20,10 @@ namespace Epost.TestToolsWeb.Tests.Controllers [TestMethod] public void d() { - string sku = "211100"; - if (sku.Substring(0, 1) == "2" && sku.Substring(1, 1) != "5") - { - if (sku.Length >= 7) - { - sku = sku.Substring(1, 6); - } - } + string ss = "12345678test12345678"; + string md= EncryptHelper.EncryptMD5By32(ss); + string b64= EncryptHelper.Base64EnCode(md).ToUpper(); + string ddd = HttpUtility.UrlEncode(b64); } } } diff --git a/Epost.TestToolsWeb/Controllers/AgvTaskApiController.cs b/Epost.TestToolsWeb/Controllers/AgvTaskApiController.cs index 611e9e7..a468ae0 100644 --- a/Epost.TestToolsWeb/Controllers/AgvTaskApiController.cs +++ b/Epost.TestToolsWeb/Controllers/AgvTaskApiController.cs @@ -28,17 +28,19 @@ namespace Epost.DPS.Controllers string state = string.Empty; if (data.method == "start") { - state = "2";//任务开始启动 + state = "1";//任务开始启动 } else if (data.method == "outbin") { - state = "3";//走出储位 + state = "2";//走出储位 } else if (data.method == "end") { - state = "4"; + state = "3"; //更新任务已完成 } - else if (data.method == "cancel") { } + else if (data.method == "cancel") { + state = "88"; + } else { } inboundBLL.UpInOrderListByAgvid(data.taskCode,state); diff --git a/Epost.TestToolsWeb/Controllers/TaskAPIController.cs b/Epost.TestToolsWeb/Controllers/TaskAPIController.cs index 0811331..d3c6659 100644 --- a/Epost.TestToolsWeb/Controllers/TaskAPIController.cs +++ b/Epost.TestToolsWeb/Controllers/TaskAPIController.cs @@ -19,10 +19,9 @@ namespace Epost.DPS.Controllers Sys_operate_logBLL logBLL = new Sys_operate_logBLL(); [Route("agvPutTask")] [HttpPost] - public RetMesModel agvPutTask([FromBody] TaskModel model) + public string agvPutTask([FromBody] TaskModel model) { - RetMesModel retModel = new RetMesModel(); - ResponseModel respModel = new ResponseModel(); + ReturnRes res = new ReturnRes(); try { @@ -136,10 +135,9 @@ namespace Epost.DPS.Controllers res.returnCode = "0001"; res.returnFlag = "0"; } - respModel._return = res; - retModel.Response = respModel; - logBLL.InsertLog("生成任务单", "agvPutTask", "/api/TaskAPI/agvPutTask", JsonHelper.SerializeObject(model), JsonHelper.SerializeObject(retModel), 0, res.returnDesc, DateTime.Now); - return retModel; + string resinfo = "{\"Response\":{\"return\":" + JsonHelper.SerializeObject(res) + " } }"; + logBLL.InsertLog("生成任务单", "agvPutTask", "/api/TaskAPI/agvPutTask", JsonHelper.SerializeObject(model), resinfo, 0, res.returnDesc, DateTime.Now); + return resinfo; } #region 添加托盘明细 @@ -208,8 +206,115 @@ namespace Epost.DPS.Controllers + + [Route("agvCancleTask")] + [HttpPost] + public string agvCancleTask([FromBody] AgvCancleModel model) + { + + ReturnRes res = new ReturnRes(); + try + { + LogHelper.WriteLogInfo("请求报文" + JsonHelper.SerializeObject(model)); + + if (model.data.header.Any()) + { + foreach (CancleHeader item in model.data.header) + { + if (string.IsNullOrEmpty(item.groupTaskId) || string.IsNullOrEmpty(item.palletId)) + { + res.returnDesc = "请求参数错误！"; + res.returnCode = "0001"; + res.returnFlag = "0"; + } + else + { + DataTable orderdt = inOrderBLL.GetInOrderList(" and groupTaskId='"+item.groupTaskId+ "' and palletId='"+ item.palletId + "' and state=0"); + if (orderdt != null && orderdt.Rows.Count > 0) + { + + res.returnCode = "0000"; + res.returnDesc = "成功！"; + res.returnFlag = "1"; + + + } + else { + res.returnDesc = "订单不存在/订单已执行！"; + res.returnCode = "0001"; + res.returnFlag = "0"; + } + + + + } + + + } + } + + } + catch (Exception ex) + { + LogHelper.WriteLogInfo("agvCancleTask异常：" + ex.ToString(), LogHelper.Log_Type.ERROR); + res.returnDesc = "请求接口异常！"; + res.returnCode = "0001"; + res.returnFlag = "0"; + } + string resinfo = "{\"Response\":{\"return\":" + JsonHelper.SerializeObject(res) + " } }"; + logBLL.InsertLog("取消任务接口", "agvCancleTask", "/api/TaskAPI/agvCancleTask", JsonHelper.SerializeObject(model), resinfo, 0, res.returnDesc, DateTime.Now); + return resinfo; + } + [Route("agvBindPodAndBerth")] + [HttpPost] + public string agvBindPodAndBerth([FromBody] agvBindPodModel model) + { + + ReturnRes res = new ReturnRes(); + try + { + LogHelper.WriteLogInfo("请求报文" + JsonHelper.SerializeObject(model)); + + if (model.data.header.Any()) + { + foreach (agvBindHeader item in model.data.header) + { + if (string.IsNullOrEmpty(item.indBind) || string.IsNullOrEmpty(item.palletId) || string.IsNullOrEmpty(item.positionCode)) + { + res.returnDesc = "请求参数错误！"; + res.returnCode = "0001"; + res.returnFlag = "0"; + } + else + { + + + res.returnCode = "0000"; + res.returnDesc = "成功！"; + res.returnFlag = "1"; + + + } + + + } + } + + } + catch (Exception ex) + { + LogHelper.WriteLogInfo("agvBindPodAndBerth异常：" + ex.ToString(), LogHelper.Log_Type.ERROR); + res.returnDesc = "请求接口异常！"; + res.returnCode = "0001"; + res.returnFlag = "0"; + } + + string resinfo = "{\"Response\":{\"return\":" + JsonHelper.SerializeObject(res) + " } }"; + logBLL.InsertLog("agv绑定解绑接口", "agvBindPodAndBerth", "/api/TaskAPI/agvBindPodAndBerth", JsonHelper.SerializeObject(model), resinfo, 0, res.returnDesc, DateTime.Now); + return resinfo; + } } } diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user index 2eaafac..4d10158 100644 --- a/Epost.TestToolsWeb/Epost.DPS.csproj.user +++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user @@ -11,7 +11,7 @@ False 600 E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml - Debug|Any CPU + Release|Any CPU diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index ea819e5..cc9d864 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\zhuyou_wcs - True|2024-11-22T06:00:39.7806019Z;False|2024-11-04T17:48:25.2781696+08:00;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00; + True|2024-11-26T02:08:16.7734518Z;True|2024-11-22T14:00:39.7806019+08:00;False|2024-11-04T17:48:25.2781696+08:00;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00; @@ -33,19 +33,19 @@ 04/04/2018 15:45:12 - 11/22/2024 17:47:09 + 11/26/2024 17:03:14 - 11/22/2024 17:47:09 + 11/26/2024 17:03:14 02/24/2020 15:29:24 - 11/22/2024 17:46:58 + 11/26/2024 10:21:58 - 11/22/2024 17:46:58 + 11/26/2024 10:21:58 04/29/2020 16:50:14 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 11/22/2024 17:46:59 + 11/26/2024 10:21:58 - 11/22/2024 17:46:59 + 11/26/2024 10:21:58 08/26/2020 18:09:48 - 11/22/2024 17:46:59 + 11/26/2024 10:21:58 - 11/22/2024 17:46:59 + 11/26/2024 10:21:58 - 11/22/2024 17:47:02 + 11/26/2024 17:02:58 - 11/22/2024 17:47:02 + 11/26/2024 17:02:58 - 11/22/2024 17:46:58 + 11/26/2024 10:21:57 - 11/22/2024 17:46:58 + 11/26/2024 10:21:57 09/06/2018 11:57:11 @@ -5652,7 +5652,7 @@ 05/30/2022 16:58:47 - 11/22/2024 17:47:03 + 11/26/2024 17:03:00 04/04/2018 15:45:12 @@ -7572,7 +7572,7 @@ 07/04/2022 14:22:38 - 11/22/2024 16:17:44 + 11/26/2024 10:07:59 \ No newline at end of file