From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:36:13 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index f473d5d..af714ad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -35,11 +35,13 @@
{ nameof(Dt_LocationInfo.Row), OrderByType.Asc },
};
- public virtual Dt_LocationInfo? AssignLocation(string stationCode, int inboundType)
+ public virtual Dt_LocationInfo? AssignLocation(ref string stationCode, int inboundType)
{
try
{
- Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == stationCode) ?? throw new Exception("鏈壘鍒拌绔欏彴瀵瑰簲鐨勫贩閬擄紝璇锋鏌ュ熀纭�閰嶇疆淇℃伅!");
+ string StationCode = stationCode;
+ Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == StationCode) ?? throw new Exception("鏈壘鍒拌绔欏彴瀵瑰簲鐨勫贩閬擄紝璇锋鏌ュ熀纭�閰嶇疆淇℃伅!");
+ stationCode = roadwayInfo.InSCStationCode;
if (roadwayInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt() && roadwayInfo.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt())
{
throw new Exception("璇ュ贩閬撲笉鍙叆搴擄紝璇锋鏌ュ贩閬撶鐢ㄤ俊鎭�!");
@@ -76,26 +78,28 @@
private Dt_LocationInfo EmptyAssignLocation(string roadway)
{
List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Pallet);
+ ///鏍规嵁宸烽亾杩涜鎺掑簭
if (locationGroups != null && locationGroups.Count > 0)
{
- LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()|| x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt());
+ LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt());
int id = locationGroup?.IdA ?? 0;
return BaseDal.QueryFirst(x => x.Id == id);
}
locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Free);
if (locationGroups != null && locationGroups.Count > 0)
{
- LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt());
+ LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt());
int id = locationGroup?.IdB ?? 0;
return BaseDal.QueryFirst(x => x.Id == id);
}
- return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
+ return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
}
private Dt_LocationInfo StoredAssignLocation(string roadway)
{
List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.InStock);
+ ///鏍规嵁宸烽亾杩涜鎺掑簭
if (locationGroups != null && locationGroups.Count > 0)
{
LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
@@ -105,6 +109,7 @@
locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Free);
if (locationGroups != null && locationGroups.Count > 0)
{
+ if (roadway.Contains("SC02")) locationGroups = locationGroups.OrderByDescending(x => x.Column).ToList();
LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
int id = locationGroup?.IdB ?? 0;
return BaseDal.QueryFirst(x => x.Id == id);
@@ -120,9 +125,9 @@
public Dt_LocationInfo AdjacentDepthLocation(Dt_LocationInfo locationInfo)
{
- return BaseDal.QueryFirst(x => x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
+ return BaseDal.QueryFirst(x => x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
}
- public void UpdateLocationLock(Dt_LocationInfo locations, int TaskNum,int changType,bool black)
+ public void UpdateLocationLock(Dt_LocationInfo locations, int TaskNum, int changType, bool black)
{
try
{
@@ -130,7 +135,7 @@
int beforeStatusEnd = 0;
if (black)
{
- if (result != null && (result.LocationStatus == LocationStatusEnum.Free.ObjToInt()|| result.LocationStatus == LocationStatusEnum.Lock.ObjToInt()))
+ if (result != null && (result.LocationStatus == LocationStatusEnum.Free.ObjToInt() || result.LocationStatus == LocationStatusEnum.Lock.ObjToInt()))
{
beforeStatusEnd = result.LocationStatus;
@@ -154,7 +159,7 @@
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
}
}
-
+
}
catch (Exception ex)
{
@@ -162,7 +167,7 @@
}
}
- public void UpdateLocationFree(Dt_LocationInfo locations, int TaskNum, int changType,bool black)
+ public void UpdateLocationFree(Dt_LocationInfo locations, int TaskNum, int changType, bool black)
{
try
{
@@ -182,7 +187,7 @@
}
else
{
- if (result != null&&(result.LocationStatus== LocationStatusEnum.Lock.ObjToInt()|| result.LocationStatus==LocationStatusEnum.PalletLock.ObjToInt()))
+ if (result != null && (result.LocationStatus == LocationStatusEnum.Lock.ObjToInt() || result.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt()))
{
int beforeStatusEnd = result.LocationStatus;
--
Gitblit v1.9.3