1

pulg

2025-06-26 c7cc6a7851eb8c3caa697d3a8382a1ff09db2586

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1074,6 +1074,7 @@
                        }
                    }
                    if (dsll.Any())
                    {
                        foreach (var r in dsll)
                        {
                            foreach (var rows in r.Value.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
@@ -1148,9 +1149,9 @@
                                        if (arloclist.Any())
                                        {
                                            if (EdnRarea == "YWLWJJB")//纸箱无菌接驳区
                                            //    InworkLock = true;
                                            //else InworkLock = false;
                                            //if (od.S_ZZ_AREA == "YWLWJJB")
                                                                      //    InworkLock = true;
                                                                      //else InworkLock = false;
                                                                      //if (od.S_ZZ_AREA == "YWLWJJB")
                                            {
                                                if (InworkLock)
                                                    continue;
@@ -1182,7 +1183,7 @@
                                                        LogHelper.Info($"查起点有多少同品种的物料 开始");
                                                        var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
                                                        ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == cir1.S_ITEM_CODE && t.S_ITEM_NAME == cir1.S_ITEM_NAME && t.S_CJ_NAME == cir1.S_CJ_NAME && o.S_AREA_CODE == "YWLRGDD" && p.S_TYPE == _clrel0.S_TYPE);
                                                        var lstCanOutL = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).Includes(e => e.LocCntrRel, p => p.CntrItemRel).ToList();
                                                        var lstCanOutL = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
                                                        LogHelper.Info($"起点要入CD的有多少托盘数量为{lstCanOutL.Count()}");
                                                        //判断终点排能入多少  少于入库托盘数则多开一排 EndMum 
                                                        var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && inlockLis.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
@@ -1281,7 +1282,11 @@
                                }
                            }
                        }
                    else if (InworkLock) InworkLock = false;
                    }
                    else if (InworkLock)
                    {
                        InworkLock = false;
                    }
                }
                catch (Exception ex)
                {
@@ -1362,12 +1367,20 @@
                                           S_NOTE = cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim(),
                                           S_ITEM_CODE = cir.S_ITEM_CODE,
                                           S_ITEM_NAME = cir.S_ITEM_NAME,
                                           S_BATCH_NO = cir.S_BATCH_NO,
                                           S_CJ_NAME = cir.S_CJ_NAME,
                                           S_CNTR_CODE = cir.S_CNTR_CODE
                                       })
                                       .ToList();
            /// 人工堆叠区纸箱 和 标签 是按标识+物料筛选进行入库转运。 
            /// 物料名称包含对应种类进行入库。
            foreach (var item in locsFirstA)
            {
                if (!string.IsNullOrEmpty(item.S_BATCH_NO))
                {
                    item.S_NOTE = item.S_NOTE + "&" + item.S_BATCH_NO;
                }
            }
            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("提扣-"));
@@ -1509,6 +1522,7 @@
                                string v = "YWLTKMKQ";
                                var rklist = LocationHelper.GetRowLock(v);
                                int hof = (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3));

                                var inlock = rklist.Find(x => x.S_LOCK_SRC == (cir.S_ITEM_CODE.Trim() + "&" + cir.S_ITEM_NAME.Trim() + hof) && x.S_LOCK_STATE.Contains("入库锁"));
                                Location EndBit = null;
                                var NormalList = LocationHelper.GetAreaNormalLocList(v);
@@ -2071,7 +2085,10 @@
        private static void YwlPETK_CreInwork(List<locCntItem> klocsFirst, string v, string v2, int v1 = 3)
        {
            bool ord = v2.Contains("提扣");
            foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
            var chi = new SqlHelper<object>().GetInstance();
            var newDb = chi.CopyNew();
            var yx = klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList();
            foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList())
            {
                Location EndBit = null;
                var rsfull = ptR.OrderBy(X => X.N_COL).ToList().FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
@@ -2095,11 +2112,40 @@
                    }
                    else
                    {
                        var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                        var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct().ToList();
                        var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
                        if (EptRowlist.Any())
                        {
                            EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                        }
                        else
                        {
                            if (hasNum.Any())
                            {
                                //有相同物料 相同标签的继续入
                                List<Location> lstCanOutL = new List<Location>();
                                if (!string.IsNullOrEmpty(rsfull.S_BATCH_NO))
                                {
                                    lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where((o, p, t) => o.S_AREA_CODE == v && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && hasNum.Contains(o.N_ROW) && t.S_ITEM_CODE == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && t.S_BATCH_NO == rsfull.S_BATCH_NO).ToList();

                                }
                                else
                                {
                                    lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where((o, p, t) => o.S_AREA_CODE == v && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && hasNum.Contains(o.N_ROW) && t.S_ITEM_CODE == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && string.IsNullOrEmpty(t.S_BATCH_NO)).ToList();
                                }
                                if (lstCanOutL.Any())
                                {
                                    var loclist1 = NormalList.FindAll(x => lstCanOutL.Select(f => f.N_ROW).Distinct().ToList().Contains(x.N_ROW));
                                    foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
                                    {
                                        var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                                        var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                        EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                                        if (EndBit != null)
                                            break;
                                    }
                                }
                            }
                        }
                    }
                    if (EndBit != null)
@@ -2107,29 +2153,29 @@
                        var res = TaskProcess.CreateTransport("", rsfull.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v2 + "-入库", new List<string> { rsfull.S_CNTR_CODE }, rsfull.N_CURRENT_NUM, EndBit.N_CURRENT_NUM + 1, 1, 62);
                        LogHelper.CSucessLog($"from {rsfull.S_LOC_CODE} to {EndBit.S_LOC_CODE} {(v2 + "-入库")} ，创建{res} ");

                        if (res && inlock == null)
                        {
                            var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
                            var db = new SqlHelper<object>().GetInstance();
                            db.Insertable(r).ExecuteCommand();
                            //else
                            //{
                            //    if (inlock.N_ROW != EndBit.N_ROW)
                            //    {
                            //        db.Deleteable(inlock).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();
                            //    }
                            //}
                        }
                        //if (res && inlock == null)
                        //{
                        //    var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
                        //    var db = new SqlHelper<object>().GetInstance();
                        //    db.Insertable(r).ExecuteCommand();
                        //    //else
                        //    //{
                        //    //    if (inlock.N_ROW != EndBit.N_ROW)
                        //    //    {
                        //    //        db.Deleteable(inlock).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();
                        //    //    }
                        //    //}
                        //}
                    }
                    Thread.Sleep(1000);
                }
@@ -3640,65 +3686,175 @@
            public int Row { get; set; }

        }

        /// <summary>
        /// 原物料纸箱出库
        /// AB区物料不足自动转运
        /// </summary>
        public static void AutoRun13TSJ()
        public static void ZdzyABArea()
        {
            Action<YWLWorkOrder> _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好 = (od) =>
            try
            {
                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)
                var chi = new SqlHelper<object>().GetInstance();
                var newDb = chi.CopyNew();
                foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
                {
                    if (dsi.TryGetValue(area, out var dictitems1))
                    string pline = PLC.deviceName;
                    if (PLC.deviceName.Contains("T2"))
                        pline = "T2提升机-纸箱";

                    var orkOrd = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 6 && x.SQL_State == "执行中");
                    if (orkOrd.Any())
                    {
                        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))
                        foreach (var od in orkOrd)
                        {
                            if (arearowsloc.Exists(x => x.N_ROW == d.Row))
                            var loclist = LocationHelper.GetLocList(x => x.S_AREA_CODE == od.S_ROW);
                            //查询可用货位有多少
                            List<string> Ky = new List<string>() { "无", "出库锁", "入库锁" };
                            var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
                            var count = loclist.FindAll(x => x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "无").Count();
                            LogHelper.Info("AutoRun13TSJ" + $"od.S_ROW 出库余量判断是否需要转运。-{count}< 总共能用的货位数{loclistK} -7");
                            if (count <= loclistK - 7)
                            {
                                TrunStart = d;
                                break;
                                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 = new Dictitems();
                                foreach (var area in CDlist)
                                {
                                    //var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();

                                    //ca.And((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && t.S_CJ_NAME == od.S_CJ_NAME);
                                    var lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && t.S_CJ_NAME == od.S_CJ_NAME).ToList();
                                    if (!lstCanOutL.Any())
                                    {
                                        lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName).ToList();
                                    }
                                    List<string> CRk = new List<string>() { "出库锁", "入库锁" };
                                    var EndMum = newDb.Queryable<Location>().Where(l => l.S_AREA_CODE == area && CRk.Contains(l.S_LOCK_STATE)).ToList();
                                    var RowLock = EndMum.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
                                    foreach (var item in RowLock)
                                    {
                                        lstCanOutL.RemoveAll(e => e.N_ROW == item.N_ROW);
                                    }
                                    if (lstCanOutL.Count() > 0)
                                    {
                                        var LstCan = newDb.Queryable<LocCntrRel>().Where(a => lstCanOutL.Select(e => e.S_LOC_CODE).ToList().Contains(a.S_LOC_CODE)).ToList();
                                        var loc = lstCanOutL.Find(e => e.S_LOC_CODE == LstCan.OrderBy(c => c.T_CREATE).FirstOrDefault().S_LOC_CODE);
                                        TrunStart.area = area;
                                        TrunStart.Row = loc.N_ROW;
                                    }
                                    //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($"ZdzyABArea{od.SQL_WorkNo}触发转运。转运来源是{JsonConvert.SerializeObject(TrunStart)}");
                                if (TrunStart?.area != 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();
                                    });

                            }
                        }
                    }
                }

                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>();
            }
            catch (Exception ex)
            {

                LogHelper.Info($"ZdzyABArea 触发转运 报错:{ex.Message}");
            }
        }

        /// <summary>
        /// 原物料纸箱出库
        /// </summary>
        public static void AutoRun13TSJ()
        {
            //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();
            //        });
            //};
            foreach (var PLC in Settings.GetDeviceInfoList().FindAll(X => X.deviceType == 13 && X.enable == 1))
            {
                string pline = PLC.deviceName;
@@ -3716,34 +3872,6 @@
                    if (locs.Find(x => x.N_CURRENT_NUM > 0) != null) //拆垛有货 不判断
                        continue;
                    can = true;

                    //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);
@@ -3768,7 +3896,7 @@
                            }
                            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))
                                foreach (var d in dictitems1.FindAll(x => x.ItemCode == od.SQL_ItemCode && x.ItemName == od.SQL_ItemName))
                                {
                                    if (Lart == null)
                                        Lart = d;
@@ -3808,7 +3936,7 @@
                                        if (_clcntitem != null)
                                        {
                                            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)
                                            if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
                                            {
                                                StartBit = rl;
                                                break;
@@ -3829,15 +3957,18 @@
                                    //检测指定库区的物料排总数量
                                    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);
                                        }
                                        //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));
                                        ////查询可用货位有多少
                                        //List<string> Ky = new List<string>() { "无", "出库锁", "入库锁" };
                                        //var loclistK = loclist.FindAll(x => Ky.Contains(x.S_LOCK_STATE)).Count();
                                        //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}< 总共能用的货位数{loclistK} -7");
                                        //if (count < loclistK - 7)
                                        //{
                                        //    autoTurn = true;
                                        //    _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
                                        //}
                                    }
                                }
                                Location Endbit = null;
@@ -3881,10 +4012,17 @@
                                        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();
                                        od.TagOverTime = DateTime.Now;
                                        od.TagOver = StartBit.S_AREA_CODE;
                                        var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
                                        LogHelper.Info($"上提升机任务 更新工单的时间影响行数: {ggf}");

                                        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 };

                                        //给终点锁定住
                                        if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")
                                        {
@@ -3905,9 +4043,7 @@
                                        //    }
                                        //}
                                        //else db.Insertable(r).ExecuteCommand();
                                        od.TagOverTime = DateTime.Now;
                                        od.TagOver = StartBit.S_AREA_CODE;
                                        db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();

                                        //break;
                                    }
                                }
@@ -3918,10 +4054,10 @@
                                }
                            }
                        }
                        else
                        {
                            _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
                        }
                        //else
                        //{
                        //    _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);
                        //}
                    }
            }
        }