1
czw
2025-07-04 013a32d3c86fe245f1b5a2b1b9b97140b91131c3
HH.WCS.QingXiNongfu/wms/LocationHelper.cs
@@ -177,6 +177,13 @@
            }
            return locs;
        }
        public static List<Location> GetAreaNormalLocListAll(string areeacode)
        {
            var locs = LocationHelper.GetLocList(x => x.S_AREA_CODE == areeacode && x.S_LOCK_STATE.Trim() == "无" && x.N_CURRENT_NUM == 0);
            return locs;
        }
        internal static List<Location> GetAllLocListByAreaCode(string _areacode, int minRow, int maxRow)
        {
            var db = new SqlHelper<object>().GetInstance();
@@ -790,7 +797,7 @@
                        LogHelper.Info($"{plc.deviceName}-{workOrder.SQL_WorkNo}链接的产线号{LineTo} BolArea 未配置。");
                        goto ______label____end;
                    }
                    bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea, true, false);
                    bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea);
                    //var bits = Settings.GetInStockCacheList().Where(a => a.deviceName == _t)?.Select(x => x.location);
                    //bitslocs = LocationHelper.GetAllLocList().Where(x => bits.Contains(x.S_LOC_CODE.Trim())).ToList();
@@ -1125,7 +1132,7 @@
                #endregion
                else if (plc.deviceType == 6 || plc.deviceType == 10 || plc.deviceType == 4)
                {
                    LogHelper.Info("plc.deviceType == 6.10.4" + workOrder.SQL_UsingNow);
                    LogHelper.Info("plc.deviceType == 6.10.4  即产?:" + workOrder.SQL_UsingNow);
                    //var LineTo = workOrder.SQL_LinkLineNO;
                    var ba = Settings.GetBolAreaList().Find(x => x.DeviceName == plc.deviceName && x.deviceType == plc.deviceType);
                    if (ba == null)
@@ -1393,7 +1400,7 @@
                    }
                    else
                    {
                        LogHelper.Info($"4610,没有可用满框");
                        LogHelper.Info($"翻斗级{plc.deviceName},没有可用满框");
                    }
                }
                else