1
czw
2025-06-21 9b55b6b09630c2874229cdd2a9771a5e290e2f60
HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -8,6 +8,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Web.UI.WebControls.WebParts;
namespace HH.WCS.QingXigongchang.core
{
@@ -872,10 +873,10 @@
                    {
                        var lastloC = locs.OrderByDescending(x => x.N_COL).FirstOrDefault();
                        if (lastloC.N_CURRENT_NUM == lastloC.N_CAPACITY) WCSHelper.Do(db => db.Deleteable(item).ExecuteCommand());
                        else if (new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" }.Contains(item.S_AREA_CODE)) WCSHelper.Do(db => db.Deleteable(item).ExecuteCommand());
                    }
                }
            }
        }
        /// <summary>
@@ -1009,16 +1010,17 @@
        static bool InworkLock = false;
        /// <summary>
        /// 原材料 检测各流转位置。  写入托盘货位s_type 中 下一个目的地。就开始中转。
        /// 2025.4.8
        /// 1.清溪原材料测试与成品拆分
        /// 2.进出口单据与CS异常处理
        /// 原物料纸箱,入库堆叠区转运
        /// </summary>
        internal static void BottTask()
        {
            //InworkLock = false;
            var usingSpace = new List<string> { "入库接驳区", "库内接驳区", "出库接驳区", "提升机退料口" };
            //usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
            usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLT1TSJ", "YWLT2TSJ" };
            usingSpace = new List<string> { "YWLYLTKQ", "YWLTKKTQ", "YWLWJJB", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
            ///----------------------------退余料中间库区,退空中间库区,
            ///   /*托盘货位表的 S_TYPE。  库区1,库区,*/
            foreach (var area in usingSpace)
            {
                try
@@ -1043,6 +1045,7 @@
                            if (!cntritems.Any())
                                continue;
                            var cir1 = cntritems.First();
                            //只筛选纸箱物料的库区数据。
                            if (!string.IsNullOrEmpty(cir1.S_ITEM_NAME) && cir1.S_ITEM_NAME.Contains("纸箱-"))
                                if (dsll.TryGetValue(cir1.S_ITEM_CODE, out List<Location> ll))
                                {
@@ -1259,6 +1262,9 @@
            public static string RK_BQCDQ = "SXBQDDKQ";
        }
        /// <summary>
        ///  提扣 。标签。PE膜出库
        /// </summary>
        internal static void YwlTKPEBQ_Auto()
        {
            LogHelper.CoCo(DateTime.Now + "标签-提扣-PE膜->>>>>>>>>>>> ", ConsoleColor.Cyan);
@@ -1285,7 +1291,8 @@
                                           S_CNTR_CODE = cir.S_CNTR_CODE
                                       })
                                       .ToList();
            /// 人工堆叠区纸箱 和 标签 是按标识+物料筛选进行入库转运。
            /// 物料名称包含对应种类进行入库。
            var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
            var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
            var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("提扣-"));
@@ -1302,16 +1309,19 @@
            {
                try
                {
                    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 => x.TagOverTime).ToList();
                    if (!yuworders.Any())
                    {
                        YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
                    }
                    else
                    {
                        LogHelper.Info($" 无菌出库  工单开启中");
                        LogHelper.Info($" 无菌出库  工单开启中 ");
                        // 标签出库。货架直接出到线边
                        YwlBQ_CreWJOutOrder();
                    }
                    // 标签无菌退库。
                    YwlBQ_CreWJTK();
                }
                catch (Exception ex)
@@ -1326,7 +1336,7 @@
                try
                {
                    string pline = "T2提升机-标签";
                    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();
                    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 => 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 == "执行中");
@@ -1435,6 +1445,15 @@
                                    {
                                        var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                                        var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                        if (lastfull != null)
                                        {
                                            var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
                                            var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                            if (!xcirs.Any()) continue;
                                            var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                            if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME || xcir.S_CJ_NAME != cir.S_CJ_NAME)
                                                continue;
                                        }
                                        EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                                        if (EndBit != null)
                                            break;
@@ -1478,7 +1497,7 @@
                    //YwlPETKOutOrder("YWLTKMKQ", "", "PE叉运");// PE小出库
                    {
                        LogHelper.Info("-收缩膜  出库!");
                        var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && 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 == "T2提升机-收缩膜" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
                        if (!yuworders.Any())
                        {
                            LogHelper.Info("-收缩膜  出库!没有出库单。");
@@ -1721,13 +1740,13 @@
                Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 需要退库-- 自动退库-未实现");
            }
        }
        //标签退库。 线边转到 货架。
        private static void YwlBQ_CreWJTK()
        {
            var db = new SqlHelper<object>().GetInstance();
            var v = db.Queryable<Location>().
                LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
                .Where((l, c) => (l.S_AREA_CODE == WJ_BQ.RK_XBKQ || l.S_AREA_CODE == WJ_BQ.RK_BQJBQ) && c.S_TYPE == BQ_PRA.B)
                .Where((l, c) => (l.S_AREA_CODE == WJ_BQ.RK_XBKQ /*|| l.S_AREA_CODE == WJ_BQ.RK_BQJBQ*/) && c.S_TYPE == BQ_PRA.B)
                .ToList();
            if (v.Any())
            {
@@ -1750,45 +1769,46 @@
                            {
                                var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
                                Location Endbit = null;
                                if (area == WJ_BQ.RK_BQJBQ)
                                if (area == area/* WJ_BQ.RK_BQJBQ*/)
                                {
                                    var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
                                    Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
                                    if (Endbit != null)
                                    {
                                        var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "标签叉运-接驳标签退库", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
                                        var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "标签叉运-线边标签退库", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
                                        LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 标签叉运-接驳标签退库 ,创建{re}");
                                    }
                                }
                                else
                                {
                                    var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                                    foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
                                    {
                                        var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
                                        var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                        if (l2 != null && l2.N_CURRENT_NUM > 0)
                                        {
                                            var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
                                            if (c.FirstOrDefault()?.S_TYPE != BQ_PRA.B)
                                            {
                                                continue;
                                            }
                                            var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                            if (!xcirs.Any()) continue;
                                            var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                            if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME)
                                                continue;
                                        }
                                        var e = y2.Find(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
                                        if (e != null)
                                        {
                                            var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-线边标签退库", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.B);
                                            LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-线边标签退库 ,创建{re} ");
                                            break;
                                        }
                                    }
                                }
                                //else
                                //{
                                //    var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                                //    foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
                                //    {
                                //        var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
                                //        var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                //        if (l2 != null && l2.N_CURRENT_NUM > 0)
                                //        {
                                //            var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
                                //            if (c.FirstOrDefault()?.S_TYPE != BQ_PRA.B)
                                //            {
                                //                continue;
                                //            }
                                //            var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                //            if (!xcirs.Any()) continue;
                                //            var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                //            if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME)
                                //                continue;
                                //        }
                                //        var e = y2.Find(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
                                //        if (e != null)
                                //        {
                                //            var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-线边标签退库", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.B);
                                //            LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-线边标签退库 ,创建{re} ");
                                //            break;
                                //        }
                                //    }
                                //}
                            }
                        }
                    }
@@ -2160,6 +2180,7 @@
                    //LogHelper.Info($"{plc.deviceName}-标签{tagLoc.S_LOC_CODE}//{DeviceProcess.doorStatus[ploc]?.info}-----{(!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")}");
                    if (tagLoc != null)
                    {
                        // 这里都是1层的,所以必走  current_num =1
                        if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
                        {
                            // 直接出提升机位
@@ -2253,7 +2274,7 @@
        }
        /// <summary>
        ///
        /// 标签入库。 从人工绑定区  到 货架区。
        /// </summary>
        /// <param name="locsFirst"></param>
        internal static void YwlBQ_CreInwork(List<locCntItem> locsFirst, string RK_BQDDQ, string RK_BBHJQ)
@@ -2467,73 +2488,74 @@
            LogHelper.Info($" 无菌出库  开始");
            //1.检查是否有退库
            var db = new SqlHelper<object>().GetInstance();
            ///第三段:接驳区 转 线边
            var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
            foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
            if (false)
            {
                LogHelper.Info($" 无菌出库 接驳有数据");
                var y2 = jbr.OrderBy(x => x.N_COL).ToList();
                var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                if (l2 != null)
                ///第三段:接驳区 转 线边
                var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
                {
                    var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
                    if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
                    LogHelper.Info($" 无菌出库 接驳有数据");
                    var y2 = jbr.OrderBy(x => x.N_COL).ToList();
                    var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                    if (l2 != null)
                    {
                        //回库。
                        LogHelper.Info($"循环有无退库==> 有 退库" + l2.S_LOC_CODE);
                        continue;
                    }
                    var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                    if (!cirs.Any())
                    {
                        LogHelper.Info($"循环有无退库==> 没有物料信息 托盘:" + c.FirstOrDefault().S_CNTR_CODE);
                        continue;
                    }
                    var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                    var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
                    foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
                    {
                        LogHelper.Info($" 无菌出库 线边有数据");
                        var x2 = x1.OrderBy(x => x.N_COL).ToList();
                        var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                        if (l3 != null)
                        var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
                        if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
                        {
                            var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
                            if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
                            {
                                LogHelper.Info($"循环线边==> 有 退库" + xc.FirstOrDefault()?.S_TYPE);
                                continue;
                            }
                            var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
                            if (!xcirs.Any())
                            {
                                LogHelper.Info($"循环线边==>  没有物料信息 托盘:" + xc.FirstOrDefault().S_CNTR_CODE);
                                continue;
                            }
                            var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                            if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
                            {
                                LogHelper.Info($"循环线边==>  物料不匹配 托盘:" + xc.FirstOrDefault().S_CNTR_CODE);
                                continue;
                            }
                            //回库。
                            LogHelper.Info($"循环有无退库==> 有 退库" + l2.S_LOC_CODE);
                            continue;
                        }
                        var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
                        LogHelper.Info($"无菌 生成任务==> 是否有合适的货位信息" + e?.S_LOC_CODE);
                        if (e != null)
                        var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                        if (!cirs.Any())
                        {
                            var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-接驳转线边", new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
                            LogHelper.Info($"from {l2.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-接驳转线边 ,创建{re} ");
                            break;
                            LogHelper.Info($"循环有无退库==> 没有物料信息 托盘:" + c.FirstOrDefault().S_CNTR_CODE);
                            continue;
                        }
                        var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                        var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
                        foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
                        {
                            LogHelper.Info($" 无菌出库 线边有数据");
                            var x2 = x1.OrderBy(x => x.N_COL).ToList();
                            var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                            if (l3 != null)
                            {
                                var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
                                if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
                                {
                                    LogHelper.Info($"循环线边==> 有 退库" + xc.FirstOrDefault()?.S_TYPE);
                                    continue;
                                }
                                var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
                                if (!xcirs.Any())
                                {
                                    LogHelper.Info($"循环线边==>  没有物料信息 托盘:" + xc.FirstOrDefault().S_CNTR_CODE);
                                    continue;
                                }
                                var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
                                {
                                    LogHelper.Info($"循环线边==>  物料不匹配 托盘:" + xc.FirstOrDefault().S_CNTR_CODE);
                                    continue;
                                }
                            }
                            var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
                            LogHelper.Info($"无菌 生成任务==> 是否有合适的货位信息" + e?.S_LOC_CODE);
                            if (e != null)
                            {
                                var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-接驳转线边", new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
                                LogHelper.Info($"from {l2.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-接驳转线边 ,创建{re} ");
                                break;
                            }
                        }
                    }
                }
            }
            LogHelper.Info($" 无菌出库 到线边 结束");
            ///拆垛区取消。
            if (false)
            {
                LogHelper.Info($" 无菌出库 到线边 结束");
                ///拆垛区取消。
                ///第二段:拆垛区。拆去接驳。 或者回库。
                var v = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQCDQ);
                ///拆垛的出库。 单层的回库  单层不入拆垛区
@@ -2588,8 +2610,9 @@
                    }
                }
            }
            ///第一段:出库 -到拆垛或者 接驳。
            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 => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
        //foreach (var order in yuworders)
        retuse:
@@ -2603,6 +2626,7 @@
                    yuworders.Remove(order);
                    goto retuse;
                }
                var oto = new List<string>();
                //if (!string.IsNullOrEmpty(order.TagOver))
                //    oto = order.TagOver.Split(',').ToList();
@@ -2651,7 +2675,7 @@
                        if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
                        {
                            // 直接出接驳位
                            var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                            var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
                            foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
                            {
                                var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
@@ -2663,16 +2687,16 @@
                                    {
                                        continue;
                                    }
                                    var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                    if (!cirs.Any()) continue;
                                    var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                    if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
                                        continue;
                                    //var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                    //if (!cirs.Any()) continue;
                                    //var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                    //if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
                                    //    continue;
                                }
                                var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
                                if (e != null)
                                {
                                    var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-货架出接驳", new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
                                    var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-货架出线边", new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
                                    LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-货架出接驳 ,创建{re} ");
                                    if (re)
                                        oto.Add(item);
@@ -3005,7 +3029,7 @@
                                if (endBit != null)
                                {
                                    LogHelper.Info($"{spn} - 去中转区,找到位置{endBit.S_LOC_CODE}");
                                    bool bb = TaskProcess.CreateTransport(order.SQL_WorkNo, strBit.S_LOC_CODE, endBit.S_LOC_CODE, spn + "中转去", new List<string> { crl.S_CNTR_CODE }, strBit.N_CURRENT_NUM, endBit.N_CURRENT_NUM++, 1, 50, crl.S_TYPE);
                                    bool bb = TaskProcess.CreateTransport(order.SQL_WorkNo, strBit.S_LOC_CODE, endBit.S_LOC_CODE, spn + "中转去", new List<string> { crl.S_CNTR_CODE }, strBit.N_CURRENT_NUM, endBit.N_CURRENT_NUM + 1, 1, 50, crl.S_TYPE);
                                    LogHelper.Info($"{spn}未开,翻斗机开。线程,创建去{areaList}中转区的任务{(bb ? "成功" : "失败")}");
                                    if (bb && needBread)
                                    {
@@ -3300,6 +3324,7 @@
                                LogHelper.Info($"备货单:{outOer.S_Work_NO} 最后移库库区{ea} - 排{er} 怎么他妈是空的!!!诡了个异的");
                            }
                        }
                    eaaa:
                        if (string.IsNullOrEmpty(end_area))
                        {
@@ -3380,7 +3405,6 @@
                                //}
                            }
                        }
                        if (string.IsNullOrEmpty(start_area)
                            || string.IsNullOrEmpty(start_row)
@@ -3535,7 +3559,10 @@
            public string area { get; set; }
            public string Row { get; set; }
            /// <summary>
            /// 排
            /// </summary>
            public int Row { get; set; }
        }
        /// <summary>
@@ -3543,7 +3570,60 @@
        /// </summary>
        public static void AutoRun13TSJ()
        {
            var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
            Action<YWLWorkOrder> _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好 = (od) =>
            {
                LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}对应工单的{od.S_ROW} 物料数量不足。触发转运。");
                // 先看是否有到该库区的转运任务。
                var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "执行" && X.S_END_AREA == od.S_ROW);
                //1.查看物料是否匹配。
                var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
                if (itemTRUN)
                {  //有到该库区的 物料转运任务了。 不需要继续了 。
                    LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}已经存在转运了无需触发转运。");
                    return;
                }
                //人工转运没指定物料,我会自动写回转运单 物料数据。
                //找CD 区 哪里有这个物料。
                Dictitems TrunStart = null;
                foreach (var area in CDlist)
                {
                    if (dsi.TryGetValue(area, out var dictitems1))
                    {
                        var arearowsloc = LocationHelper.GetAreaNormalLocList(area);
                        foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
                        {
                            if (arearowsloc.Exists(x => x.N_ROW == d.Row))
                            {
                                TrunStart = d;
                                break;
                            }
                        }
                    }
                }
                LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}触发转运。转运来源是{JsonConvert.SerializeObject(TrunStart)}");
                if (TrunStart != null)
                    WCSHelper.Do(db =>
                    {
                        db.Insertable(new YWLZXtake
                        {
                            S_START_AREA = TrunStart.area,
                            N_START_ROW = TrunStart.Row,
                            S_END_AREA = od.S_ROW,
                            S_ZX_STATE = "执行",
                            S_ITEM_CODE = od.SQL_ItemCode,
                            S_ITEM_NAME = od.SQL_ItemName,
                            S_CJ_NAME = od.S_CJ_NAME,
                            S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
                        }).ExecuteCommand();
                    });
            };
            //var TaskSiggg = Settings.GetTimeStamp();
            //var list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
            //var WorkOrder = new List<YWLWorkOrder>();
            foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
            {
@@ -3598,12 +3678,17 @@
                    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();
                        var l2 = new List<string>() { "YWLAQWJ", "YWLBQWJ" };//, "YWLCQSX", "YWLDQWJ" };
                        l2.Remove(od.S_ROW);
                        l2.Remove(od.TagOver);
                        var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();
                        ///汇总仓库里最大层是几层。
                        Dictitems Lart = null;
                        foreach (var area in odsr)//od.S_ROW.Split('$'))
                        {
                            if (string.IsNullOrEmpty(area)) continue;
                            if (dsi.TryGetValue(area, out var dictitems1))
                            {
                                foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME))
@@ -3618,17 +3703,19 @@
                                }
                            }
                        }
                        //等下要检测,如果没有可用排,或者AB库区内物料数<5 就要从CD 开始转运。
                        var autoTurn = false;
                        LogHelper.Info($"AutoRun13TSJ 筛选物料 库区排数据.  {od.SQL_PLineNo} >>{od.OutNum}> {JsonConvert.SerializeObject(Lart)}");
                        // 需要数量 >= 仓库最大数量。 就开始出库。
                        if (Lart != null)
                        {
                            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())
                                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))
@@ -3638,15 +3725,14 @@
                                        _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));
                                        LogHelper.Info("AutoRun13TSJ" + 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));
                                        LogHelper.Info("AutoRun13TSJ" + 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);
                                            LogHelper.Info("AutoRun13TSJ" + "相互是否匹配 _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 + "结果:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.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;
                                            }
@@ -3656,42 +3742,70 @@
                                        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]);
                                    }
                                    autoTurn = true;
                                    LogHelper.Info("AutoRun13TSJ" + $"{od.SQL_PLineNo} 出库 {Lart.area}区域没有物料可用起点");
                                    continue;
                                }
                                else
                                {
                                    Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x => x.N_CURRENT_NUM == 0);
                                    //检测指定库区的物料排总数量
                                    if (dsi.TryGetValue(od.S_ROW, out var dictitems1))
                                    {
                                        var rows = dictitems1.Select(x => x.Row).Distinct();
                                        var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW && rows.Contains(x.N_ROW));
                                        var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "无").Sum(x => x.N_CURRENT_NUM);
                                        LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 出库余量判断是否需要转运。-{count}< 5");
                                        if (count < 5)
                                        {
                                            autoTurn = true;
                                            _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
                                        }
                                    }
                                }
                                Location Endbit = null;
                                var loc = LocationHelper.GetLoc(PLC.location[0]);
                                if (StartBit.N_CURRENT_NUM == 1)
                                {
                                    if (loc?.N_CURRENT_NUM == 0 && DeviceProcess.doorStatus.ContainsKey(PLC.location[0]))
                                    {
                                        if (DeviceProcess.doorStatus[PLC.location[0]].info == "1")
                                        {
                                            Endbit = LocationHelper.GetLoc(PLC.location[0]);
                                        }
                                    }
                                    if (Endbit == null)
                                        break;
                                }
                                else
                                {
                                    Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM == 0);
                                }
                                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 jbbit = "";
                                    if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ" || Endbit.S_AREA_CODE == "YWLDQWJ" || Endbit.S_AREA_CODE == "YWLCQSX")
                                    {
                                        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)
                                        {
                                            EndBit = locs1.FirstOrDefault().S_LOC_CODE;
                                            jbbit = locs1.FirstOrDefault().S_LOC_CODE;
                                        }
                                        else
                                        {
                                            continue;
                                        }
                                    }
                                    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);
                                    var b = false;
                                    if (!string.IsNullOrEmpty(jbbit))
                                        b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, jbbit, "原物料搬运-纸箱", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri, "", Endbit.S_LOC_CODE);
                                    else
                                        b = TaskProcess.CreateTransport(od.SQL_WorkNo, StartBit.S_LOC_CODE, Endbit.S_LOC_CODE, "原物料搬运-纸箱", crs, StartBit.N_CURRENT_NUM - crs.Count + 1, 1, crs.Count, PLC.taskPri);
                                    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();
                                        //给终点锁定住
@@ -3704,22 +3818,33 @@
                                            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();
                                        //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;
                                        od.TagOver = StartBit.S_AREA_CODE;
                                        db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
                                        //break;
                                    }
                                }
                                else
                                {
                                    LogHelper.Info($"{od.SQL_PLineNo} 出库起点{StartBit.S_LOC_CODE}-{StartBit.N_CURRENT_NUM},没有可用终点");
                                    continue;
                                }
                            }
                        }
                        else
                        {
                            _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
                        }
                    }
            }
        }
@@ -3771,14 +3896,14 @@
                    {
                        if (dsi.TryGetValue(area, out dictitems))
                        {
                            var ill = dictitems.Find(x => x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
                            var ill = dictitems.Find(x => x.Row == rl.N_ROW && x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
                            if (ill != null)
                            {
                                if (rl.N_CURRENT_NUM > ill.ItemLayer)
                                {
                                    ill.ItemLayer = rl.N_CURRENT_NUM;
                                    ill.area = area;
                                    ill.Row = $"{rl.S_LOC_CODE}";
                                    ill.Row = rl.N_ROW;
                                }
                                else continue;
                            }
@@ -3789,7 +3914,7 @@
                                ItemLayer = rl.N_CURRENT_NUM,
                                S_CJ_NAME = _clcntitem.S_CJ_NAME,
                                area = area,
                                Row = $"{rl.S_LOC_CODE}"
                                Row = rl.N_ROW
                            });
                            dsi[area] = dictitems;
                        }
@@ -3803,7 +3928,7 @@
                                ItemLayer = rl.N_CURRENT_NUM,
                                S_CJ_NAME = _clcntitem.S_CJ_NAME,
                                area = area,
                                Row = $"{rl.S_LOC_CODE}"
                                Row = rl.N_ROW
                            });
                            dsi.Add(area, dictitems);
                        }
@@ -3828,6 +3953,7 @@
                    list.AddRange(item.MidArea.Split('$'));
                }
            }
            foreach (var item in list.Distinct())
            {
                var locs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == item && x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "无");
@@ -3883,6 +4009,7 @@
                var locS = LocationHelper.GetAreaNormalLocList(ODs.Key);
                foreach (var od in ODs)
                {
                    LogHelper.Info($"from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 开始 》》》");
                    if (string.IsNullOrEmpty(od.S_ZZ_AREA) || string.IsNullOrEmpty(od.S_END_AREA))
                    {
                        LogHelper.CError($"from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 数据缺失。无法完成移库。");
@@ -3902,10 +4029,12 @@
                            var lastful = rows.FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
                            if (lastful != null)
                            {
                                LogHelper.Info($"from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 找到移库起点》{lastful.S_LOC_CODE}。");
                                var crs = LocationHelper.GetLocCntrRel(lastful.S_LOC_CODE);
                                var cntritems = ContainerHelper.GetCntrItemRel(crs.FirstOrDefault()?.S_CNTR_CODE);
                                if (!cntritems.Any())
                                    continue;
                                LogHelper.Info($"from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 找到移库起点》{lastful.S_LOC_CODE}。接驳是否被锁?:{InworkLock}");
                                var cir1 = cntritems.First();
                                if (od.S_ZZ_AREA == "YWLWJJB")
                                {
@@ -3914,7 +4043,8 @@
                                    else InworkLock = true;
                                }
                                else InworkLock = false;
                                var zzlocs = LocationHelper.GetAreaNormalLocList(od.S_ZZ_AREA);
                                string nextarea = !string.IsNullOrEmpty(od.S_ZZ_AREA) ? od.S_ZZ_AREA : od.S_END_AREA;
                                var zzlocs = LocationHelper.GetAreaNormalLocList(nextarea);
                                Location Endbit = null;
                                foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
                                {
@@ -3926,7 +4056,7 @@
                                        var cntrrel = ContainerHelper.GetCntrItemRel(rel.FirstOrDefault()?.S_CNTR_CODE).FirstOrDefault();
                                        if (cntrrel == null)
                                            continue;
                                        if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME)
                                        if (cntrrel.S_ITEM_CODE == cir1.S_ITEM_CODE && cntrrel.S_ITEM_NAME == cir1.S_ITEM_NAME && cntrrel.S_CJ_NAME == cir1.S_CJ_NAME)
                                        {
                                            Endbit = zzrloclist.Find(x => x.N_COL > (_cl2?.N_COL ?? 0));
                                        }
@@ -3939,11 +4069,20 @@
                                        break;
                                    }
                                }
                                LogHelper.Info($"from{od.S_START_AREA} mid:{od.S_ZZ_AREA} to{od.S_END_AREA} 找到移库终点》{Endbit?.S_LOC_CODE}");
                                if (Endbit != null)
                                {
                                    //生成接驳区任务,标记为终点库区。
                                    var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "原物料搬运-纸箱", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, od.S_END_AREA);
                                    var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "原物料搬运-纸箱", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, nextarea == od.S_END_AREA ? "" : od.S_END_AREA);
                                    if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
                                    if (!string.IsNullOrEmpty(od.S_ITEM_CODE))
                                    {
                                        ///给移库单 写上转运的物料数据。
                                        od.S_ITEM_CODE = cir1.S_ITEM_CODE;
                                        od.S_ITEM_NAME = cir1.S_ITEM_NAME;
                                        od.S_CJ_NAME = cir1.S_CJ_NAME;
                                        WCSHelper.Do(db => db.Updateable(od).UpdateColumns(it => new { it.S_ITEM_NAME, it.S_ITEM_CODE, it.S_CJ_NAME }).ExecuteCommand());
                                    }
                                    break;
                                }
                                else if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;