1

huangxiaoqiang

2025-10-21 6c663b92b0078aa89657df22ec188dff65599f04

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -3,13 +3,17 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Metadata;
using System.Security.Policy;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Cache;
@@ -83,16 +87,33 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            task.TaskState = (int)TaskOutStatusEnum.OutFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            //DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
            //stockInfo_Hty.ModifyDate = DateTime.Now; 
            stock.ModifyDate = DateTime.Now;
            stock.LocationCode = task.TargetAddress;
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                //await DeleteStockInfoAsync(stock.Id);
                //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
                //await AddStockInfoHtyAsync(stockInfo_Hty);
                _stockInfoRepository.UpdateData(stock);

                UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
                UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);

                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
            content.OK("出库完成");
        }
        catch (Exception ex)
        {
@@ -117,17 +138,27 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            // æ›´æ–°è´§ä½å’Œåº“存信息
            (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
            var taskHty = CreateHistoricalTask(task);
            LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"货位地址：{task.TargetAddress},修改后库存数据：{JsonConvert.SerializeObject(updateStock)}，原先货位数据：{locationInForm}");
            var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            // æ‰§è¡Œæ•°æ®åº“事务
            bool isResult = false;
            if (isResult)
                content.OK("移库任务完成成功");
            else
                content.Error("移库任务完成失败");
            task.TaskState = (int)TaskOutStatusEnum.OutFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            stock.ModifyDate = DateTime.Now;
            stock.LocationCode = task.TargetAddress;

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                //UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
                UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
                _stockInfoRepository.UpdateData(stock);
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
            content.OK("移库完成");
        }
        catch (Exception err)
        {
@@ -177,6 +208,8 @@
                await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
                                        .Include(x => x.BoxingInfoDetails)
                                        .ExecuteCommandAsync();
                UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
                UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
                await AddBoxingHtyAsync(boxingInfo_Hty);
            });
            content.OK("入库完成");
@@ -274,8 +307,7 @@


        // éªŒè¯åº“存是否存在
        //var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
        DtStockInfo stock = null;
        var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);

        if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
        {
@@ -297,6 +329,40 @@

    #endregion ä»»åŠ¡å®Œæˆ

    #region å–消任务
    public WebResponseContent TaskCancel(int taskNum)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
            if (task == null)
            {
                return content = WebResponseContent.Instance.Error("未找到任务信息");
            }
            _unitOfWorkManage.BeginTran();
            MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
            if (methodInfo != null)
            {
                WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
                if (responseContent != null)
                {
                    if (responseContent != null)
                    {
                        
                    }
                }
            }
            return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
        }
        catch (Exception ex)
        {
            _unitOfWorkManage.RollbackTran();
            return content = WebResponseContent.Instance.Error(ex.Message);
        }
    }
    #endregion

    #region è¯·æ±‚任务入库

    public async Task<WebResponseContent> RequestInboundTaskAsync(RequestTaskDto taskDto)
@@ -310,14 +376,14 @@
                return content.Error("托盘信息不存在，请确认托盘已组盘成功");
            }

            foreach (var item in boxingInfo.BoxingInfoDetails)
            {
                var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_用友库存一览表_ST>().Where(x => x.仓库名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName).ToList().FirstOrDefault();
                if (ERPStock == null)
                {
                    return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
                }
            }
            //foreach (var item in boxingInfo.BoxingInfoDetails)
            //{
            //    var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_用友库存一览表_ST>().Where(x => x.仓库名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName).ToList().FirstOrDefault();
            //    if (ERPStock == null)
            //    {
            //        return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
            //    }
            //}

            var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
            if (StartAddress == null)
@@ -349,16 +415,16 @@
                var location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
                if (location != null && location.LocationStatus == (int)LocationEnum.Free && location.EnalbeStatus == 1)
                {
                    switch (taskDto.AreaId)
                    switch (location.AreaId)
                    {
                        case 1:
                            return await InboundStakerArea(taskDto, location, StartAddress);
                            return await InboundStakerArea(taskDto, StartAddress, location);
                        case 2:
                        case 3:
                        case 4:
                        case 5:
                        case 6:
                            return await InboundAGVCacheArea(taskDto, location, StartAddress);
                            return await InboundAGVCacheArea(taskDto, StartAddress, location);
                        default:
                            return content.Error("货位区域未找到");
                    }
@@ -560,6 +626,29 @@
    #endregion

    #region è¯·æ±‚出库
    public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
            if (stcok == null)
            {
                return content.Error("托盘信息不存在，请确认托盘已入库成功");
            }
            var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
            if (location.AreaId == 2)
            {
                return content.Error("该托盘库存已在出库缓存区");
            }
            return await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode ,TaskType = (int)TaskOutboundTypeEnum.OutOther });
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }


    /// <summary>
    /// è¯·æ±‚出库任务
@@ -571,11 +660,11 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            //DtStockInfo stcok= await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
            //if (stcok == null)
            //{
            //    return content.Error("托盘信息不存在，请确认托盘已入库成功");
            //}
            DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
            if (stcok == null)
            {
                return content.Error("托盘信息不存在，请确认托盘已入库成功");
            }

            var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
            if (StartAddress == null)
@@ -763,16 +852,17 @@
                Floor = stationManager.stationFloor,
            };
            var taskDTO = CreateTaskDTO(taskNew);

            task.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarryFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                BaseDal.AddData(taskNew);
                
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
                BaseDal.AddData(taskNew);
            });
            return content.OK(data: taskDTO);
        }
@@ -1059,11 +1149,32 @@
    }
    #endregion

    #region èŽ·å–任务信息
    public WebResponseContent GetTaskInfo()
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            Expression<Func<Dt_Task, bool>> expression = x => true;
            if (!App.User.IsSuperAdmin)
            {
                expression = x => x.Creater == App.User.UserName;
            }
            var task = BaseDal.Db.Queryable<Dt_Task>().OrderByDescending(x => x.CreateDate).Take(100).Select(x => new Dt_Task { TaskNum = x.TaskNum, PalletCode = x.PalletCode, TaskType = x.TaskType, SourceAddress = x.SourceAddress, TargetAddress = x.TargetAddress }).ToList();
            content = WebResponseContent.Instance.OK(data: task);
        }
        catch (Exception ex)
        {
            content = WebResponseContent.Instance.Error(ex.Message);
        }
        return content;
    }
    #endregion

    #endregion å¤–部接口方法

    #region è°ƒç”¨WCS接口
    private string GetAGVIPAddress(string baseIp, string name)
    private string GetWCSIPAddress(string baseIp, string name)
    {
        var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
        var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
@@ -1077,7 +1188,7 @@
    public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
    {
        WebResponseContent content = new WebResponseContent();
        var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
        var AgvSendTaskAddrss = GetWCSIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
        // å‘送请求并等待响应
        var result = await HttpHelper.PostAsync(AgvSendTaskAddrss, taskDTO.ToJsonString());

@@ -1087,13 +1198,69 @@
    }
    #endregion

    #region ERP接口调用
    public string GetERPIPAddress(string baseIp, string name)
    {
        var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
        var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
        var address = configz.Where(x => x.ConfigKey == name).FirstOrDefault()?.ConfigValue;
        if (wcsBasez == null || address == null)
        {
            throw new InvalidOperationException("WMS IP æœªé…ç½®");
        }
        return wcsBasez + address;
    }

    public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
            Allocate allocate = new Allocate
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                transferInList = stock.StockInfoDetails.Select(item => new transferInList
                {
                    ItemCode = item.MaterielCode,
                    TransInWHCode = item.Warehouse,
                    TransInQty = item.Quantity,
                    TransOutWHCode = "001",
                }).ToList()
            };
            return content.OK(data: allocate);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }


    #endregion

    #region å†…部调用方法

    public void UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
    {
        List<DtLocationInfo> locations = GetGroupLocations(location);

        List<DtLocationInfo> Beforelocation = locations;
        List<DtLocationInfo> Beforelocation = locations.Select(x => new DtLocationInfo
        {
            Id = x.Id,
            LocationCode = x.LocationCode,
            LocationStatus = x.LocationStatus
        }).ToList();

        foreach (var item in locations)
        {
@@ -1237,15 +1404,6 @@
        };
    }

    private bool IsAcrossFloor(DtLocationInfo Sourcelocation,DtLocationInfo Targetlocation)
    {
        return Sourcelocation.Floor == Targetlocation.Floor;
    }

    private bool IsSamefloor(DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
    {
        return Sourcelocation.Floor == Targetlocation.Floor;
    }
    private async Task DeleteStockInfoAsync(int stockId)
    {
        var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
@@ -1282,14 +1440,6 @@
        }
    }

    private async Task UpdateLocationAsync(DtLocationInfo info)
    {
        var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
        if (!isStockUpdated)
        {
            throw new Exception("库位信息更新失败");
        }
    }

    private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
    {
@@ -1387,26 +1537,6 @@
        return taskHty;
    }

    /// <summary>
    /// æ›´æ–°åº“存位置
    /// </summary>
    /// <param name="stock">库存对象</param>
    /// <param name="toLocation">目标位置</param>
    // æ›´æ–°åº“存和位置信息
    private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
    {
        //修改来源库位和 ç›®æ ‡åº“位状态
        var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
        fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
        var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
        toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();

        // å°†åº“存位置设置为目标位置
        stock.LocationCode = task.TargetAddress;

        // è¿”回更新后的库存和位置信息
        return (stock, fromLocation, toLocation);
    }

    #region ä»»åŠ¡è¯·æ±‚方法