优化出入库逻辑

dengjunjie

6 天以前 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -8,6 +8,13 @@
using WIDESEA_DTO.Stock;
using WIDESEA_Model.Models;
using WIDESEA_Core.Helper;
using Microsoft.AspNetCore.Http;
using System.Reflection.Metadata;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SkiaSharp;
using System.Collections;
using Newtonsoft.Json;
using WIDESEA_Core.Log;

namespace WIDESEA_TaskInfoService
{
@@ -35,14 +42,15 @@
                        Dt_Task task = new()
                        {
                            CurrentAddress = stockInfo.LocationCode,
                            Grade = 0,
                            Grade = 3,
                            PalletCode = stockInfo.PalletCode,
                            NextAddress = roadwayInfo.OutSCStationCode,
                            Roadway = locationInfo.RoadwayNo,
                            SourceAddress = stockInfo.LocationCode,
                            TargetAddress = roadwayInfo.OutStationCode,
                            TargetAddress = roadwayInfo.OutSCStationCode,
                            TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                            TaskType = TaskTypeEnum.Outbound.ObjToInt(),
                            Depth = locationInfo.Depth,
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                        };
                        tasks.Add(task);
@@ -66,12 +74,12 @@

            if (outboundOrderDetail == null)
            {
                throw new Exception("未找到出库单明细信息");
                throw new Exception("未找到出库单明细信息!");
            }

            if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
            {
                throw new Exception("选择数量超出单据数量");
                throw new Exception("选择数量超出单据数量!");
            }
            List<Dt_StockInfo>? stockInfos = null;
            Dt_OutboundOrderDetail? orderDetail = null;
@@ -96,12 +104,12 @@
                }
                else
                {
                    throw new Exception("无库存");
                    throw new Exception("无库存!");
                }
            }
            else
            {
                List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId);
                List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.Id);
                if (stockLockInfos != null && stockLockInfos.Count > 0)
                {
                    List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
@@ -130,7 +138,7 @@
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
                return WebResponseContent.Instance.Error($"{ex.Message}");
            }
        }

@@ -145,18 +153,44 @@
        /// <returns></returns>
        public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                _unitOfWorkManage.BeginTran();
                //判断移库
                /*List<Dt_Task> RelocationTasks = */
                RelocationTask(tasks);
                //BaseDal.AddData(RelocationTasks);
                (List<Dt_Task>?, List<Dt_Task>?) result=RelocationTasks(tasks.OrderBy(x=>x.Depth).ToList());
                if (result.Item1 != null && result.Item1.Count >0)
                {
                    AddData(result.Item1);
                    var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "出库任务下发");
                    //if (!response.Status)
                    //{
                    //    _unitOfWorkManage.RollbackTran();
                    //    return content = WebResponseContent.Instance.Error($"{response.Message}");
                    //}
                }
                if(result.Item2 != null&&result.Item2.Count>0)
                {
                    for (int i = 0; i < result.Item2.Count; i++)
                    {
                        Dt_LocationInfo location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == result.Item2[i].SourceAddress && x.RoadwayNo == result.Item2[i].Roadway);
                        if (location.Depth == 2)
                        {
                            _basicService.LocationInfoService.UpdateLocationLock(location, result.Item2[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                        }
                    }
                    AddData(result.Item2);
                    var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "出库任务下发");
                    //if (!response.Status)
                    //{
                    //    _unitOfWorkManage.RollbackTran();
                    //    return content = WebResponseContent.Instance.Error($"{response.Message}");
                    //}
                }

                
                BaseDal.AddData(tasks);
                if (stockInfos != null && outboundOrderDetails != null && outStockLockInfos != null && locationInfos != null)
                {
                    WebResponseContent content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
                    content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

                    if (content.Status)
                    {
@@ -166,7 +200,6 @@
                    {
                        _unitOfWorkManage.RollbackTran();
                    }
                    return content;
                }
                else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
                {
@@ -177,6 +210,27 @@

                    _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
                }
                if (outboundOrderDetails != null&&outboundOrderDetails.Count()>0)
                {
                    for (int i = 0; i < outboundOrderDetails.Count(); i++)
                    {
                        _outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(outboundOrderDetails[i], App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                        Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails[i].OrderId);
                        List<Dt_OutboundOrderDetail> outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => x.OrderId == outboundOrder.Id&&x.OrderDetailStatus==OrderDetailStatusEnum.New.ObjToInt()).ToList();
                        if (outboundOrderDetail.Count <= 0)
                        {
                            outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                            _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                        }
                        else
                        {
                            outboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
                            _outboundService.OutboundOrderService.Repository.UpdateData(outboundOrder);
                        }
                    }
                    
                }
                
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
@@ -185,76 +239,144 @@
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
            finally
            {
                WriteLog.GetLog("出库任务下发").Write(JsonConvert.SerializeObject(content), "出库任务下发");
            }

        }
        public (List<Dt_Task>?, List<Dt_Task>?) RelocationTasks(List<Dt_Task> task)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                List<Dt_Task>  tasks = new List<Dt_Task>();
                List<Dt_Task> relocationList=new List<Dt_Task>();
                if (task.Count > 0)
                {
                    for (int i = 0; i < task.Count; i++)
                    {
                        Dt_LocationInfo location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task[i].SourceAddress && x.RoadwayNo == task[i].Roadway);
                        int befoStatus=location.LocationStatus.ObjToInt();
                        if (location != null)
                        {
                            Dt_LocationInfo result = _basicService.LocationInfoService.isDepth(location);
                            if (result != null && result.LocationStatus != LocationStatusEnum.Lock.ObjToInt() && result.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt() && result.LocationStatus != LocationStatusEnum.Free.ObjToInt())
                            {
                                int sum = 0;
                                for (int j = 0; j < task.Count; j++)
                                {
                                    if (result.LocationCode == task[j].SourceAddress)
                                    {
                                        sum++;
                                    }
                                }
                                if (sum == 0)
                                {
                                    Dt_Task relocariontask = RelocationTask(result);
                                    task[i].Grade=2;
                                    relocationList.Add(relocariontask);
                                    relocationList.Add(task[i]);
                                }
                                else
                                {
                                    tasks.Add(task[i]);
                                    content = WebResponseContent.Instance.OK();
                                }
                            }
                            else if (result == null)
                            {
                                tasks.Add(task[i]);
                                content = WebResponseContent.Instance.OK();
                            }
                            else if (result != null && result.LocationStatus == LocationStatusEnum.Free.ObjToInt())
                            {
                                tasks.Add(task[i]);
                                content = WebResponseContent.Instance.OK();
                            }
                            else if (result != null && (result.LocationStatus == LocationStatusEnum.Lock.ObjToInt() || result.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt()))
                            {
                                Dt_Task TaskInfo = BaseDal.QueryFirst(x => x.SourceAddress == result.LocationCode);
                                if (TaskInfo == null)
                                {
                                    content = WebResponseContent.Instance.Error("货位被锁定不可出库");
                                    break;
                                }
                                else
                                {
                                    tasks.Add(task[i]);
                                    content = WebResponseContent.Instance.OK();
                                }
                            }
                        }
                        else
                        {
                            content = WebResponseContent.Instance.Error("任务异常");
                            break;
                        }
                    }
                    return (relocationList,tasks);
                }
                else
                {
                    throw new Exception($"生成移库任务失败");
                }
            }
            catch (Exception ex)
            {
                return (null, null);
            }
         }
        /// <summary>
        /// ç§»åº“任务
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        public WebResponseContent RelocationTask(List<Dt_Task> task)
        public Dt_Task RelocationTask(Dt_LocationInfo location)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                for (int i = 0; i < task.Count; i++)
                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == location.LocationCode);
                if (stockInfo != null)
                {
                    Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task[i].SourceAddress && x.RoadwayNo == task[i].Roadway);
                    if (locationInfo != null)
                    Dt_LocationInfo? locationInfos = _basicService.LocationInfoService.AssignLocation(location.RoadwayNo);
                    if (locationInfos != null)
                    {
                        Dt_LocationInfo location = _basicService.LocationInfoService.isDepth(locationInfo);
                        if (location != null)
                        Dt_Task tasks = new()
                        {
                            Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == location.LocationCode);
                            if (stockInfo != null && location.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
                            {
                                Dt_LocationInfo? locationInfos = _basicService.LocationInfoService.AssignLocation(location.RoadwayNo);
                                if(locationInfos != null)
                                {
                                    Dt_Task tasks = new()
                                    {
                                        CurrentAddress = location.LocationCode,
                                        Grade = 0,
                                        PalletCode = stockInfo.PalletCode,
                                        NextAddress = locationInfos.LocationCode,
                                        Roadway = location.RoadwayNo,
                                        SourceAddress = location.LocationCode,
                                        TargetAddress = locationInfos.LocationCode,
                                        TaskStatus = InTaskStatusEnum.RelocationNew.ObjToInt(),
                                        TaskType = TaskTypeEnum.Relocation.ObjToInt(),
                                        TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                                    };
                                    BaseDal.AddData(tasks);
                                    stockInfo.StockStatus = StockStatusEmun.移库锁定.ObjToInt();
                                    _stockService.StockInfoService.UpdateData(stockInfo);
                                    _basicService.LocationInfoService.RelocationLock(location, locationInfos,tasks.TaskNum);
                                }
                                else
                                {
                                    return content = WebResponseContent.Instance.Error("未找到可分配货位");
                                }
                            }
                            else
                            {
                                return content = WebResponseContent.Instance.Error("未找到库存信息");
                            }
                        }
                            CurrentAddress = location.LocationCode,
                            Grade = 0,
                            PalletCode = stockInfo.PalletCode,
                            NextAddress = locationInfos.LocationCode,
                            Roadway = location.RoadwayNo,
                            SourceAddress = location.LocationCode,
                            TargetAddress = locationInfos.LocationCode,
                            TaskStatus = RelocationTaskStatusEnum.RelocationNew.ObjToInt(),
                            TaskType = TaskTypeEnum.Relocation.ObjToInt(),
                            Depth= location.Depth,
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                        };
                        _basicService.LocationInfoService.RelocationLock(location, locationInfos, tasks.TaskNum);
                        stockInfo.StockStatus= StockStatusEmun.移库锁定.ObjToInt();
                        _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                        return tasks;
                    }
                    else
                    {
                        return content = WebResponseContent.Instance.Error("任务信息异常");
                        throw new Exception($"生成移库任务失败");
                    }

                }
                else
                {
                    throw new Exception("未找到库存信息");
                }
            }
            catch (Exception ex)
            {
                return content = WebResponseContent.Instance.Error(ex.Message);
                throw new Exception($"生成移库任务失败"); ;
            }
            
            return content;
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
@@ -272,6 +394,7 @@
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
                foreach (int key in keys)
                {

                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(key, stockSelectViews);
                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
@@ -293,6 +416,8 @@
                    {
                        tasks.AddRange(result.Item1);
                    }


                }

                WebResponseContent content = GenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
@@ -329,10 +454,11 @@
                {
                    return WebResponseContent.Instance.Error("未找到终点巷道信息");
                }
                List<Dt_Task> tasks = new List<Dt_Task>();
                Dt_Task task = new Dt_Task()
                {
                    CurrentAddress = stockInfo.LocationCode,
                    Grade = 0,
                    Grade = 1,
                    NextAddress = endStation,
                    PalletCode = stockInfo.PalletCode,
                    Roadway = roadwayNo,
@@ -340,18 +466,54 @@
                    TargetAddress = endStation,
                    TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                    TaskType = TaskTypeEnum.PalletOutbound.ObjToInt(),
                    Depth = locationInfo.Depth,
                    TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                };
                int beforeStatus = locationInfo.LocationStatus;
                _unitOfWorkManage.BeginTran();
                stockInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                BaseDal.AddData(task);
                tasks.Add(task);
                (List<Dt_Task>?, List<Dt_Task>?) result = RelocationTasks(tasks.OrderBy(x => x.Depth).ToList());
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    for (int i = 0; i < result.Item1.Count; i++)
                    {
                        result.Item1[i].Grade = 1;
                    }
                    AddData(result.Item1);
                    var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item1, "入库任务下发");
                    if (!response.Status)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return  WebResponseContent.Instance.Error($"{response.Message}");
                    }
                }
                if (result.Item2 != null && result.Item2.Count > 0)
                {
                    for (int i = 0; i < result.Item2.Count; i++)
                    {
                        Dt_LocationInfo location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == result.Item2[i].SourceAddress && x.RoadwayNo == result.Item2[i].Roadway);
                        if (location.Depth == 2)
                        {
                            _basicService.LocationInfoService.UpdateLocationLock(location, result.Item2[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                        }
                        result.Item2[i].Grade = 1;
                    }
                    AddData(result.Item2);
                    var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", result.Item2, "出库任务下发");
                    if (!response.Status)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return  WebResponseContent.Instance.Error($"{response.Message}");
                    }
                }
                _stockService.StockInfoService.UpdateData(stockInfo);

                _basicService.LocationInfoService.UpdateLocationLock(locationInfo, task.TaskNum);
                _basicService.LocationInfoService.UpdateData(locationInfo);

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Relocation.ObjToInt(), "", task.TaskNum);

                _basicService.LocationInfoService.UpdateLocationLock(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), "", task.TaskNum);
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }