From 74a352255e4a8d7cd10eaaab8cb44f568f88b6c2 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 17 六月 2025 16:10:59 +0800
Subject: [PATCH] 清溪问题处理

---
 HH.WCS.QingXiNongfu/core/Monitor.cs |  248 ++++++++++++++++++++++++++-----------------------
 1 files changed, 131 insertions(+), 117 deletions(-)

diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 8e4c336..3690997 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -850,7 +850,7 @@
                 {
                     var locs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == item.S_AREA_CODE && x.N_ROW == item.N_ROW);
                     if (locs.Find(x => x.N_CURRENT_NUM > 0) == null)
-                        LocationHelper.SetRowLock(item, 0);
+                        WCSHelper.Do(db => db.Deleteable(item).ExecuteCommand());
                 }
             }
             Rlock = Rlocks.FindAll(x => x.S_LOCK_STATE.Contains("鍏ュ簱閿�));
@@ -867,11 +867,11 @@
                     //            LocationHelper.SetRowLock(item, 0);
                     //}
                     //濡傛灉涓�帓鍐呮棤璐с�涔熸棤閿併�  鍙兘鏄墿鏂欑殑鍏ュ簱鍙栨秷浜嗐� 鍙栨秷褰撳墠鎺掗攣锛岄槻姝㈠悗缁笉鍏ヨ繖涓墿鏂欎簡渚濈劧鍗犵潃鎺掋�
-                    if (locs.Find(x => x.N_CURRENT_NUM > 0) == null && locs.Find(x => x.S_LOCK_STATE != "鏃�) == null) LocationHelper.SetRowLock(item, 0);
+                    if (locs.Find(x => x.N_CURRENT_NUM > 0) == null && locs.Find(x => x.S_LOCK_STATE != "鏃�) == null) WCSHelper.Do(db => db.Deleteable(item).ExecuteCommand());
                     else
                     {
                         var lastloC = locs.OrderByDescending(x => x.N_COL).FirstOrDefault();
-                        if (lastloC.N_CURRENT_NUM == lastloC.N_CAPACITY) LocationHelper.SetRowLock(item, 0);
+                        if (lastloC.N_CURRENT_NUM == lastloC.N_CAPACITY) WCSHelper.Do(db => db.Deleteable(item).ExecuteCommand());
                     }
                 }
             }
@@ -1302,8 +1302,7 @@
             {
                 try
                 {
-                    LogHelper.Info($" 鏃犺弻鍑哄簱  鏌ュ伐鍗�);
-                    var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+                    var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
                     if (!yuworders.Any())
                     {
                         YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
@@ -1327,7 +1326,7 @@
                 try
                 {
                     string pline = "T2鎻愬崌鏈�鏍囩";
-                    var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+                    var Syuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
                     //yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == plc.deviceName && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
 
                     var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
@@ -1363,7 +1362,7 @@
                     }
                     else if (Syuworders.Any())
                     {
-                        YwlBQ_CreSXOutOrder(plc, Syuworders);
+                        YwlBQ_CreSXOutOrder(plc, Syuworders.FindAll(x => x.OutNum > 0));
                     }
                 }
                 catch (Exception ex)
@@ -2590,7 +2589,7 @@
                 }
             }
             ///绗竴娈碉細鍑哄簱 -鍒版媶鍨涙垨鑰�鎺ラ┏銆�-            var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
+            var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
 
         //foreach (var order in yuworders)
         retuse:
@@ -3545,7 +3544,7 @@
         public static void AutoRun13TSJ()
         {
             var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
-            var WorkOrder = new List<YWLWorkOrder>();
+            //var WorkOrder = new List<YWLWorkOrder>();
             foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
             {
                 string pline = PLC.deviceName;
@@ -3553,7 +3552,6 @@
                     pline = "T2鎻愬崌鏈�绾哥";
 
                 var orkOrd = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "鎵ц涓�);
-                orkOrd = orkOrd.FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10);
                 bool can = false;
                 if (orkOrd.Any())
                 {
@@ -3565,42 +3563,46 @@
                         continue;
                     can = true;
 
-                    foreach (var item in list)
-                    {
-                        YWLWorkOrder source = new YWLWorkOrder();
-                        var source1 = orkOrd.FirstOrDefault();
-                        source.SQL_PLineNo = source1.SQL_PLineNo;
-                        source.FuLe_PLine_No = source1.FuLe_PLine_No;
-                        source.SQL_LinkLineNO = source1.SQL_LinkLineNO;
-                        source.SQL_Area = item;
-                        source.SQL_UsingNow = source1.SQL_UsingNow;
-                        source.SQL_State = source1.SQL_State;
-                        source.SQL_WorkNo = source1.SQL_WorkNo;
-                        source.SQL_ItemCode = source1.SQL_ItemCode;
-                        source.SQL_ItemName = source1.SQL_ItemName;
-                        source.SQL_charge = source1.SQL_charge;
-                        source.SQL_Total = source1.SQL_Total;
-                        source.SQL_PLAN_END = source1.SQL_PLAN_END;
-                        source.SQL_Modify_TIme = source1.SQL_Modify_TIme;
-                        source.OutNum = source1.OutNum;
-                        source.WorkType = source1.WorkType;
-                        source.MidArea = source1.MidArea;
-                        source.TagOver = source1.TagOver;
-                        source.TagOverTime = source1.TagOverTime;
-                        source.S_BQ_TRAY_TYPE = source1.S_BQ_TRAY_TYPE;
-                        source.S_CJ_NAME = source1.S_CJ_NAME;
-                        source.S_ROW = item;
-                        WorkOrder.Add(source);
-                    }
+                    //var source1 = orkOrd.FirstOrDefault();
+                    //foreach (var item in list)
+                    //{
+                    //    YWLWorkOrder source = new YWLWorkOrder();
+                    //    source.SQL_PLineNo = source1.SQL_PLineNo;
+                    //    source.FuLe_PLine_No = source1.FuLe_PLine_No;
+                    //    source.SQL_LinkLineNO = source1.SQL_LinkLineNO;
+                    //    source.SQL_Area = item;
+                    //    source.SQL_UsingNow = source1.SQL_UsingNow;
+                    //    source.SQL_State = source1.SQL_State;
+                    //    source.SQL_WorkNo = source1.SQL_WorkNo;
+                    //    source.SQL_ItemCode = source1.SQL_ItemCode;
+                    //    source.SQL_ItemName = source1.SQL_ItemName;
+                    //    source.SQL_charge = source1.SQL_charge;
+                    //    source.SQL_Total = source1.SQL_Total;
+                    //    source.SQL_PLAN_END = source1.SQL_PLAN_END;
+                    //    source.SQL_Modify_TIme = source1.SQL_Modify_TIme;
+                    //    source.OutNum = source1.OutNum;
+                    //    source.WorkType = source1.WorkType;
+                    //    source.MidArea = source1.MidArea;
+                    //    source.TagOver = source1.TagOver;
+                    //    source.TagOverTime = source1.TagOverTime;
+                    //    source.S_BQ_TRAY_TYPE = source1.S_BQ_TRAY_TYPE;
+                    //    source.S_CJ_NAME = source1.S_CJ_NAME;
+                    //    source.S_ROW = item;
+                    //    WorkOrder.Add(source);
+                    //}
                 }
+
+                orkOrd = orkOrd.FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10);
                 ReadCCK = can;
                 if (orkOrd.Any())
-                    //  foreach (var od in orkOrd.OrderByDescending(x => x.OutNum))
-                    foreach (var od in WorkOrder)
+                    foreach (var od in orkOrd.OrderBy(x => x.TagOverTime).ThenBy(x => x.OutNum))
+                    //foreach (var od in od2.ToList())
                     {
+                        list.Remove(od.S_ROW);
+                        var odsr = new List<string> { od.S_ROW }.Concat(list).Distinct().ToList();
                         ///姹囨�浠撳簱閲屾渶澶у眰鏄嚑灞傘�
                         Dictitems Lart = null;
-                        foreach (var area in od.S_ROW.Split('$'))
+                        foreach (var area in odsr)//od.S_ROW.Split('$'))
                         {
                             if (dsi.TryGetValue(area, out var dictitems1))
                             {
@@ -3617,107 +3619,113 @@
                             }
                         }
 
+                        LogHelper.Info($"AutoRun13TSJ 绛涢�鐗╂枡 搴撳尯鎺掓暟鎹�  {od.SQL_PLineNo} >>{od.OutNum}> {JsonConvert.SerializeObject(Lart)}");
                         // 闇�鏁伴噺 >= 浠撳簱鏈�ぇ鏁伴噺銆�灏卞紑濮嬪嚭搴撱�
-                        if (od.OutNum >= Lart?.ItemLayer)
-                        {
-                            var v = new List<string>() { Lart.area };
-                            Location StartBit = null;
-                            List<LocCntrRel> _clrel = new List<LocCntrRel>();
-
-                            foreach (var area in v.Concat(od.S_ROW.Split('$')).Distinct())
+                        if (Lart != null)
+                            if (od.OutNum >= Lart?.ItemLayer)
                             {
-                                var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
-                                foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
-                                {
-                                    var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
-                                    if (rl == null) continue;
-                                    _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
-                                    //鏉垮瀷鐩稿悓
-                                    var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
-                                    LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
-                                    var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
-                                    LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
-                                    if (_clcntitem != null)
-                                    {
-                                        LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME);
-                                        if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME)
-                                        {
+                                var v = new List<string>() { Lart.area };
+                                Location StartBit = null;
+                                List<LocCntrRel> _clrel = new List<LocCntrRel>();
 
-                                            StartBit = rl;
-                                            break;
+                                foreach (var area in v.Concat(od.S_ROW.Split('$')).Distinct())
+                                {
+                                    var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
+                                    foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
+                                    {
+                                        var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
+                                        if (rl == null) continue;
+                                        _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+                                        //鏉垮瀷鐩稿悓
+                                        var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+                                        LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+                                        var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
+                                        LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+                                        if (_clcntitem != null)
+                                        {
+                                            LogHelper.Info("鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME);
+                                            if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME)
+                                            {
+
+                                                StartBit = rl;
+                                                break;
+                                            }
                                         }
                                     }
+                                    if (StartBit != null)
+                                        break;
                                 }
-                                if (StartBit != null)
-                                    break;
-                            }
-                            if (StartBit == null)
-                                continue;
-                            Location Endbit = null;
-                            var loc = LocationHelper.GetLoc(PLC.location[0]);
-                            if (loc?.N_CURRENT_NUM == 0 && StartBit.N_CURRENT_NUM == 1 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
-                            {
-                                if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
-                                {
-                                    Endbit = LocationHelper.GetLoc(PLC.location[0]);
-                                }
-                            }
-                            else
-                            {
-                                Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x => x.N_CURRENT_NUM == 0);
-                            }
+                                if (StartBit == null)
+                                    continue;
+                                Location Endbit = null;
 
-                            if (StartBit != null && Endbit != null)
-                            {
-                                var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();
-                                var EndBit = Endbit.S_LOC_CODE;
-                                if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+                                var loc = LocationHelper.GetLoc(PLC.location[0]);
+                                if (loc?.N_CURRENT_NUM == 0 && StartBit.N_CURRENT_NUM == 1 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
                                 {
-                                    var locs1 = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE != "鎶ュ簾" && x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).ToList();
-                                    if (locs1.Count() > 0)
+                                    if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
                                     {
-                                        EndBit = locs1.FirstOrDefault().S_LOC_CODE;
-                                    }
-                                    else
-                                    {
-                                        continue;
+                                        Endbit = LocationHelper.GetLoc(PLC.location[0]);
                                     }
                                 }
-                                var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, EndBit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
-                                if (b)
+                                else
                                 {
+                                    Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x => x.N_CURRENT_NUM == 0);
+                                }
 
-                                    var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
-                                    var db = new SqlHelper<object>().GetInstance();
-                                    //缁欑粓鐐归攣瀹氫綇
+                                if (StartBit != null && Endbit != null)
+                                {
+                                    var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();
+                                    var EndBit = Endbit.S_LOC_CODE;
                                     if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
                                     {
-                                        var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == Endbit.S_LOC_CODE).First();
-
-                                        model.S_LOCK_STATE = "鍏ュ簱閿�;
-                                        var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
-                                        LogHelper.Info(Endbit.S_LOC_CODE + "LockLoc:閿佺粨鏋� + res);
-                                    }
-                                    //鎺掗攣
-                                    var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
-                                    if (row != null)
-                                    {
-                                        if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+                                        var locs1 = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE != "鎶ュ簾" && x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0).ToList();
+                                        if (locs1.Count() > 0)
                                         {
-                                            db.Deleteable(row).ExecuteCommand();
-                                            db.Insertable(r).ExecuteCommand();
+                                            EndBit = locs1.FirstOrDefault().S_LOC_CODE;
+                                        }
+                                        else
+                                        {
+                                            continue;
                                         }
                                     }
-                                    else db.Insertable(r).ExecuteCommand();
+                                    var b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, EndBit, "鍘熺墿鏂欐惉杩�绾哥", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
+                                    if (b)
+                                    {
+
+                                        var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍑哄簱閿�, S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
+                                        var db = new SqlHelper<object>().GetInstance();
+                                        //缁欑粓鐐归攣瀹氫綇
+                                        if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
+                                        {
+                                            var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == Endbit.S_LOC_CODE).First();
+
+                                            model.S_LOCK_STATE = "鍏ュ簱閿�;
+                                            var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
+                                            LogHelper.Info(Endbit.S_LOC_CODE + "LockLoc:閿佺粨鏋� + res);
+                                        }
+                                        //鎺掗攣
+                                        var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
+                                        if (row != null)
+                                        {
+                                            if (row.S_LOCK_SRC != r.S_LOCK_SRC)
+                                            {
+                                                db.Deleteable(row).ExecuteCommand();
+                                                db.Insertable(r).ExecuteCommand();
+                                            }
+                                        }
+                                        else db.Insertable(r).ExecuteCommand();
+                                        od.TagOverTime = DateTime.Now;
+                                        db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();
+                                        break;
+                                    }
                                 }
-                                break;
                             }
-                        }
                     }
             }
         }
         public static void AutoRunABD()
         {
+            LogHelper.Info($"AutoRunABD abcd鐗╂枡姹囨�  >>{ReadCCK}|| {dsi.Count}");
             if (!ReadCCK)
             {
                 Thread.Sleep(3000);
@@ -3748,8 +3756,13 @@
                     var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
 
                     var _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+                    if (!_clrel.Any())
+                    {
+                        LogHelper.Info($"{area}>> {rl.S_LOC_CODE}鏈夋暟閲忥紝 娌℃墭鐩�);
+                        continue;
+                    }
                     //鏉垮瀷鐩稿悓
-                    var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+                    var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).FirstOrDefault();
                     LogHelper.Info(rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆�);
 
                     var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
@@ -3797,6 +3810,7 @@
                     }
                 }
             }
+            LogHelper.Info($"AutoRunABD abcd鐗╂枡姹囨�瀹屾垚  >>{ReadCCK}|| {dsi.Count}");
         }
 
         public static void chargeCCD()

--
Gitblit v1.9.1