From 2950220f98f891a64cc452478e2a2ae61b82a8cd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 13 四月 2025 16:21:52 +0800
Subject: [PATCH] 优化代码、添加大屏
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index 5541d80..f68525c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Mvc.RazorPages;
+锘縰sing Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using SqlSugar;
using System;
@@ -72,6 +73,32 @@
return content;
}
/// <summary>
+ /// 鑾峰彇鍙Щ搴撹揣浣�
+ /// </summary>
+ /// <returns></returns>
+ public Dt_LocationInfo AssignLocation()
+ {
+ Dt_LocationInfo? locationInfo = null;
+ string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//鑾峰彇绌挎杞﹀厖鐢典綅缃�
+ var ChargingStations = CarChargingStation.Split(",");
+ locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == 3, _emptyAssignOrderBy);
+
+ if (locationInfo == null)
+ locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 1), _emptyAssignOrderBy);
+ if (locationInfo == null)
+ locationInfo = BaseDal.QueryFirst(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.Row == 2), _emptyAssignOrderBy);
+ return locationInfo;
+ }
+
+ public Dt_LocationInfo AssignLocation(string[] Stations)
+ {
+ Dt_LocationInfo? locationInfo = null;
+ var locationInfos = BaseDal.QueryData(x => Stations.Contains(x.LocationCode) && x.CurrentQty < x.MaxQty - 1, _emptyAssignOrderBy);
+ if (locationInfos != null && locationInfos.Count > 0)
+ locationInfo = locationInfos[0];
+ return locationInfo;
+ }
+ /// <summary>
/// 鍒嗛厤璐т綅
/// </summary>
/// <param name="stockInfo">缁勭洏淇℃伅</param>
@@ -80,9 +107,17 @@
/// <exception cref="Exception"></exception>
public Dt_LocationInfo AssignLocation(int inboundOrderCount)
{
- Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
+ string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//鑾峰彇绌挎杞﹀厖鐢典綅缃�
+ var ChargingStations = CarChargingStation.Split(",");
+ Dt_LocationInfo? locationInfo = null;
+ var locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.CurrentQty < 1 && x.Row == (inboundOrderCount > 1 ? 1 : 3), _emptyAssignOrderBy);
+ if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];
- if (locationInfo == null) locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()), _emptyAssignOrderBy);
+ if (locationInfo == null)
+ {
+ locationInfos = BaseDal.QueryData(x => !ChargingStations.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.CurrentQty < 1), _emptyAssignOrderBy);
+ if (locationInfos.Count > 1 && locationInfos != null) locationInfo = locationInfos[0];//闇�棰勭暀涓�涓揣浣嶇Щ搴�
+ }
return locationInfo;
}
@@ -173,18 +208,29 @@
return BaseDal.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo && x.Column == locationInfo.Column && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
}
- public WebResponseContent GetPosition(string position)
+ public WebResponseContent GetPosition(string position, string position1)
{
WebResponseContent content = new WebResponseContent();
try
{
- Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationCode == position);
- if (locationInfo == null) throw new Exception("鏈壘鍒拌揣浣嶄俊鎭�");
- //鍒嗛厤绌挎杞︾Щ搴撳湴鍧�
- var locationInfos = BaseDal.QueryData(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && x.LocationCode != locationInfo.LocationCode);//闇�鏍规嵁鍏ュ簱閫昏緫鏀瑰姩
- var location = locationInfos.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- //if (location != null) content.OK(message: location.LocationCode, data: location);
- if (location != null) content.OK(location.LocationCode);
+ Dt_LocationInfo? locationInfo = null;
+ //Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && (x.Row == 1 || x.Row == 3), _emptyAssignOrderBy);
+ string position2 = string.Empty;
+ string[] Codes = position1.Split("-");
+ var row = Convert.ToInt16(Codes[0]);
+ if (row < 3)
+ {
+ position2 = row == 1 ? "002" + "-" + Codes[1] + "-" + Codes[2] : "001" + "-" + Codes[1] + "-" + Codes[2];
+ }
+ if (string.IsNullOrEmpty(position2))
+ {
+ locationInfo = BaseDal.QueryFirst(x => x.CurrentQty < x.MaxQty && x.LocationCode != position && x.LocationCode != position1, _emptyAssignOrderBy);
+ }
+ else
+ {
+ locationInfo = BaseDal.QueryFirst(x => x.CurrentQty < x.MaxQty && x.LocationCode != position && x.LocationCode != position1 && x.LocationCode != position2, _emptyAssignOrderBy);
+ }
+ if (locationInfo != null) content.OK(locationInfo.LocationCode);
}
catch (Exception ex)
{
@@ -192,5 +238,36 @@
}
return content;
}
+ /// <summary>
+ /// 鑾峰彇璐т綅淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public WebResponseContent GetLocationInfo(SaveModel model)
+ {
+ WebResponseContent response = new WebResponseContent();
+ try
+ {
+ List<Dt_LocationInfo> locationInfos = BaseDal.QueryData(x => true);
+ var Freelocations = locationInfos.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).ToList();
+ var Palletlocations = locationInfos.Where(x => x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt()).ToList();
+ var InStocklocations = locationInfos.Where(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.LocationStatus != LocationStatusEnum.Pallet.ObjToInt()).ToList();
+ //Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
+ //keyValuePairs.Add("绌鸿揣浣�", Freelocations.Count);
+ //keyValuePairs.Add("绌烘墭鐩�", Palletlocations.Count);
+ //keyValuePairs.Add("鏈夎揣", InStocklocations.Count);
+ response.OK(data: new
+ {
+ FreeQty = Freelocations.Count,
+ PalletQty = Palletlocations.Count,
+ InStockQty = InStocklocations.Count,
+ });
+ }
+ catch (Exception ex)
+ {
+ response.Error(ex.Message);
+ }
+ return response;
+ }
}
}
--
Gitblit v1.9.3