From 429bb4abbaea6fd6be33dcf62735d4ada5070b63 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 19 五月 2024 17:51:03 +0800
Subject: [PATCH] 优化逻辑提高AGV任务效率
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
index ac501a2..a9c5dbf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
@@ -23,6 +23,8 @@
using WIDESEA_Core.ManageUser;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using static System.Collections.Specialized.BitVector32;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_WMS.Repositories;
namespace WIDESEA_WMS.Services
{
@@ -146,7 +148,12 @@
station.heatNumber = string.Empty;
station.Number = string.Empty;
}
- station.tray_status = list.Count == 0 ? "EmptyTray" : "StrogeTray";
+ station.tray_status = string.IsNullOrEmpty(station.stationType) ? "EmptyTray" : "StrogeTray";
+ if (station.location_state == "Empty" && !string.IsNullOrEmpty(station.stationType))
+ {
+ webResponse.Error("鍥惧彿涓嶄负绌�,璐т綅鐘舵�佷笉鑳借缃负绌鸿揣浣嶏紒");
+ }
+ //station.tray_status = list.Count == 0 ? "EmptyTray" : "StrogeTray";
if (station.location_state == "Empty")
{
station.stationType = string.Empty;
@@ -156,8 +163,8 @@
station.tray_status = string.Empty;
station.bindSN = string.Empty;
station.quantity = 0;
- if (!station.stationCode.Contains("S") && !station.stationCode.Contains("X") && !station.stationCode.Contains("W01001004") && !station.stationCode.Contains("W01001005"))
- station.tray_type = string.Empty;
+ //if (!station.stationCode.Contains("S") && !station.stationCode.Contains("X") && !station.stationCode.Contains("W01001004") && !station.stationCode.Contains("W01001005"))
+ // station.tray_type = string.Empty;
}
var count = _repository.Update(station, true);
if (count > 0)
@@ -167,5 +174,23 @@
return webResponse;
}
+
+ public WebResponseContent dt_stationinfolist()
+ {
+ WebResponseContent content = new WebResponseContent();
+ VOLContext volContext = new VOLContext();
+ Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
+ string[] stationCodes = { "A","S", "X", "W", "DD","B", "C", "D01"};
+ List<Tuple<List<dt_stationinfo>, int>> responseData = new List<Tuple<List<dt_stationinfo>, int>>();
+ foreach (string code in stationCodes)
+ {
+ var data = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).OrderBy(a => a.stationCode).ToList();
+ int inst = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).GroupBy(a => a.line).Count();
+ responseData.Add(Tuple.Create(data, inst));
+ }
+ content.Data = responseData;
+ return content;
+ }
+
}
}
--
Gitblit v1.9.3