11

czw

2025-06-27 140768c21ee2191ba5b390ef4173c15044f11433

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

@@ -28,6 +28,8 @@
using GZ.DB.Repository.OIDATABASE;
using GZ.DB.IRepository.OIDATABASE;
using GZ.DB.Entity.OIDATABASE;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using NLog.Fluent;
namespace GZ.Projects.AuxAllWCS
{
    public class Settings
@@ -821,35 +823,49 @@
                            //                            sord = "desc",
                            //                            rows = 1
                            //                        }).FirstOrDefault();
                            TaskEntity ec = null;
                            var dev = Conn.默认Redis.GetValue(sx.deviceName + "." + (sindex == 0 ? "D1224" : "D1225"));
                            if (dev?.Trim() == "1")
                                ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "完成", new Common.Data.Pagination
                                {
                                    page = 1,
                                    sidx = "T_CREATE",
                                    sord = "desc",
                                    rows = 1
                                }).FirstOrDefault();
                            if (t1.S_START_LOC == task.S_START_LOC && ec != null)//!= task.S_END_LOC)
                            //TaskEntity ec = null;
                            //var dev = Conn.默认Redis.GetValue(sx.deviceName + "." + (sindex == 0 ? "D1224" : "D1225"));
                            //if (dev?.Trim() == "1")
                            //    ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "完成", new Common.Data.Pagination
                            //    {
                            //        page = 1,
                            //        sidx = "T_CREATE",
                            //        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;
                            var tf2 = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
                            canReq = TcpServer.GetBitdata(tf2, (V ? 2 : 3)) == 1;
                            //if (canReq)
                            //    ec = taskservice.FindList(x => x.S_END_LOC == task.S_END_LOC && x.S_B_STATE == "完成", new Common.Data.Pagination
                            //    {
                            //        page = 1,
                            //        sidx = "T_CREATE",
                            //        sord = "desc",
                            //        rows = 1
                            //    }).FirstOrDefault();
                            if (t1.S_START_LOC == task.S_START_LOC && canReq)//!= task.S_END_LOC)
                            {
                                //第二段。
                                LocEntity endLoc = null;
                                var di = sx;
                                if (di != null)
                                {
                                    foreach (var ssloc in di.deviceNo)
                                    //foreach (var ssloc in di.deviceNo)
                                    {
                                        var ssloc = di.deviceNo[1];
                                        var endloc = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
                                        if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE == "无")
                                        if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE.Trim() == "无")
                                        {
                                            endLoc = endloc;
                                            break;
                                            //break;
                                        }
                                    }
                                    if (endLoc != null)
                                    {
                                        var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_END_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "下空", 7, ec.S_CNTRS.Split(',').ToList());
                                        var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_END_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "下空", 7, "NONE".Split(',').ToList());
                                        if (res)
                                        {
                                            task.N_PRIORITY = 0; taskservice.Update(task);
@@ -859,6 +875,10 @@
                            }
                            else
                            {
                                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 == "完成");
                                }
                                var res = TaskProcess.CreateTask(task.S_TASK_NO, t1.S_END_LOC, task.S_END_LOC, task.S_TYPE + "补满", 6, task.S_CNTRS.Split(',').ToList());
                                if (res)
                                {
@@ -875,19 +895,20 @@
                        var di = sx;
                        if (di != null)
                        {
                            foreach (var ssloc in di.deviceNo)
                            //foreach (var ssloc in di.deviceNo)
                            {
                                var ssloc = di.deviceNo[0];
                                var endloc = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
                                if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE == "无")
                                if (endloc != null && endloc.N_CURRENT_NUM == 0 && endloc.S_LOCK_STATE.Trim() == "无")
                                {
                                    endLoc = endloc;
                                    break;
                                    //break;
                                }
                            }
                            if (endLoc != null)
                            {
                                LogHelper.Info($"解释MES任务 ->{task.S_TASK_NO} åˆ›å»ºç¬¬ä¸€æ®µ ä»»åŠ¡ã€‚");
                                var res = TaskProcess.CreateTask("", task.S_START_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "满转", 8, task.S_CNTRS.Split(',').ToList());
                                var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, endLoc.S_LOC_CODE, task.S_TYPE + "满转", 8, task.S_CNTRS.Split(',').ToList());

                                LogHelper.Info($"解释MES任务 ->{task.S_TASK_NO} åˆ›å»ºç¬¬ä¸€æ®µ ä»»åŠ¡ã€‚结果：{res}");
                                if (res)