From fe941b73b9496f6cfab1a8957f319f74ea09fe1d Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期一, 04 十一月 2024 17:34:32 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 81 ++++++++++++----------------------------
1 files changed, 25 insertions(+), 56 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 a88d978..d213931 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"
@@ -127,32 +127,32 @@
{
try
{
+ Dt_LocationInfo result = isDepth(locations);
+ int beforeStatusEnd = 0;
if (black)
{
- (Dt_LocationInfo?, int?) result = isDepth(locations);
- if (result.Item1 != null && (result.Item2 == LocationStatusEnum.Free.ObjToInt()|| result.Item2 == LocationStatusEnum.Lock.ObjToInt()))
+ if (result != null && (result.LocationStatus == LocationStatusEnum.Free.ObjToInt()|| result.LocationStatus == LocationStatusEnum.Lock.ObjToInt()))
{
- int beforeStatusEnd = result.Item1.LocationStatus;
+ beforeStatusEnd = result.LocationStatus;
- result.Item1.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ result.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- BaseDal.UpdateData(result.Item1);
+ BaseDal.UpdateData(result);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result.Item1, beforeStatusEnd, changType, "", TaskNum);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
}
}
else
{
- (Dt_LocationInfo?, int?) result = isDepth(locations);
- if (result.Item1 != null && result.Item2 == LocationStatusEnum.Free.ObjToInt())
+ if (result != null && result.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
- int beforeStatusEnd = result.Item1.LocationStatus;
+ beforeStatusEnd = result.LocationStatus;
- result.Item1.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ result.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- BaseDal.UpdateData(result.Item1);
+ BaseDal.UpdateData(result);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result.Item1, beforeStatusEnd, changType, "", TaskNum);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
}
}
@@ -167,16 +167,16 @@
{
try
{
- (Dt_LocationInfo?, int?) result = isDepth(locations);
- if (result.Item1 != null)
+ Dt_LocationInfo result = isDepth(locations);
+ if (result != null)
{
- int beforeStatusEnd = result.Item1.LocationStatus;
+ int beforeStatusEnd = result.LocationStatus;
- result.Item1.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ result.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- BaseDal.UpdateData(result.Item1);
+ BaseDal.UpdateData(result);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result.Item1, beforeStatusEnd, changType, "", TaskNum);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
}
}
catch (Exception ex)
@@ -185,7 +185,7 @@
}
}
- public (Dt_LocationInfo?,int?) isDepth(Dt_LocationInfo locationInfo)
+ public Dt_LocationInfo isDepth(Dt_LocationInfo locationInfo)
{
if (locationInfo.Depth == 2)
{
@@ -193,54 +193,23 @@
{
Dt_LocationInfo dt_LocationInfo = BaseDal.QueryFirst(x => x.Row == locationInfo.Row + 1 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo);
- if (dt_LocationInfo != null&& dt_LocationInfo.LocationStatus==LocationStatusEnum.InStock.ObjToInt())
+ if (dt_LocationInfo != null)
{
- return (dt_LocationInfo, LocationStatusEnum.InStock.ObjToInt());
+ return dt_LocationInfo;
}
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Free.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Lock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.PalletLock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Pallet.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Pallet.ObjToInt());
- }
+
}
else if (locationInfo.Row == 4 || locationInfo.Row == 8)
{
Dt_LocationInfo dt_LocationInfo = BaseDal.QueryFirst(x => x.Row == locationInfo.Row + 1 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo);
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
+ if (dt_LocationInfo != null)
{
- return (dt_LocationInfo, LocationStatusEnum.InStock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Free.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Lock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.PalletLock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Pallet.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Pallet.ObjToInt());
+ return dt_LocationInfo;
}
}
}
- return (null, LocationStatusEnum.Free.ObjToInt());
+ return null;
}
public void RelocationLock(Dt_LocationInfo locationInfo, Dt_LocationInfo locationInfos, int TaskNum)
{
--
Gitblit v1.9.3