任务日志增加手动上传WMS功能；完善任务日志手动添加功能

wxw

2024-09-27 32885e1fc103b0c660027301219e0887cb77a847

 Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs

@@ -1,9 +1,13 @@

using AngleSharp.Dom;
using COSXML.Network;
using DocumentFormat.OpenXml.Drawing.Charts;
using Elastic.Clients.Elasticsearch.Tasks;
using Furion.DatabaseAccessor;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
using WCS.Application.Entity;
using WCS.Application.Service.WcsTask.Dto;

namespace WCS.Application;

@@ -13,6 +17,8 @@
[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)]
public class WcsTaskService : IDynamicApiController, ITransient
{
    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);

    private readonly SqlSugarRepository<WcsTask> _wcsTaskRep;
    private readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext;
    private readonly SqlSugarRepository<WcsCheckTask> _wcsCheckTaskRep;
@@ -73,38 +79,37 @@
        }
        var entity = input.Adapt<WcsTask>();
        entity.Origin = "WCS";
        await _wcsTaskRep.InsertAsync(entity);
        if (string.IsNullOrEmpty(entity.TaskNo))
        {
            //生成任务号
            entity.TaskNo = GetTaskCode();
            if (string.IsNullOrEmpty(entity.TaskNo))
            {
                throw Oops.Bah("任务号生成失败");
            }
        }

        #region 绑定垛机

        //物料品种信息
        var skuInfo = await _wcsMateialPzInfoRep.Context.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == input.SkuNo).FirstAsync();
        if (skuInfo == null)
        #region 机器人拆垛分配拆垛工位
        if (entity.UnstackingMode== UnstackingModeEnum.Machine)
        {
            throw Oops.Oh("物料品种信息不存在");
        }
        //分拣任务信息
        var checkTaskInfo = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "0" && w.RoboatType == "0").OrderBy(o => o.LineNo).FirstAsync();
        if (checkTaskInfo == null)
        {
            throw Oops.Oh("分拣任务信息不存在");
        }
        if (checkTaskInfo.Status != "0")
        {
            throw Oops.Oh("该工位已绑定任务，请勿再次绑定");
        }
        checkTaskInfo.OrderNo = "";
        checkTaskInfo.TaskNo = entity.TaskNo;
        checkTaskInfo.LotNo = entity.LotNo;
        checkTaskInfo.SkuNo = entity.SkuNo;
        checkTaskInfo.SkuName = entity.SkuName;
        checkTaskInfo.BoxType = "";
        checkTaskInfo.Qty = entity.Qty;
        checkTaskInfo.Status = "1";//已绑定
        checkTaskInfo.PZNo = skuInfo.PZNo;
        //更新分拣任务
        await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
            //分拣任务信息
            List<TaskPortDto> taskPortList = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.RoboatType == PLCTypeEnum.StackingRobot).Select<TaskPortDto>().ToListAsync();
            if (taskPortList.Count <= 0)
            {
                throw Oops.Bah("拆垛工位异常");
            }
            var taskList = await _wcsTaskRep.Context.Queryable<WcsTask>().Where(w => w.Status == 0 && w.IsBind == 0 && w.TaskType == TaskTypeEnum.Out).ToListAsync();
            foreach (var item in taskPortList)
            {
                item.PortCount = taskList.Where(w => w.StationNum == item.Port).Count();
            }
            var portInfo = taskPortList.OrderBy(o => o.PortCount).ThenBy(o => o.LineNO).First();
            //拆垛工位号
            entity.StationNum = portInfo.Port;
        }        
        #endregion

        await _wcsTaskRep.InsertAsync(entity);

        return entity.Id;
    }
@@ -233,6 +238,94 @@
        }
    }

    // <summary>
    /// 手动给WMS上传任务
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "UploadTask")]
    [DisplayName("手动给WMS上传任务")]
    public async Task UploadTask(UpdateWcsTaskInput input)
    {
        var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
        if (modTask.Status != TaskStatusEnum.Complete)
        {
            throw Oops.Oh("任务状态异常");
        }
        if (modTask.Origin != "WMS")
        {
            throw Oops.Oh("该任务来源不是WMS");
        }
        // 反馈WMS
        var requestMode = new TaskRequestWMS()
        {
            TaskNo = modTask.TaskNo,
            PalletNo = modTask.PalletNo,
            TaskType = ((int)TaskTypeEnum.In).ToString(),
            TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
        };
        //任务详情
        var modTaskMonitor = new WcsTaskMonitor()
        {
            TaskNo = modTask.TaskNo,
            PlcId = 0,
            PlcName = "",
            PalletNo = modTask.PalletNo,
            Status = TaskStatusEnum.Complete,
            StartLocat = modTask.StartLocate,
            EndLocat = modTask.EndLocate,
            InteractiveMsg = $"手动上传给WMS任务完成"
        };
        //调用WMS上传任务接口
        HttpService httpService = new HttpService();
        var modResponseTask = httpService.RequestTask(requestMode).Result;
        if (modResponseTask.StatusCode == 0)
        {
            modTaskMonitor.InteractiveMsg = "手动上传给WMS任务完成";
        }
        else
        {
            Log.Error(string.Format("手动上传WMS任务反馈失败：StatusCode：{0};Msg：{1}", modResponseTask.StatusCode, modResponseTask.Msg));
        }
        // 插入交互日志
        _db.Insertable(modTaskMonitor).ExecuteCommand();
        //下发任务日志
        HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
    }


    /// <summary>
    /// 自动生成任务号
    /// </summary>
    /// <param name="codeFlag"></param>
    /// <returns></returns>
    public string GetTaskCode(string codeFlag="WCS")
    {
        var list = _db.Queryable<WcsTask>().Where(m => m.TaskNo.StartsWith("WCS")).ToList();
        string maxNo = list.Max(m => m.TaskNo);
        if (!string.IsNullOrEmpty(maxNo))
        {
            maxNo = maxNo.Substring(codeFlag.Length);
        }
        //获取数据库时间八位
        string date = DateTime.Now.ToString("yyyyMMdd").Trim();
        string no = "";
        if (string.IsNullOrEmpty(maxNo))
        {
            no = codeFlag + date + "0001";
        }
        else
        {
            if (maxNo.Length==15 && maxNo.Substring(0, 8) == date)
            {
                int lastNo = Convert.ToInt32(maxNo.Substring(8, 5)) + 1;
                no = codeFlag + date + (lastNo.ToString().PadLeft(5, '0'));
            }
            else
            {
                no = codeFlag + date + "0001";
            }
        }
        return no;
    }
}