1

czw

4 小时以前 6cf06cfb2d8de5cbf9d913ed009291da80aba4ec

1

 2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/AutoThread.cs

@@ -340,7 +340,7 @@

            if (VERX != null)
            {
                LogHelper.Info($"{VERX.deviceName} æ—¶é—´æˆ³ {RedisHelper.Get<string>("Js捷顺2#Timestamp", out string mg)} D1212>{tag.Js2.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");
                LogHelper.Info($"{VERX.deviceName} æ—¶é—´æˆ³ {RedisHelper.Get<string>("Js捷顺2#Timestamp", out string mg)} D1212>{tag.Js2.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js2.D1212, 3)} D1213_LAST>{tag.Js2.D1213_LAST}");

                if (tag.Js2.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 1)
                {
@@ -377,7 +377,7 @@
                        RedisHelper.Add($"Js捷顺2.D1203_LAST", "1", out string msg);
                    }
                }
                if (tag.Js2.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1213, 2) == 0)
                if (tag.Js2.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1212, 3) == 0)
                {
                    //tag.Js2.D1213_LAST = 0;
                    tag.Js2.D1225 = 0;
@@ -1977,7 +1977,7 @@
            LogHelper.Info($" FN1 æ—¶é—´æˆ³ {RedisHelper.Get<string>("p发那科1下线#Timestamp", out string mg)}");
            LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2218>{tag.FNK1.D2218}");
            //LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 å†™ 2215=0，D2217_LAST=1，WRelease1005=1 RArrive1005_LAST=0");
            

            if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
            {
                //tag.FNK1.D2215 = 0;
@@ -2737,6 +2737,7 @@
                            //        sord = "desc",
                            //        rows = 1
                            //    }).FirstOrDefault();

                            bool canReq = true;
                            var tf = Conn.默认Redis.GetValue(sx.deviceName + ".D1202");
                            var V = sx.location.ToList().FindIndex(x => x == task.S_END_LOC) == 0;
@@ -2766,6 +2767,8 @@
                                            endLoc = endloc;
                                            //break;
                                        }
                                        else
                                            LogHelper.Info($"解释MES任务 ->{task.S_TASK_NO} ç¼“存位{ssloc} ä¸å¯ç”¨ã€‚");
                                    }
                                    if (endLoc != null)
                                    {
@@ -2779,6 +2782,7 @@
                            }
                            else
                            {
                                LogHelper.Info($"解释MES任务 ->{task.S_TASK_NO} ç”Ÿæˆç¬¬ä¸‰æ®µä»»åŠ¡ã€‚");
                                if (t1.S_START_LOC != task.S_START_LOC)
                                {
                                    t1 = taskservice.FindEntity(x => x.S_SRC_NO == task.S_TASK_NO && x.S_START_LOC == task.S_START_LOC && x.S_B_STATE == "完成");
@@ -2808,6 +2812,8 @@
                                    endLoc = endloc;
                                    //break;
                                }
                                else
                                    LogHelper.Info($"解释MES任务 ->{task.S_TASK_NO} ç¼“存位{ssloc} ä¸å¯ç”¨ã€‚");
                            }
                            if (endLoc != null)
                            {
@@ -2998,6 +3004,8 @@
                                        //    else tag.Js2.D1225 = 1;
                                        //}
                                    }
                                    //Task.Run(() =>
                                    //{
                                    var ssloc = device2.deviceNo[1];
                                    var endloc = locrep.FindEntity(x => x.S_LOC_CODE == ssloc);
                                    LogHelper.Info($"捷顺卸货后， æŸ¥çœ‹ç¼“存位 {ssloc}-{endloc?.N_CURRENT_NUM}>0? åˆ™ç”³è¯·mes搬走。");
@@ -3009,7 +3017,13 @@
                                            startBit = ssloc
                                        }));
                                        LogHelper.Info($"{ssloc}申请mes任务结果{str}");
                                        var strr = JsonConvert.DeserializeObject<Messss>(str);
                                        if (strr != null && strr.success && strr.data?.state == 0)
                                        {
                                            //return;
                                        }
                                    }
                                    //});
                                }
                                else
                                    switch (device2.deviceType)