11

cjs

2025-06-30 84c2e090b4c3d380cbbc029291c162e4e86ec51d

11

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx

Binary files differ

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/bf82eed7-d03a-4773-8615-e25b89253835.vsidx

Binary files differ

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs

@@ -272,7 +272,8 @@
            #region   2000-充电任务--无需改动
            if (currActionModel.CN_N_ACTION_CODE == 2000)
            {
                ProcessHelper.AGVBatteryTime();
                //ProcessHelper.AGVBatteryTime();
                ProcessHelper.AGVBatteryTimeTwo();
                //Thread.Sleep(500);
            }
            #endregion

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs

@@ -4639,7 +4639,7 @@
                    if (result.result[0] == 1)
                    {
                        //推送小车进入
                        TSHelper.GoToAGV(taskNo, 10, 3);
                        TSHelper.GoToAGV(taskNo, 10, 1);
                        writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                        {
                            host = plc.ip,

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs

@@ -1120,6 +1120,53 @@
            }
            CMMLog.Info("进入充电任务流程判断：执行结束！");
        }

        internal static void AGVBatteryTimeTwo()
        {
            var cpsInfo = MongoDBSingleton.Instance.FindAll<TN_B_CHARGE_PLAN_SET>("TN_B_CHARGE_PLAN_SET");
            if (cpsInfo.Count > 0)
            {
                foreach (var a in cpsInfo)
                {
                    int agvNo = int.Parse(a.CN_S_NAME);
                    if(agvNo != 0)
                    {
                        //判断中间表 MarginAGV 是否有该AGV的数据
                        var maInfo = MongoDBSingleton.Instance.FindOne<MarginAGV>(Query.EQ("agvNo", int.Parse(a.CN_S_NAME)), "MarginAGV");
                        if (maInfo == null)
                        {
                            if (DateTime.Parse(a.CN_DT_START).AddMinutes(10) > DateTime.Now)
                            {
                                //当前时间在指定充电时间的10分钟之内
                                var pileInfo = Settings.GetChargingPile().Where(b => b.agvNo == a.CN_S_NAME && b.enable == "1").FirstOrDefault();
                                if(pileInfo != null)
                                {
                                    int marginGroup = int.Parse(pileInfo.charginGroup);
                                    TSHelper.SendChargeTask(a.CN_S_NAME, true);
                                    //增加时间
                                    MongoDBSingleton.Instance.Insert<MarginAGV>(new MarginAGV { agvNo = agvNo, marginGroup = marginGroup, dateTime = DateTime.Now });
                                }
                                else
                                {
                                    CMMLog.Info($"充电任务，未配置当前车号，车号：{a.CN_S_NAME}");
                                }
                            }
                        }
                        else
                        {
                            if (maInfo.dateTime.AddMinutes(10) < DateTime.Now)
                            {
                                MongoDBSingleton.Instance.Remove<MarginAGV>(Query.EQ("id", maInfo.id), RemoveFlags.None);
                            }
                        }
                    }
                    else
                    {
                        CMMLog.Info("充电任务流程异常，当前车号为0");
                    }
                }
            }
        }
        #endregion

        /// <summary>
@@ -1340,6 +1387,8 @@
            return result;
        }



        /// <summary>
        /// SQL-AMS任务主表
        /// </summary>

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs

@@ -689,7 +689,7 @@
                    if (result != null && result.errCode == 0)
                    {
                        CMMLog.Info($"电动门开门流程：读取电动门通道号为：{doorInfo.readAddr}里面的值为{result.result[0]},{doorInfo.readAddr + 1}里面的值为{result.result[1]},门号：{action.Ext2}");
                        if(action.Ext2 == "4")
                        if(action.Ext2 == "4" || action.Ext2 == "5")
                        {
                            if (result.result[0] == 1)
                            {