qx

czw

2025-06-17 5721831b2d7e8aae0e45f951e35f65533a344f94

qx

 HH.WCS.QingXiNongfu/Program.cs

@@ -175,10 +175,10 @@
            {
                //Console.WriteLine(item);
            }
            //var v = new string[] { "QX-04_J", "QX-04_D", "QX04_J", "QX4_X", "QX-12_A", "QX-08_X", "QX-08_XC", "QX-08_DC" };
            //var v = new string[] { "HS-12BHQ", "HS-C_XC", "1HS-C_XC", "QX-04_J", "QX-04_D", "QX04_J", "QX4_X", "QX-12_A", "QX-08_X", "QX-08_XC", "QX-08_DC" };
            //foreach (var item in v)
            //{
            //    var m = System.Text.RegularExpressions.Regex.IsMatch(item, @"QX-\d+_X$");
            //    var m = System.Text.RegularExpressions.Regex.IsMatch(item,@"^HS-[A-Z]+_");// @"QX-\d+_X$");
            //    if (m)
            //    {
            //        Console.WriteLine(m);

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -3628,7 +3628,7 @@
                                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))
@@ -3704,16 +3704,16 @@
                                            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;