1
dengjunjie
2026-01-29 79949594d0ce05704353369e755dbc771a96739f
1
已添加7个文件
已重命名1个文件
已删除1个文件
已修改8个文件
207 ■■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/与上游系统接口清单/~$S接口对接文档_V1.1.5.docx 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/与设备交互接口/所需接口及问题点.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/1楼托盘.zip 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/大料笼.zip 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/大料箱.zip 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/小料笼.zip 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/小料箱.zip 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/托盘编码规则.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/托盘编码/转运车.zip 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/虚拟机账号密码/07b704884e00843828029c22fded7604.png 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs
@@ -13,7 +13,7 @@
    {
        public string groupId { get; set; }
        public string msgTime { get; set; }
        public GALAXISTask tasks { get; set; }
        public List<GALAXISTask> tasks { get; set; }
    }
    public class GALAXISTask
@@ -34,11 +34,11 @@
        /// <summary>
        /// ä»»åŠ¡åº“åŒºï¼ŒRCS定义
        /// </summary>
        public string district { get; set; }
        public string district { get; set; } = "cy";
        /// <summary>
        /// å®¹å™¨ç±»åž‹ï¼Œå¾…定
        /// </summary>
        public int containerType { get; set; }
        public int containerType { get; set; } = 1;
        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -32,6 +32,7 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
namespace WIDESEAWCS_ITaskInfoService
{
@@ -199,5 +200,13 @@
        /// <returns></returns>
        int GetTaskNum(string sequenceName);
        WebResponseContent UpdateTaskStatus(object TaskDTO, DeviceTypeEnum deviceTypeEnum);
        /// <summary>
        /// ä¿®æ”¹è´§ä½çŠ¶æ€
        /// </summary>
        /// <param name="LocationCode"></param>
        /// <param name="deviceTypeEnum"></param>
        /// <param name="locationStatusEnum"></param>
        /// <returns></returns>
        WebResponseContent UpdateLocationStatus(string LocationCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum);
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -30,7 +30,7 @@
    "ApiName": "WIDESEAWCS",
    "ExpMinutes": 120,
    "QuartzJobAutoStart": true,
    "DBSeedEnable": true,
    "DBSeedEnable": false,
    "QuartzDBSeedEnable": false,
    "LogDeubgEnable": true, //是否记录调试日志
    "PrintSql": false, //打印SQL语句
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs
@@ -15,8 +15,9 @@
{
    public partial class TaskService
    {
        #region å‡¯ä¹å£«ä»»åŠ¡åˆ›å»º
        /// <summary>
        /// åˆ›å»ºå…¥åº“任务
        /// åˆ›å»ºå‡¯ä¹å£«AGV入库任务
        /// </summary>
        /// <param name="taskDTO"></param>
        /// <returns></returns>
@@ -54,7 +55,12 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// åˆ›å»ºå‡¯ä¹å£«AGV出库任务
        /// </summary>
        /// <param name="taskDTO"></param>
        /// <param name="taskType"></param>
        /// <returns></returns>
        public WebResponseContent CreateKLSNewOutTask(TaskDTO taskDTO, int taskType)
        {
            try
@@ -88,5 +94,96 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        #endregion
        #region RGV任务创建
        /// <summary>
        /// åˆ›å»ºå››å‘车入库任务
        /// </summary>
        /// <param name="taskDTO"></param>
        /// <param name="taskType"></param>
        /// <returns></returns>
        public WebResponseContent CreateRGVNewInTask(TaskDTO taskDTO, int taskType)
        {
            try
            {
                Db.Ado.BeginTran();
                Db.Ado.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// åˆ›å»ºå››å‘车出库任务
        /// </summary>
        /// <param name="taskDTO"></param>
        /// <param name="taskType"></param>
        /// <returns></returns>
        public WebResponseContent CreateRGVNewOutTask(TaskDTO taskDTO, int taskType)
        {
            try
            {
                Db.Ado.BeginTran();
                Db.Ado.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        #endregion
        #region æµ·åº·AGV任务创建
        /// <summary>
        /// åˆ›å»ºæµ·åº·AGV入库任务
        /// </summary>
        /// <param name="taskDTO"></param>
        /// <param name="taskType"></param>
        /// <returns></returns>
        public WebResponseContent CreateHKNewInTask(TaskDTO taskDTO, int taskType)
        {
            try
            {
                Db.Ado.BeginTran();
                Db.Ado.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// åˆ›å»ºæµ·åº·AGV出库任务
        /// </summary>
        /// <param name="taskDTO"></param>
        /// <param name="taskType"></param>
        /// <returns></returns>
        public WebResponseContent CreateHKNewOutTask(TaskDTO taskDTO, int taskType)
        {
            try
            {
                Db.Ado.BeginTran();
                Db.Ado.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        #endregion
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs
@@ -66,7 +66,7 @@
            {
                throw new Exception(ex.Message);
            }
        }
        }
        #endregion
        #region ä»»åŠ¡çŠ¶æ€è½¬æ¢
@@ -85,6 +85,7 @@
                        6 => TaskStatusEnum.TaskTypeError,
                        7 => TaskStatusEnum.ParameterError,
                        8 => TaskStatusEnum.RCSError,
                        10 => TaskStatusEnum.Takeing,
                        13 => TaskStatusEnum.Cancel,
                        _ => throw new ArgumentOutOfRangeException(
                            nameof(status),
@@ -107,7 +108,7 @@
            {
                throw new Exception(ex.Message);
            }
        }
        }
        #endregion
        #region ä»»åŠ¡èµ·ç‚¹å®Œæˆ
@@ -133,7 +134,7 @@
                Db.Ado.RollbackTran();
                throw new Exception(ex.Message);
            }
        }
        }
        #endregion
        #region ä»»åŠ¡å®Œæˆ
@@ -159,7 +160,7 @@
                Db.Ado.RollbackTran();
                throw new Exception(ex.Message);
            }
        }
        }
        #endregion
        #region æ›´æ–°è´§ä½çŠ¶æ€
@@ -211,7 +212,7 @@
            {
                throw new Exception(ex.Message);
            }
        }
        }
        #endregion
    }
}
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -86,10 +86,29 @@
                        {
                            continue;
                        }
                        if (item.taskType == TaskTypeEnum.MLInbound.ObjToInt())
                            CreateKLSNewInTask(task, item.taskType);
                        else if (item.taskType == TaskTypeEnum.MLOutbound.ObjToInt())
                            CreateKLSNewOutTask(task, item.taskType);
                        switch (item.taskType)
                        {
                            case (int)TaskTypeEnum.MLInbound:
                                CreateKLSNewInTask(task, item.taskType);
                                break;
                            case (int)TaskTypeEnum.MLOutbound:
                                CreateKLSNewOutTask(task, item.taskType);
                                break;
                            case (int)TaskTypeEnum.CPInbound:
                                CreateRGVNewInTask(task, item.taskType);
                                break;
                            case (int)TaskTypeEnum.CPOutbound:
                                CreateRGVNewOutTask(task, item.taskType);
                                break;
                            case (int)TaskTypeEnum.CJInbound:
                                CreateHKNewInTask(task, item.taskType);
                                break;
                            case (int)TaskTypeEnum.CJOutbound:
                                CreateHKNewOutTask(task, item.taskType);
                                break;
                            default:
                                break;
                        }
                    }
                }
            }
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs
@@ -1,10 +1,13 @@
using System;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_Tasks
@@ -19,10 +22,13 @@
        {
            try
            {
                var newTask = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt()).ToList();
                if (newTask.Count > 0)
                var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
                if (newTasks.Count > 0)
                {
                    #region æŸ¥æ‰¾å‡¯ä¹å£«ä»»åŠ¡
                    var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).ToList();
                    if (Tasks.Count > 0) SendGALAXISTask(Tasks);
                    #endregion
                }
            }
            catch (Exception ex)
@@ -52,7 +58,42 @@
        #region ä¸‹å‘凯乐士AGV任务
        public void SendGALAXISTask(List<Dt_Task> tasks)
        {
            GALAXISTaskInfo gALAXISTaskInfo = new GALAXISTaskInfo();
            try
            {
                gALAXISTaskInfo.groupId = DateTime.Now.ToString("yyMMddHHmmss");
                gALAXISTaskInfo.msgTime = DateTime.Now.ToString();
                foreach (var task in tasks)
                {
                    GALAXISTask gALAXISTask = new GALAXISTask()
                    {
                        taskId = task.WMSTaskNum,
                        taskType = task.TaskType == (int)TaskTypeEnum.MLInbound ? 0 : 1,
                        barCode = task.PalletCode,
                        endNode = task.TargetAddress,
                        startNode = task.SourceAddress,
                        priorityCode = task.Grade
                    };
                    gALAXISTaskInfo.tasks.Add(gALAXISTask);
                }
                Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GALAXISTaskInfo));
                if (apiInfo == null) throw new Exception("未找到凯乐士AGV任务下发接口配置信息!请检查接口配置");
                string response = HttpHelper.Post(apiInfo.ApiAddress, gALAXISTaskInfo.Serialize());
                GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
                if (agvContent.success)
                {
                    if (agvContent.data.returnStatus != 0) throw new Exception(agvContent.data.returnInfo);
                    tasks.ForEach(task =>
                    {
                        task.TaskState = (int)TaskStatusEnum.Execut;
                    });
                    _taskService.UpdateData(tasks);
                }
            }
            catch (Exception ex)
            {
                WriteError(nameof(TaskJob), ex.Message, ex);
            }
        }
        #endregion
ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/~$S½Ó¿Ú¶Ô½ÓÎĵµ_V1.1.5.docx
Binary files differ
ÏîÄ¿×ÊÁÏ/ÓëÉ豸½»»¥½Ó¿Ú/ËùÐè½Ó¿Ú¼°ÎÊÌâµã.xlsx
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/1Â¥ÍÐÅÌ.zip
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/´óÁÏÁý.zip
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/´óÁÏÏä.zip
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/СÁÏÁý.zip
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/СÁÏÏä.zip
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/ÍÐÅ̱àÂë¹æÔò.xlsx
Binary files differ
ÏîÄ¿×ÊÁÏ/ÍÐÅ̱àÂë/תÔ˳µ.zip
Binary files differ
ÏîÄ¿×ÊÁÏ/ÐéÄâ»úÕ˺ÅÃÜÂë/07b704884e00843828029c22fded7604.png