blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
pulg
2025-06-24 79d3258dd565313603cb7ad36db746d1c9cc5c6e 
 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))


@@ -1104,6 +1105,19 @@


                                        //else


                                        var ccr = _clrel0.S_TYPE.Split(',');


                                        string EdnRarea = ccr.First();




                                        if (EdnRarea == "YWLBQWJ" || EdnRarea == "YWLWJJB")//到B区的移库工单最多只能生成两条任务


                                        {


                                            //查询任务数 


                                            List<string> AreaLi = new List<string>() { "YWLBQWJ", "YWLWJJB" };


                                            var db = new SqlHelper<object>().GetInstance();


                                            var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();


                                            if (list.Count() >= 2)


                                            {


                                                LogHelper.Info($"CreateTransport-  CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");


                                                continue;


                                            }


                                        }


                                        string Last = string.Join(",", ccr.Skip(1));




                                        if (ABlist.Contains(EdnRarea))


@@ -1121,12 +1135,23 @@


                                        var cir1 = cntritems.First();




                                        var arloclist = LocationHelper.GetAreaNormalLocList(EdnRarea);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == _clrel0.S_TYPE && x.S_LOCK_STATE != "报废");




                                        //有移库工单 排除移库工单上所对应的排


                                        var order = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "执行").ToList();


                                        if (order.Count() > 0)


                                        {


                                            foreach (var item in order)


                                            {


                                                LogHelper.Info($"有移库工单排除对应的库区{item.S_START_AREA} 排{item.N_START_ROW}");


                                                arloclist.RemoveAll(e => e.S_AREA_CODE == item.S_START_AREA && e.N_ROW == item.N_START_ROW);


                                            }


                                        }


                                        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;


@@ -1143,7 +1168,10 @@


                                            {


                                                isCd = true;


                                                inlockLis = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && x.S_LOCK_STATE == "入库锁").ToList();


                                                inlock = inlockLis.FirstOrDefault();


                                                if (inlockLis.Count() > 0)


                                                {


                                                    inlock = inlockLis.FirstOrDefault();


                                                }


                                                if (inlock != null)


                                                {


                                                    //当入库的任务能放满一排并且还有余的时候 开第二排


@@ -1155,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();


@@ -1242,6 +1270,7 @@


                                                if (res && inlock == null && isCd)


                                                {


                                                    var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };


                                                    LogHelper.Info($"原物料入库 添加排锁信息{JsonConvert.SerializeObject(rrrr)} ");


                                                    WCSHelper.Do(db => db.Insertable(rrrr).ExecuteCommand());


                                                }


                                                if (EdnRarea == "YWLWJJB") InworkLock = false;


@@ -1253,7 +1282,11 @@


                                }


                            }


                        }


                    else if (InworkLock) InworkLock = false;


                    }


                    else if (InworkLock)


                    {


                        InworkLock = false;


                    }


                }


                catch (Exception ex)


                {


@@ -3612,65 +3645,171 @@


            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 == "无").Sum(x => x.N_CURRENT_NUM);


                            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();


                                    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;


@@ -3688,34 +3827,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);


@@ -3726,15 +3837,18 @@


                    {


                        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();


                        //l2.Remove(od.TagOver);


                        //var odsr = new List<string> { od.TagOver, od.S_ROW }.Concat(l2).Distinct().ToList();


                        var odsr = new List<string> { 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 (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))


@@ -3798,15 +3912,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;


@@ -3850,10 +3967,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")


                                        {


@@ -3874,9 +3998,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;


                                    }


                                }


@@ -3887,10 +4009,10 @@


                                }


                            }


                        }


                        else


                        {


                            _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);


                        }


                        //else


                        //{


                        //    _sAB没物料或者余量不足开始触发跟根据自动转运_名字越长越好(od);


                        //}


                    }


            }


        }


@@ -4055,6 +4177,19 @@


                var locS = LocationHelper.GetAreaNormalLocList(ODs.Key);


                foreach (var od in ODs)


                {


                    if (od.S_END_AREA == "YWLBQWJ" || od.S_END_AREA == "YWLAQWJ")//到B区的移库工单最多只能生成两条任务


                    {




                        //查询任务数 


                        List<string> AreaLi = new List<string>() { "YWLBQWJ", "YWLWJJB" };


                        var db = new SqlHelper<object>().GetInstance();


                        var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();


                        if (list.Count() >= 2)


                        {


                            LogHelper.Info($"CreateTransport-  CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");


                            continue;


                        }


                    }


                    LogHelper.Info($"YWL_ZX_Turn 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))


                    {