From 13137e3acdb759d1541f754fba81c616f418e2a1 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 26 一月 2024 09:57:16 +0800
Subject: [PATCH] 添加车轮数据、AGV接口等
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs | 60 ++++++++++++++++--------------------------------------------
1 files changed, 16 insertions(+), 44 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
index a090f04..80e2015 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
@@ -47,30 +47,34 @@
if (task.agv_taskstate == StateName)
{
respone.success = 2;
- respone.Message = tasteInfo.TASK_NO + "锛氶噸澶嶈皟鐢紝浠诲姟鐘舵�佷负锛�" + tasteInfo.TASK_State;
- return respone;
+ throw new Exception(tasteInfo.TASK_NO + "锛氶噸澶嶈皟鐢紝浠诲姟鐘舵�佷负锛�" + tasteInfo.TASK_State);
}
- if (tasteInfo.TASK_State == 1)
+ if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Executing)
task.agv_executingBeginTime = DateTime.Now;
- if (tasteInfo.TASK_State == 2)
+ else if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Complete)
task.agv_executingEndTime = DateTime.Now;
- if (tasteInfo.TASK_State == 3)
+ else if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Executing1)
task.agv_completeBeginTime = DateTime.Now;
task.agv_taskstate = StateName;
var count = repository.Update(task, true);
if (count < 1)
throw new Exception("浠诲姟鐘舵�佹洿鏂板け璐ワ紒浠诲姟ID锛�" + tasteInfo.TASK_NO + "锛涗换鍔＄姸鎬侊細" + tasteInfo.TASK_State);
- if (tasteInfo.TASK_State == 4)
+ if (tasteInfo.TASK_State == (int)AGVTaskStateEnum.Complete1)
+ {
Task.AddHtyTask(task);
-
-
+ Task.Updateinventory(task);
+ Task.AutoUpdateHCJState(task);
+ }
}
catch (Exception ex)
{
respone.success = 3;
respone.Message = ex.Message;
}
- WriteWMSLog.LogAdd(tasteInfo.TASK_NO, respone.success == 1 ? "鎴愬姛 " : "澶辫触", "WMS", "AGV", json, JsonConvert.SerializeObject(respone), "AGV鍙嶉浠诲姟鐘舵��", "UpdateTaskState", respone.Message);
+ finally
+ {
+ WriteWMSLog.LogAdd(tasteInfo.TASK_NO, respone.success == 1 ? "鎴愬姛 " : "澶辫触", "WMS", "AGV", json, JsonConvert.SerializeObject(respone), "AGV鍙嶉浠诲姟鐘舵��", "UpdateTaskState", respone.Message);
+ }
return respone;
}
@@ -87,6 +91,7 @@
RequestTask requestTask = new RequestTask();
string postJson = string.Empty;
string report = string.Empty;
+ string url = "http://127.0.0.1/api/TaskCreat/CreatTask";
try
{
requestTask.TASK_NO = agvtask.agv_tasknum;
@@ -94,8 +99,9 @@
requestTask.TO_POSITION = agvtask.agv_toaddress;
requestTask.Material = agvtask.agv_materielid;
requestTask.Priority = agvtask.agv_grade;
+ requestTask.agv_qty = agvtask.agv_qty;
postJson = JsonConvert.SerializeObject(requestTask);
- report = RequestData(postJson);
+ report = Request.RequestData(postJson, url);
respone = JsonConvert.DeserializeObject<AGVRespone>(report);
if (respone.success != 1)
throw new Exception(respone.Message);
@@ -108,40 +114,6 @@
respone.Message = ex.Message;
}
WriteWMSLog.LogAdd(requestTask.TASK_NO, respone.success == 1 ? "鎴愬姛 " : "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Message);
- }
-
- /// <summary>
- /// post璇锋眰
- /// </summary>
- /// <param name="postData">鍙傛暟</param>
- /// <param name="address">璺緞</param>
- /// <returns></returns>
- public static string RequestData(string postData, string address = "")
- {
- string reponse = string.Empty;
- try
- {
- //string tmp = "";
- //if (null != postData)
- // tmp = JsonConvert.SerializeObject(postData);
- byte[] param = Encoding.UTF8.GetBytes(postData);
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(address);
- request.Method = "POST";
- request.ContentType = "application/json";
- request.GetRequestStream().Write(param, 0, param.Length);
- using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
- {
- Stream stream = response.GetResponseStream();
- StreamReader streamReader = new StreamReader(stream);
- string webResponse = streamReader.ReadToEnd();
- reponse = webResponse;
- }
- }
- catch (Exception ex)
- {
- reponse = ex.Message;
- }
- return reponse;
}
}
}
--
Gitblit v1.9.3