From a765da90e5ee63e04d2d8460a5ad1ebd0e8eb4db Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 15 七月 2024 21:43:59 +0800
Subject: [PATCH] 工单处理
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/AGVServer.cs | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/AGVServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/AGVServer.cs"
index d332a4a..8c00e29 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/AGVServer.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/AGVServer.cs"
@@ -6,6 +6,7 @@
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Comm;
using WIDESEA_Comm.LogInfo;
using WIDESEA_Common;
using WIDESEA_Core.EFDbContext;
@@ -29,22 +30,23 @@
RequestTask requestTask = new RequestTask();
string postJson = string.Empty;
string report = string.Empty;
- try
+
+ VOLContext Context = new VOLContext();
+ Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
+ var agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
+ .ThenBy(x => x.agv_createtime).ToList();
+ if (agv_tasks.Count < 1)
+ agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && !string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
+ .ThenBy(x => x.agv_createtime).ToList();
+ if (agv_tasks.Count > 0)
{
- VOLContext Context = new VOLContext();
- Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
- var agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
- .ThenBy(x => x.agv_createtime).ToList();
- if (agv_tasks.Count < 1)
- agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && !string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
- .ThenBy(x => x.agv_createtime).ToList();
- if (agv_tasks.Count > 0)
+ foreach (var agv_task in agv_tasks)
{
- foreach (var agv_task in agv_tasks)
+ try
{
var Materiel = QueryData.QueryMateriel(agv_task.agv_materielid);//鏌ユ壘杞﹁疆鏁版嵁
var Materiel1 = QueryData.QueryMateriel1(agv_task.agv_materielid);//鏌ユ壘杞﹁疆鏁版嵁
- if (Materiel == null && Materiel1 == null && !agv_task.agv_tasktype.Contains("TaskType_EmptyPallet"))
+ if (Materiel == null && Materiel1 == null && !agv_task.agv_tasktype.Contains(AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()))
{
agv_task.agv_remark = "鏈幏鍙栧埌褰撳墠浠诲姟鐨勮溅杞暟鎹�";
agvtaskRepository.Update(agv_task, true);
@@ -56,8 +58,8 @@
requestTask.Material = agv_task.agv_materielid;
requestTask.Grade = agv_task.agv_grade;
requestTask.Quantity = agv_task.agv_qty;
- requestTask.TrayType = agv_task.agv_Traytype.Contains("Small") ? 1 : 2;//
- requestTask.TaskType = agv_task.agv_tasktype.Contains("TaskType_EmptyPallet") ? 2 : 1;//
+ requestTask.TrayType = agv_task.agv_Traytype.Contains(TrayTypeEnum.SmallTray.ToString()) ? 1 : 2;//
+ requestTask.TaskType = agv_task.agv_tasktype.Contains(AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()) ? 2 : 1;//
#region 缁�/鎷嗙┖鐩樹换鍔￠渶澶勭悊
requestTask.StarQuantity = agv_task.StarQuantity;
requestTask.EndQuantity = agv_task.EndQuantity;
@@ -74,32 +76,34 @@
requestTask.H = Materiel == null ? Materiel1.h : Materiel.h;
}
postJson = JsonConvert.SerializeObject(requestTask);
- report = Request.RequestData(postJson, "http://192.168.12.204:5000/api/TaskCreat/CreatTask");
- respone = JsonConvert.DeserializeObject<Respone>(report);
- if (respone.Success)
- {
- agv_task.agv_taskstate = AGVTaskStateEnum.SendOut.ToString();
- agv_task.agv_realesstime = DateTime.Now;
- agvtaskRepository.Update(agv_task, true);
- WriteWMSLog.LogAdd(requestTask.TASK_NO, "鎴愬姛 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
- }
- else
- {
- agv_task.agv_remark = respone.Msg;
- var task = agvtaskRepository.Find(x => x.agv_tasknum == agv_task.agv_tasknum && x.agv_remark == agv_task.agv_remark).FirstOrDefault();//.Exists
- if (task == null)
- agvtaskRepository.Update(agv_task, true);
- WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
- }
+ //report = Request.RequestData(postJson, AGVAPIAddress.IPAddress_AGVTask);//"http://192.168.12.204:5000/api/TaskCreat/CreatTask"
+ RequestAGV(agvtaskRepository, agv_task, postJson, AGVAPIAddress.IPAddress_AGVTask);
+ //respone = JsonConvert.DeserializeObject<Respone>(report);
+ //if (respone.Success)
+ //{
+ // agv_task.agv_taskstate = AGVTaskStateEnum.SendOut.ToString();
+ // agv_task.agv_realesstime = DateTime.Now;
+ // agvtaskRepository.Update(agv_task, true);
+ // WriteWMSLog.LogAdd(requestTask.TASK_NO, "鎴愬姛 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
+ //}
+ //else
+ //{
+ // agv_task.agv_remark = respone.Msg;
+ // var task = agvtaskRepository.Find(x => x.agv_tasknum == agv_task.agv_tasknum && x.agv_remark == agv_task.agv_remark).FirstOrDefault();//.Exists
+ // if (task == null)
+ // agvtaskRepository.Update(agv_task, true);
+ // WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
+ //}
+ }
+ catch (Exception ex)
+ {
+ respone.Success = false;
+ respone.Msg = ex.Message;
+ WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
}
}
}
- catch (Exception ex)
- {
- respone.Success = false;
- respone.Msg = ex.Message;
- WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
- }
+
}
}
}
--
Gitblit v1.9.3