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

wxw

2024-09-27 32885e1fc103b0c660027301219e0887cb77a847

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

 Admin.NET/WCS.Application/Configuration/Database.json

@@ -11,7 +11,8 @@
        //"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL 库连接字符串
        //"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 库连接字符串",
        //"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 库连接字符串
        "ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 库连接字符串
        //"ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 库连接字符串
        "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WCSnet6;User Id=sa;Password=admin2023@;", // SqlServer 库连接字符串


        //"SlaveConnectionConfigs": [ // 读写分离/主从

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

@@ -1,8 +1,10 @@

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;
@@ -15,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;
@@ -75,22 +79,34 @@
        }
        var entity = input.Adapt<WcsTask>();
        entity.Origin = "WCS";

        #region 分配拆垛工位
        //分拣任务信息
        List<TaskPortDto> taskPortList = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.RoboatType == PLCTypeEnum.StackingRobot).Select<TaskPortDto>().ToListAsync();
        if (taskPortList.Count<=0)
        if (string.IsNullOrEmpty(entity.TaskNo))
        {
            throw Oops.Bah("拆垛工位异常");
            //生成任务号
            entity.TaskNo = GetTaskCode();
            if (string.IsNullOrEmpty(entity.TaskNo))
            {
                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;

        #region 机器人拆垛分配拆垛工位
        if (entity.UnstackingMode== UnstackingModeEnum.Machine)
        {
            //分拣任务信息
            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);
@@ -223,13 +239,13 @@
    }

    // <summary>
    /// 上传任务
    /// 手动给WMS上传任务
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "UploadTask")]
    [DisplayName("上传任务")]
    [DisplayName("手动给WMS上传任务")]
    public async Task UploadTask(UpdateWcsTaskInput input)
    {
        var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
@@ -242,18 +258,74 @@
            throw Oops.Oh("该任务来源不是WMS");
        }
        // 反馈WMS
        //var requestMode = new TaskRequest()
        //{
        //    TaskNo = modTask.TaskNo,
        //    PalletNo = modTask.PalletNo,
        //    TaskType = (TaskTypeEnum)modTask.TaskType,//TaskTypeEnum.In,
        //    TaskStatus = TaskStatusEnum.Complete
        //};
        //HttpService httpService = new HttpService();
        //var modResponseTask = httpService.RequestTask(requestMode).Result;
        //if (modResponseTask.StatusCode == "0")
        //{
        //    modcTaskMonitor.InteractiveMsg = "任务完成，返回给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;
    }
}

 Web/src/views/wcs/wcsTask/component/editDialog.vue

@@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="任务号" prop="taskNo">
                            <el-input v-model="ruleForm.taskNo" placeholder="请输入任务号" maxlength="20" show-word-limit clearable />
                            <el-input v-model="ruleForm.taskNo" placeholder="任务号自动生成" maxlength="20" show-word-limit clearable readonly/>
                            
                        </el-form-item>
                        
@@ -178,6 +178,20 @@
        ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
            if (isValid) {
                let values = ruleForm.value;
                //入库任务
                if(ruleForm.value.taskType==0){
                    if(ruleForm.value.startLocate==undefined || ruleForm.value.startLocate.length!=3){
                        ElMessage.error("入库任务的起始位置字符长度应是3位");
                        return;
                    }
                }
                //出库任务
                if(ruleForm.value.taskType==1){
                    if(ruleForm.value.endLocate==undefined || ruleForm.value.endLocate.length!=3){
                        ElMessage.error("出库任务的结束位置字符长度应是3位");
                        return;
                    }
                }
                if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
                    await addWcsTask(values);
                } else {