From 4da42c12efde190b208f18b7dd51d3e89986837d Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期一, 07 四月 2025 11:19:16 +0800
Subject: [PATCH] 代码逻辑优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/JobsPart/SendAgvTask.cs | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 51 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/JobsPart/SendAgvTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/JobsPart/SendAgvTask.cs"
index 8e756df..62a8970 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/JobsPart/SendAgvTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/JobsPart/SendAgvTask.cs"
@@ -30,67 +30,70 @@
{
try
{
- Console.WriteLine("寮�濮� " + DateTime.Now);
- var agvtask = _taskService.GetTasks();
- if (agvtask != null)
+ List<Dt_Task> agvtasks = _taskService.GetTasks();
+ foreach (Dt_Task agvtask in agvtasks)
{
- AGVTaskPend pend = new AGVTaskPend();
- //pend.requestType = pend.requestType;
- //pend.accessId = pend.accessId;
- //pend.requestId = pend.requestId;
- Pend data = new Pend();
- TaskPend taskPend = new TaskPend();
+ if (agvtask != null)
{
- taskPend.taskNo = agvtask.TaskNum.ToString();
- taskPend.taskType = "MV";
- DateTime date = DateTime.Now;
- taskPend.taskDate = date.ToString("yyyy-MM-dd HH:mm:ss");
- taskPend.taskState = "00";
- taskPend.priority = "1";
- taskPend.wareCode = "W01";
- taskPend.docNo = "";
- taskPend.sku = "";
- taskPend.uom = "";
- taskPend.qty = 0;
- taskPend.trace = "";
- taskPend.fmLoc = agvtask.SourceAddress.ToString();
- taskPend.toLoc = agvtask.TargetAddress.ToString();
- taskPend.udf01 = "";
- taskPend.udf02 = "";
- }
- data.detail.Add(taskPend);
- pend.data = data;
+ AGVTaskPend pend = new AGVTaskPend();
+ //pend.requestType = pend.requestType;
+ //pend.accessId = pend.accessId;
+ //pend.requestId = pend.requestId;
+ Pend data = new Pend();
+ TaskPend taskPend = new TaskPend();
+ {
+ taskPend.taskNo = agvtask.TaskNum.ToString();
+ taskPend.taskType = "MV";
+ DateTime date = DateTime.Now;
+ taskPend.taskDate = date.ToString("yyyy-MM-dd HH:mm:ss");
+ taskPend.taskState = "00";
+ taskPend.priority = "1";
+ taskPend.wareCode = "W01";
+ taskPend.docNo = "";
+ taskPend.sku = "";
+ taskPend.uom = "";
+ taskPend.qty = 0;
+ taskPend.trace = "";
+ taskPend.fmLoc = agvtask.SourceAddress.ToString();
+ taskPend.toLoc = agvtask.TargetAddress.ToString();
+ taskPend.udf01 = "";
+ taskPend.udf02 = "";
+ }
+ data.detail.Add(taskPend);
+ pend.data = data;
- var time = new DateTimeOffset(DateTime.Now);
- long timestampStr = time.ToUnixTimeMilliseconds();//鏃堕棿鎴�
- string appkeystr = "appsalt=" + AGVopenApi.appsalt + "&appkey=" + AGVopenApi.appkey;
- string appkeyEcrypt = GetMD5Hex(appkeystr);
- string origin = appkeyEcrypt + "&appsecret=" + AGVopenApi.appsecret + "×tamp=" + timestampStr + "&uniquestr=" + timestampStr;
- string signstr = GetMD5Hex(origin);
- Dictionary<string, string> headers = new Dictionary<string, string>()
+ var time = new DateTimeOffset(DateTime.Now);
+ long timestampStr = time.ToUnixTimeMilliseconds();//鏃堕棿鎴�
+ string appkeystr = "appsalt=" + AGVopenApi.appsalt + "&appkey=" + AGVopenApi.appkey;
+ string appkeyEcrypt = GetMD5Hex(appkeystr);
+ string origin = appkeyEcrypt + "&appsecret=" + AGVopenApi.appsecret + "×tamp=" + timestampStr + "&uniquestr=" + timestampStr;
+ string signstr = GetMD5Hex(origin);
+ Dictionary<string, string> headers = new Dictionary<string, string>()
{
{"appkey",AGVopenApi.appkey },
{"timestamp",timestampStr.ToString() },
{"sign",signstr }
};
- string posy = JsonConvert.SerializeObject(pend);
- var respone = HttpHelper.Post(url, posy, headers: headers);
- var res = JsonConvert.DeserializeObject<WebResponseContent>(respone);
- if (res.Code == 200)
- {
- agvtask.Dispatchertime = DateTime.Now;
- agvtask.TaskStatus = AGVTaskStatusEnum.AGV_SendOut.ObjToInt();
- _taskService.UpdateData(agvtask);
- Thread.Sleep(1000);
- WriteLog.GetLog("鏃犱汉鍙夎溅浠诲姟涓嬪彂").Write("浠诲姟鍙凤細" + agvtask.TaskNum, "鏃犱汉鍙夎溅浠诲姟涓嬪彂");
- }
- else
- {
- //_unitOfWorkManage.RollbackTran();
- content = WebResponseContent.Instance.Error($"{res.Message}");
- WriteLog.GetLog("鏃犱汉鍙夎溅浠诲姟涓嬪彂澶辫触").Write("浠诲姟鍙凤細" + agvtask.TaskNum + '\n' + "澶辫触淇℃伅" + res.Message, "鏃犱汉鍙夎溅浠诲姟涓嬪彂澶辫触");
+ string posy = JsonConvert.SerializeObject(pend);
+ var respone = HttpHelper.Post(url, posy, headers: headers);
+ var res = JsonConvert.DeserializeObject<WebResponseContent>(respone);
+ if (res.Code == 200)
+ {
+ agvtask.Dispatchertime = DateTime.Now;
+ agvtask.TaskStatus = AGVTaskStatusEnum.AGV_SendOut.ObjToInt();
+ _taskService.UpdateData(agvtask);
+ Thread.Sleep(1000);
+ WriteLog.GetLog("鏃犱汉鍙夎溅浠诲姟涓嬪彂").Write("浠诲姟鍙凤細" + agvtask.TaskNum, "鏃犱汉鍙夎溅浠诲姟涓嬪彂");
+ }
+ else
+ {
+ //_unitOfWorkManage.RollbackTran();
+ content = WebResponseContent.Instance.Error($"{res.Message}");
+ WriteLog.GetLog("鏃犱汉鍙夎溅浠诲姟涓嬪彂澶辫触").Write("浠诲姟鍙凤細" + agvtask.TaskNum + '\n' + "澶辫触淇℃伅" + res.Message, "鏃犱汉鍙夎溅浠诲姟涓嬪彂澶辫触");
+ }
}
}
+
}
catch (Exception ex)
{
--
Gitblit v1.9.3