1

czw

2025-07-01 d4fd2574b94a355de638c0a3ce5436aec8d9edea

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -420,7 +420,7 @@

        static void ROW_LOCK(Location startBit, Location EndBit, string msg, int sign, bool up = true, string WorkNo = "")
        {
            LogHelper.Info("dooooooooooooooooooooooooooooooooooooooooooooo" + msg + "---" + sign);
            LogHelper.Info("移库解锁 doo" + msg + "---" + sign + "--" + WorkNo);
            LogHelper.Info(JsonConvert.SerializeObject(startBit));
            LogHelper.Info(JsonConvert.SerializeObject(EndBit));
            bool j解锁起点库区排 = true;
@@ -429,12 +429,18 @@
                //解锁时，有工单号。  查查除了这个工单号以外的其他 指定出库排执行
                var orders = WCSHelper.GetWorkOrder2();
                var thisOrder = orders.Find(x => x.SQL_WorkNo == WorkNo);
                if (thisOrder != null)
                {
                    var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
                    if (other != null)
                        j解锁起点库区排 = false;
                }
                LogHelper.Info("移库解锁 --当前工单 sid:" + thisOrder?.S_ID);
                var allarea_rows = orders.FindAll(x => x.S_ID != thisOrder.S_ID && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
                LogHelper.Info("移库解锁 --当前工单 的同库区排 其他工单:" + JsonConvert.SerializeObject(allarea_rows));
                if (allarea_rows.Any())
                    j解锁起点库区排 = false;
                //if (thisOrder != null)
                //{
                //    var other = orders.Find(x => x.SQL_WorkNo != WorkNo && x.start_area == thisOrder.start_area && x.start_row == thisOrder.start_row);
                //    LogHelper.Info($"移库解锁 --其他工单 x.start_area == {thisOrder.start_area} start_row == {thisOrder.start_row} SID:" + other?.S_ID);
                //    if (other != null)
                //        j解锁起点库区排 = false;
                //}
            }
            //if (sign == 1)
            //{
@@ -1119,6 +1125,17 @@
                                        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")//纸箱无菌接驳区