1

Huangxiaoqiang-03

2024-11-05 f82511343cf2c8ecf3981954e7eb92172d72a905

 代码管理/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,19 @@
        {
            try
            {
                (Dt_LocationInfo?, int?) result = isDepth(locations);
                if (result.Item1 != null)
                Dt_LocationInfo result = isDepth(locations);
                if (!black)
                {
                    int beforeStatusEnd = result.Item1.LocationStatus;
                    if (result != null)
                    {
                        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,62 +188,16 @@
            }

        }
        public (Dt_LocationInfo?,int?) isDepth(Dt_LocationInfo locationInfo)
        public Dt_LocationInfo isDepth(Dt_LocationInfo locationInfo)
        {
            if (locationInfo.Depth == 2)
            {
                if (locationInfo.Row == 1 || locationInfo.Row == 5)
                {
                    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())
                    {
                        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());
                    }
                }
                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())
                    {
                        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 AdjacentDepthLocation(locationInfo.LocationCode);
            }
            return (null, LocationStatusEnum.Free.ObjToInt());
            else
            {
                return null;
            }
        }
        public void RelocationLock(Dt_LocationInfo locationInfo, Dt_LocationInfo locationInfos, int TaskNum)
        {
@@ -252,10 +209,12 @@
            if (beforeStartStatus == LocationStatusEnum.Pallet.ObjToInt())
            {
                locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
            }
            else
            {
                locationInfos.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
            }

            BaseDal.UpdateData(locationInfo);