分支自 SuZhouGuanHong/TaiYuanTaiZhong

huanghongfeng
2024-07-19 bb929bd0809eefc1108dd779846ff07d997f7ef0
反馈MES工单完成
已修改1个文件
已添加3个文件
167 ■■■■■ 文件已修改
代码管理/PCS/WCS_Server/WIDESEA_Comm/MES_Info/MES_Response.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Request/MES_head.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ToMES/HandleTask_Mes.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/MES_Response.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WIDESEA_Comm.MES_Info
{
    public class MES_Response
    {
        /// <summary>
        /// çŠ¶æ€ç 
        /// </summary>
        public string code { get; set; }
        /// <summary>
        /// æ¶ˆæ¯
        /// </summary>
        public string message { get; set; }
        /// <summary>
        /// å“åº”数据
        /// </summary>
        public string data { get; set; }
        /// <summary>
        /// å †æ ˆæ¶ˆæ¯
        /// </summary>
        public string stackMsg { get; set; }
        /// <summary>
        /// æ‰©å±•
        /// </summary>
        public string Extras { get; set; }
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        public string Type { get; set; }
        /// <summary>
        /// æ—¶é—´
        /// </summary>
        public DateTime Time { get; set; }
    }
}
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Request/MES_head.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WIDESEA_Comm.MES_Info.Request
{
    public class MES_head
    {
        /// <summary>
        /// çŠ¶æ€          14为完成
        /// </summary>
        public string status { get; set; }
        /// <summary>
        /// å·¥å•
        /// </summary>
        public string jobID { get; set; }
    }
}
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs
@@ -8,6 +8,7 @@
using WIDESEA_Entity.DomainModels;
using WIDESEA_WCS.IRepositories;
using WIDESEA_WCS.IServices;
using WIDESEA_WCS.Jobs.Task;
using WIDESEA_WCS.Repositories;
using WIDESEA_WCS.Services;
using WIDESEA_WMS.IRepositories;
@@ -71,7 +72,24 @@
            {
                foreach (var mes_head in mes_head_jcxs)
                {
                    AddHtyMesWork(mes_head, mes_HeadRepository);
                    if (mes_head.quantity == mes_head.agv_finishNum)
                    {
                        if (mes_head.creator == "MES")
                        {
                            var uploadResult = HandleTask_Mes.UploadMESInfo(mes_head.jobID);
                            if (uploadResult.Status)
                            {
                                AddHtyMesWork(mes_head, mes_HeadRepository);
                            }
                        }
                        else
                        {
                            AddHtyMesWork(mes_head, mes_HeadRepository);
                        }
                    }
                }
            }
            #endregion
@@ -83,7 +101,22 @@
                foreach (var mes_head in mes_head_jjgs)
                {
                    if (mes_head.quantity == mes_head.agv_finishNum)
                        AddHtyMesWork(mes_head, mes_HeadRepository);
                    {
                        if (mes_head.creator == "MES")
                        {
                            var uploadResult = HandleTask_Mes.UploadMESInfo(mes_head.jobID);
                            if (uploadResult.Status)
                            {
                                AddHtyMesWork(mes_head, mes_HeadRepository);
                            }
                        }
                        else
                        {
                            AddHtyMesWork(mes_head, mes_HeadRepository);
                        }
                    }
                }
            }
            #endregion
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ToMES/HandleTask_Mes.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Comm;
using WIDESEA_Comm.Http;
using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.MES_Info;
using WIDESEA_Comm.MES_Info.Request;
using WIDESEA_Comm.TaskNo;
using WIDESEA_Core.Extensions;
using WIDESEA_Core.Utilities;
using WIDESEA_Entity.DomainModels;
using static System.Collections.Specialized.BitVector32;
using static WIDESEA_Comm.MES_Info.Request.MES_head;
namespace WIDESEA_WCS.Jobs.Task
{
    /// <summary>
    /// å‘MES反馈出入库信息
    /// </summary>
    public class HandleTask_Mes
    {
        public static WebResponseContent UploadMESInfo(string jobID)
        {
            WebResponseContent content = new WebResponseContent();
            string postJson = "";
            string mesData = "";
            try
            {
                MES_head mES_Head = new MES_head { status = "14", jobID = jobID };
                postJson = JsonConvert.SerializeObject(mES_Head);
                string url = "http://10.13.3.15:81/api/agv/agvNSHJobOrderStatus";
                mesData = Request.RequestData(postJson, url);
                if (mesData.Contains("连接尝试失败"))
                    throw new Exception(mesData);
                var requestMes = JsonConvert.DeserializeObject<MES_Response>(mesData);
                if (requestMes.code == "200" && requestMes.Type == "success")
                {
                    content.OK("工单完成信息成功!");
                    WritePCSLog.LogAdd("", "成功", "MES", "PCS", postJson, mesData, "工单信息反馈", "agvNSHJobOrderStatus", requestMes.message);
                }
                else
                {
                    throw new Exception(requestMes.message);
                }
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
                WritePCSLog.LogAdd("", "失败", "MES", "WMS", postJson, mesData, "工单信息反馈", "agvNSHJobOrderStatus", ex.Message);
            }
            return content;
        }
    }
}