111

cjs

2025-06-24 12a30243255535e3f616aa858d2a9f1e51e4d123

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs

@@ -9,6 +9,7 @@
using MongoDB.Driver.Builders;
using MySql.Data.MySqlClient;
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -698,50 +699,50 @@
                {
                    #region 判断输送线模式 变更注释

                    foreach(var a in plc)
                    {
                        bool action = false;
                        var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                        {
                            dataNum = 1,
                            addr = a.readAddr + 3,
                            host = a.ip,
                            port = a.port
                        });
                        if (modeResult != null && modeResult.errCode == 0)
                        {
                            CMMLog.Debug($"OutWareTask：读取滚筒机{a.ip}通道号为：{a.readAddr + 3}的值为：{modeResult.result[0]}");
                            if (modeResult.result[0] == 2)
                            {
                                CMMLog.Debug($"OutWareTask:输送线为 入库模式，输送线点位：{a.location}");
                                break;
                            }
                            else
                            {
                                //读取中间表模式
                                var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
                                if (modelInfo != null)
                                {
                                    if (modelInfo.Mode == "入库模式")
                                    {
                                        CMMLog.Debug($"OutWareTask:中间表 ModeList为 入库模式");
                                    }
                                    else
                                    {
                                        action = true;
                                    }
                                }
                                else
                                {
                                    CMMLog.Debug("OutWareTask:中间表 ModeList 为空");
                                }
                            }
                        }
                        if (!action)
                        {
                            return false;
                        }
                    };
                    //foreach(var a in plc)
                    //{
                    //    bool action = false;
                    //    var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
                    //    {
                    //        dataNum = 1,
                    //        addr = a.readAddr + 3,
                    //        host = a.ip,
                    //        port = a.port
                    //    });
                    //    if (modeResult != null && modeResult.errCode == 0)
                    //    {
                    //        CMMLog.Debug($"OutWareTask：读取滚筒机{a.ip}通道号为：{a.readAddr + 3}的值为：{modeResult.result[0]}");
                    //        if (modeResult.result[0] == 2)
                    //        {
                    //            CMMLog.Debug($"OutWareTask:输送线为 入库模式，输送线点位：{a.location}");
                    //            break;
                    //        }
                    //        else
                    //        {
                    //            //读取中间表模式
                    //            var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
                    //            if (modelInfo != null)
                    //            {
                    //                if (modelInfo.Mode == "入库模式")
                    //                {
                    //                    CMMLog.Debug($"OutWareTask:中间表 ModeList为 入库模式");
                    //                }
                    //                else
                    //                {
                    //                    action = true;
                    //                }
                    //            }
                    //            else
                    //            {
                    //                CMMLog.Debug("OutWareTask:中间表 ModeList 为空");
                    //            }
                    //        }
                    //    }
                    //    if (!action)
                    //    {
                    //        return false;
                    //    }
                    //};

                    #endregion

@@ -1322,5 +1323,64 @@
            return WeekNumInMonth;
        }

        internal static bool UpdateTaskState(string taskNo, int state)
        {
            var result = false;
            try
            {
                string taskState = state == 3 ? "开始取货" : state == 4 ? "取货完成" : state == 5 ? "开始卸货" : state == 6 ? "卸货完成" : state == 2 ? "完成" : "";
                CMMLog.Info($"SQLServer 更新任务状态：任务号：{taskNo},更改状态：{taskState}");
                if (!string.IsNullOrEmpty(taskState)) result = new SqlHelper<SQL_TN_I_TASK_MST>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_STATUS='{taskState}' where CN_S_TASK_NO='{taskNo}'");
            }
            catch (Exception ex)
            {
                CMMLog.Error($"SQLServer 更新任务状态异常：{ex.Message}");
            }

            return result;
        }

        /// <summary>
        /// SQL-AMS任务主表
        /// </summary>
        [SugarTable("dbo.tn_am_task_mst")]
        public class SQL_TN_I_TASK_MST
        {
            public string CN_S_BATCH_NO { get; set; }
            public int CN_S_ORDER_NO { get; set; }
            public string CN_S_TASK_NO { get; set; }
            public string CN_S_SOURCE_SYS { get; set; }
            public string CN_S_SOURCE_NO { get; set; }
            public string CN_S_PROCESS_CODE { get; set; }
            public string CN_S_TASK_TYPE { get; set; }
            public string CN_S_START_AREA { get; set; }
            public string CN_S_START_AREA_NAME { get; set; }
            public string CN_S_START_BIT { get; set; }
            public int CN_N_START_AGVBIT { get; set; }
            public string CN_S_END_AREA { get; set; }
            public string CN_S_END_AREA_NAME { get; set; }
            public string CN_S_END_BIT { get; set; }
            public int CN_N_END_AGVBIT { get; set; }
            public string CN_S_STATUS { get; set; }
            public string CN_S_BEF_STATUS { get; set; }
            public string CN_S_BEFORE_NO { get; set; }
            public string CN_S_AFTER_NO { get; set; }
            public string CN_T_START_WORKING { get; set; }
            public string CN_T_END_WORKING { get; set; }
            public int CN_N_PRIORITY { get; set; }
            public int CN_N_CUR_STEP { get; set; }
            public string CN_S_CREATOR { get; set; }
            public string CN_S_CREATOR_NAME { get; set; }
            public string CN_T_CREATE { get; set; }
            public string CN_S_MENDER { get; set; }
            public string CN_S_MODIFY_NAME { get; set; }
            public string CN_T_MODIFY { get; set; }
            public string CN_S_TASK_MODEL { get; set; }
            public string CN_S_EXT1 { get; set; }
            public string CN_S_EXT2 { get; set; }
            public string CN_S_EXT3 { get; set; }
            public string CN_N_AGV_NO { get; set; }
            public string CN_S_TRANSPORT_INFO { get; set; }
        }
    }
}