blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
qx
czw
2025-06-18 9862f9e1237c3d360cb4fb5547d8b11e33578d39 
 HH.WCS.QingXiNongfu/core/Monitor.cs


@@ -872,10 +872,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>


@@ -1018,7 +1018,7 @@


            //InworkLock = false;


            var usingSpace = new List<string> { "入库接驳区", "库内接驳区", "出库接驳区", "提升机退料口" };


            //usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };


            usingSpace = new List<string> { "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };


            usingSpace = new List<string> { "YWLYLTKQ", "YWLTKKTQ", "YWLWJJB", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };


            foreach (var area in usingSpace)


            {


                try


@@ -3014,7 +3014,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)


                                    {


@@ -3607,8 +3607,9 @@


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


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


                        ///汇总仓库里最大层是几层。


                        Dictitems Lart = null;


                        foreach (var area in odsr)//od.S_ROW.Split('$'))


@@ -3625,6 +3626,7 @@


                                            Lart = d;


                                    }


                                }




                            }


                        }




@@ -3684,20 +3686,23 @@


                                if (StartBit != null && Endbit != null)


                                {


                                    var crs = _clrel.Select(x => x.S_CNTR_CODE).ToList();


                                    var EndBit = Endbit.S_LOC_CODE;


                                    var jbbit = "";


                                    if (od.S_ROW == "YWLCQSX" || od.S_ROW == "YWLDQWJ")


                                    {


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


@@ -3724,7 +3729,7 @@


                                        //else db.Insertable(r).ExecuteCommand();


                                        od.TagOverTime = DateTime.Now;


                                        db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();


                                        break;


                                        //break;


                                    }


                                }


                            }


@@ -3891,6 +3896,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} 数据缺失。无法完成移库。");


@@ -3910,10 +3916,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")


                                {


@@ -3934,7 +3942,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));


                                        }


@@ -3947,6 +3955,7 @@


                                        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)


                                {


                                    //生成接驳区任务，标记为终点库区。