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编码
+
+        /// <summary>
+        /// 对字符串进行Base64编码
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns>string</returns>
+        public static string Base64EnCode(string source)
+        {
+            byte[] bytes = UTF8Encoding.UTF8.GetBytes(source);
+            return Convert.ToBase64String(bytes);
+        }
+
+        #endregion
+
+        #region 对字符串进行Base64解码
+
+        /// <summary>
+        /// 对字符串进行Base64解码
+        /// </summary>
+        /// <param name="source"></param>
+        /// <returns>string</returns>
+        public static string Base64Decode(string source)
+        {
+            byte[] bytes = Convert.FromBase64String(source);
+            return UTF8Encoding.UTF8.GetString(bytes);
+        }
+
+        #endregion
     }
     #endregion
 }

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+"'";
             }

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<CancleHeader> 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<agvBindHeader> 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
 }

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";
+            string ss = "12345678test12345678";
-            if (sku.Substring(0, 1) == "2" && sku.Substring(1, 1) != "5")
+            string md= EncryptHelper.EncryptMD5By32(ss);
-            {
+           string b64= EncryptHelper.Base64EnCode(md).ToUpper();
-                if (sku.Length >= 7)
+            string ddd =  HttpUtility.UrlEncode(b64);
-                {
-                    sku = sku.Substring(1, 6);
-                }
-            }
         }
     }
 }

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);

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;
+            string resinfo = "{\"Response\":{\"return\":" + JsonHelper.SerializeObject(res) + " } }";
-            retModel.Response = respModel;
+            logBLL.InsertLog("生成任务单", "agvPutTask", "/api/TaskAPI/agvPutTask", JsonHelper.SerializeObject(model), resinfo, 0, res.returnDesc, DateTime.Now);
-            logBLL.InsertLog("生成任务单", "agvPutTask", "/api/TaskAPI/agvPutTask", JsonHelper.SerializeObject(model), JsonHelper.SerializeObject(retModel), 0, res.returnDesc, DateTime.Now);
+            return resinfo;  
-            return retModel;
         }
 
         #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;
+        }
     }
 }

Epost.TestToolsWeb/Epost.DPS.csproj.user

@@ -11,7 +11,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user

@@ -7,7 +7,7 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <_PublishTargetUrl>D:\驿传\zhuyou_wcs</_PublishTargetUrl>
-    <History>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;</History>
+    <History>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;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -33,19 +33,19 @@
       <publishTime>04/04/2018 15:45:12</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>11/22/2024 17:47:09</publishTime>
+      <publishTime>11/26/2024 17:03:14</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>11/22/2024 17:47:09</publishTime>
+      <publishTime>11/26/2024 17:03:14</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>11/22/2024 17:46:58</publishTime>
+      <publishTime>11/26/2024 10:21:58</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>11/22/2024 17:46:58</publishTime>
+      <publishTime>11/26/2024 10:21:58</publishTime>
     </File>
     <File Include="bin/ComposerSDK.dll">
       <publishTime>04/29/2020 16:50:14</publishTime>
@@ -63,31 +63,31 @@
       <publishTime>10/23/2017 13:15:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.dll">
-      <publishTime>11/22/2024 17:46:59</publishTime>
+      <publishTime>11/26/2024 10:21:58</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>11/22/2024 17:46:59</publishTime>
+      <publishTime>11/26/2024 10:21:58</publishTime>
     </File>
     <File Include="bin/Epost.BLL.XmlSerializers.dll">
       <publishTime>08/26/2020 18:09:48</publishTime>
     </File>
     <File Include="bin/Epost.DAL.dll">
-      <publishTime>11/22/2024 17:46:59</publishTime>
+      <publishTime>11/26/2024 10:21:58</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>11/22/2024 17:46:59</publishTime>
+      <publishTime>11/26/2024 10:21:58</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>11/22/2024 17:47:02</publishTime>
+      <publishTime>11/26/2024 17:02:58</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>11/22/2024 17:47:02</publishTime>
+      <publishTime>11/26/2024 17:02:58</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
-      <publishTime>11/22/2024 17:46:58</publishTime>
+      <publishTime>11/26/2024 10:21:57</publishTime>
     </File>
     <File Include="bin/Epost.Model.pdb">
-      <publishTime>11/22/2024 17:46:58</publishTime>
+      <publishTime>11/26/2024 10:21:57</publishTime>
     </File>
     <File Include="bin/Epost.TestToolsWeb.dll">
       <publishTime>09/06/2018 11:57:11</publishTime>
@@ -5652,7 +5652,7 @@
       <publishTime>05/30/2022 16:58:47</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>11/22/2024 17:47:03</publishTime>
+      <publishTime>11/26/2024 17:03:00</publishTime>
     </File>
     <File Include="Scripts/ai.0.22.9-build00167.js">
       <publishTime>04/04/2018 15:45:12</publishTime>
@@ -7572,7 +7572,7 @@
       <publishTime>07/04/2022 14:22:38</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>11/22/2024 16:17:44</publishTime>
+      <publishTime>11/26/2024 10:07:59</publishTime>
     </File>
   </ItemGroup>
 </Project>