From db6156a92cc59467bde608a00c76952ebc75e488 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 05 三月 2024 09:51:05 +0800
Subject: [PATCH] 优化代码
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/AGVServer.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 cc86be5..e5d6087 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"
@@ -31,17 +31,18 @@
{
try
{
+ //var task = freeDB.Select<dt_agvtask>().Where(x => x.agv_taskstate == "Create").First();
var agv_task = freeDB.Select<dt_agvtask>()
- .Where(t => t.agv_taskstate == AGVTaskStateEnum.Create.ToString()
- && (t.agv_tasktype == "TaskType_Outbound" || t.agv_tasktype == "TaskType_Inbound" || t.agv_tasktype == "TaskType_AOutbound")
+ .Where(t => t.agv_taskstate == "Create"
+ //&& (t.agv_tasktype == "TaskType_Outbound" || t.agv_tasktype == "TaskType_Inbound" || t.agv_tasktype == "TaskType_OutsourceOutbound")
&& string.IsNullOrEmpty(t.agv_remark))
.OrderByDescending(t => t.agv_grade)
.OrderBy(t => t.agv_createtime)
.First();
if (agv_task == null)
agv_task = freeDB.Select<dt_agvtask>()
- .Where(t => t.agv_taskstate == AGVTaskStateEnum.Create.ToString()
- && (t.agv_tasktype == "TaskType_Outbound" || t.agv_tasktype == "TaskType_Inbound" || t.agv_tasktype == "TaskType_AOutbound")
+ .Where(t => t.agv_taskstate == "Create"
+ //&& (t.agv_tasktype == "TaskType_Outbound" || t.agv_tasktype == "TaskType_Inbound" || t.agv_tasktype == "TaskType_AOutbound")
&& !string.IsNullOrEmpty(t.agv_remark))
.OrderByDescending(t => t.agv_grade)
.OrderBy(t => t.agv_createtime)
@@ -61,6 +62,8 @@
requestTask.Material = agv_task.agv_materielid;
requestTask.Grade = agv_task.agv_grade;
requestTask.Quantity = agv_task.agv_qty;
+ requestTask.TrayType = agv_task.agv_barcode.Contains("Small") ? 1 : 2;//
+ requestTask.TaskType = agv_task.agv_tasktype.Contains("TaskType_EmptyPallet") ? 2 : 1;//
requestTask.A = Materiel.a;
requestTask.B = Materiel.b;
requestTask.C = Materiel.c;
@@ -70,13 +73,14 @@
requestTask.G = Materiel.g;
requestTask.H = Materiel.h;
postJson = JsonConvert.SerializeObject(requestTask);
- report = Request.RequestData(postJson, "http://192.168.12.250:5566/api/TaskCreat/CreatTask");
+ 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;
freeDB.Update(agv_task).UpdateColumns(t => new { t.agv_realesstime, t.agv_taskstate }).ExecuteAffrows();
+ WriteWMSLog.LogAdd(requestTask.TASK_NO, "鎴愬姛 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
}
}
}
@@ -84,8 +88,8 @@
{
respone.Success = false;
respone.Msg = ex.Message;
+ WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
}
- WriteWMSLog.LogAdd(requestTask.TASK_NO, respone.Success ? "鎴愬姛 " : "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
}
}
}
--
Gitblit v1.9.3