111

cjs

2025-06-26 1a0c5192cd1269a1aa2c0af94fc2bcb5fcc9a056

 HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs

@@ -684,7 +684,7 @@
            if (mst.S_TYPE.Contains("满托下线"))
            {
                LogHelper.Info($"空托任务生成处理，任务类型：{mst.S_TYPE}");
                string areaName = mst.S_TYPE.Contains("库存") ? "瓶胚非即产空框" : "瓶胚即产空框";
                string areaName = mst.S_TYPE.Contains("库存") ? "瓶坯非即产空框" : "瓶坯即产空框";
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == areaName && a.enable == 1).First();
                if(areaInfo != null)
                {
@@ -715,7 +715,7 @@
                string startArea = "";
                LinZhiBCPWorkOrder bcpW = null;
                bcpW = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_WorkNo == mst.S_WORK_NO && a.S_WorkState == "执行中").First();

                LogHelper.Info($"满托任务生成处理,工单：{JsonConvert.SerializeObject(bcpW)}");
                if (mst.S_TYPE.Contains("瓶盖"))
                {
                    //瓶盖无即产即用和非即产即用
@@ -729,14 +729,14 @@
                {
                    if (bcpW.S_UsingNow == "Y")
                    {
                        LogHelper.Info($"瓶胚即产满框 查找");
                        startArea = Settings.areaInfos.Where(a => a.areaName == "瓶胚即产满框" && a.enable == 1).FirstOrDefault().areaCode;
                        LogHelper.Info($"瓶坯即产满框 查找");
                        startArea = Settings.areaInfos.Where(a => a.areaName == "瓶坯即产满框" && a.enable == 1).FirstOrDefault().areaCode;
                        startLoca = DeviceProcess.getFDSXArea(db, bcpW, startArea);
                    }
                    else
                    {
                        LogHelper.Info($"瓶胚翻斗机非即产满框 查找");
                        string areaName = bcpW.S_PLineNo.Split('-')[1].Substring(0, 1) + "号瓶胚翻斗机非即产满框";
                        LogHelper.Info($"瓶坯翻斗机非即产满框 查找");
                        string areaName = bcpW.S_PLineNo.Split('-')[1].Substring(0, 1) + "号瓶坯翻斗机非即产满框";
                        startArea = Settings.areaInfos.Where(a => a.areaName == areaName && a.enable == 1).FirstOrDefault().areaCode;
                        startLoca = DeviceProcess.getFDSXArea(db, bcpW, startArea);
                    }
@@ -1101,8 +1101,21 @@
                        TsNo = 1;
                        // 坯盖任务下发参数获取
                        // 获取起终点的AGV站点
                        Extend1 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_START_LOC && a.N_LAYER == mst.N_START_LAYER).First().S_AGV_SITE;
                        Extend2 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_END_LOC && a.N_LAYER == mst.N_END_LAYER).First().S_AGV_SITE;
                        Extend1 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_START_LOC).First().S_AGV_SITE;
                        Extend2 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_END_LOC).First().S_AGV_SITE;
                        if (mst.N_START_LAYER > 1)
                        {
                            Extend1 = db.Queryable<LocationExt>().Where(a => a.S_LOC_CODE == mst.S_START_LOC && a.N_LAYER == mst.N_START_LAYER).First().S_AGV_SITE;
                        }
                        if (mst.N_END_LAYER > 1)
                        {
                            Extend2 = db.Queryable<LocationExt>().Where(a => a.S_LOC_CODE == mst.S_END_LOC && a.N_LAYER == mst.N_END_LAYER).First().S_AGV_SITE;
                        }
                        if(mst.S_TYPE == "瓶坯非急产补满框" || mst.S_TYPE == "瓶盖非急产补满框" || mst.S_TYPE == "瓶坯非急产补空框" || mst.S_TYPE == "瓶盖非急产补空框" || mst.S_TYPE == "注塑即产满托下线（瓶坯）")
                        {
                            Extend2 = Settings.dXSites.Where(it => it.loc == mst.S_END_LOC).First().site.ToString();
                        }

                        Extend3 = "0";
                        // 获取 任务参数4 DATA 数据
                        string startLayerValue = Convert.ToString(startLayer, 16).ToUpper();
@@ -1277,127 +1290,136 @@
            if (action)
            {
                //瓶盖库区，两层密集型库区  空满在同一个库区，需要区分不同排
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == areaName && a.enable == 1).First();
                if (areaInfo != null)
                var areaInfo = Settings.areaInfos.Where(a => a.areaName.Contains(areaName) && a.enable == 1).OrderByDescending(a => a.pri).ToList();
                if (areaInfo.Count > 0)
                {
                    //库区货位约定：列号越小越靠里
                    LogHelper.Info($"入库算法01:area：{areaInfo.areaCode},itemCode:{itemCode}");
                    try
                    foreach(var it in areaInfo)
                    {
                        if (result == null)
                        //库区货位约定：列号越小越靠里
                        LogHelper.Info($"入库算法01:area：{it.areaCode},itemCode:{itemCode}");
                        try
                        {
                            var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM > 0).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL)
                                .PartitionBy(a => a.N_ROW).Take(1)
                                .ToList();
                            if (locInfo.Count > 0)
                            if (result == null)
                            {
                                LogHelper.Info($"入库算法02:查询到可入货位的数量为：{locInfo.Count}");
                                foreach (var a in locInfo)
                                var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == it.areaCode && a.N_CURRENT_NUM > 0).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL)
                                    .PartitionBy(a => a.N_ROW).Take(1)
                                    .ToList();
                                if (locInfo.Count > 0)
                                {
                                    LogHelper.Info($"入库算法03:查询货位：{a.S_CODE},锁状态：{a.S_LOCK_STATE}，当前数量：{a.N_CURRENT_NUM}");
                                    //去掉当前货位有锁，或者为空托的货位
                                    if (a.S_LOCK_STATE == "无")
                                    LogHelper.Info($"入库算法02:查询到可入货位的数量为：{locInfo.Count}");
                                    foreach (var a in locInfo)
                                    {
                                        string endItemCode = "";
                                        var endCntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_CODE).First();
                                        if (endCntrInfo != null)
                                        LogHelper.Info($"入库算法03:查询货位：{a.S_CODE},锁状态：{a.S_LOCK_STATE}，当前数量：{a.N_CURRENT_NUM}");
                                        //去掉当前货位有锁，或者为空托的货位
                                        if (a.S_LOCK_STATE == "无")
                                        {
                                            var endItemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == endCntrInfo.S_CNTR_CODE).First();
                                            if (endItemInfo != null)
                                            string endItemCode = "";
                                            var endCntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_CODE).First();
                                            if (endCntrInfo != null)
                                            {
                                                endItemCode = endItemInfo.S_ITEM_CODE;
                                            }
                                        }
                                        else
                                        {
                                            LogHelper.Info($"终点货位未绑定托盘信息");
                                            continue;
                                        }
                                        LogHelper.Info($"入库算法04:查询到当前货位绑定的物料编码为:{endItemCode}");
                                        //判断是否和当前货位的物料编码相同
                                        if (itemCode == endItemCode)
                                        {
                                            //查询当前排是否可入（判断是是否有入库锁和出库锁）
                                            var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == a.S_AREA_CODE && b.N_ROW == a.N_ROW && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                            if (lockInfo == null)
                                            {
                                                //当前排无任务
                                                if (a.N_CURRENT_NUM < a.N_CAPACITY) result = a;
                                                else
                                                var endItemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == endCntrInfo.S_CNTR_CODE).First();
                                                if (endItemInfo != null)
                                                {
                                                    //查询后面当前货位后一个
                                                    result = db.Queryable<Location>().Where(b => b.S_AREA_CODE == a.S_AREA_CODE && b.N_ROW > a.N_ROW && b.S_LOCK_STATE == "无").OrderBy(b => b.N_COL).First();
                                                }
                                                if (result != null)
                                                {
                                                    break;
                                                    endItemCode = endItemInfo.S_ITEM_CODE;
                                                }
                                            }
                                            else
                                            {
                                                LogHelper.Info($"入库算法05:查询到当前排有锁，排号：{a.N_ROW}");

                                                LogHelper.Info($"终点货位未绑定托盘信息");
                                                continue;
                                            }
                                        }
                                    }
                                }
                            }
                            else
                            {
                                LogHelper.Info($"入库算法02:未查询到可入货位");
                            }
                            if (result == null)
                            {
                                //todo 还需要判断锁
                                #region 查找所有数量是空的排
                                LogHelper.Info($"入库算法06:无可用货位，获取空排货位。", "WMSAlgoRithm");
                                //2.0 简化查询只查每一排第一列
                                var list = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode).OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).PartitionBy(a => a.N_ROW).ToList().Where(a => a.N_CURRENT_NUM == 0).ToList();
                                //2.1 选一个空排
                                if (list.Count > 0)
                                {
                                    LogHelper.Info($"入库算法06:无可用货位，获取空排货位数量为：{list.Count}。", "WMSAlgoRithm");
                                    for (int i = 0; i < list.Count; i++)
                                    {
                                        LogHelper.Info($"入库算法07:获取空排货位：货位编码：{list[i].S_CODE.Trim()},当前数量：{list[i].N_CURRENT_NUM},排号：{list[i].N_ROW},库区编码：{list[i].S_AREA_CODE.Trim()}", "WMSAlgoRithm");
                                        if (list[i].S_LOCK_STATE.Trim().Contains("无"))
                                        {
                                            //二次校验当前排所有货位都是空的，防止系统数据错乱
                                            int row = list[i].N_ROW;
                                            string areaCode = list[i].S_AREA_CODE.Trim();
                                            var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == areaCode && b.N_ROW == row && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                            if (lockInfo == null)
                                            LogHelper.Info($"入库算法04:查询到当前货位绑定的物料编码为:{endItemCode}");
                                            //判断是否和当前货位的物料编码相同
                                            if (itemCode == endItemCode)
                                            {
                                                var locInfo1 = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaCode && a.N_ROW == row).Select(a => new { sum = SqlFunc.AggregateSum(a.N_CURRENT_NUM) }).First();
                                                if (locInfo1 != null)
                                                //查询当前排是否可入（判断是是否有入库锁和出库锁）
                                                var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == a.S_AREA_CODE && b.N_ROW == a.N_ROW && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                                if (lockInfo == null)
                                                {
                                                    LogHelper.Info($"{locInfo1.sum},row:{row}");
                                                    if (locInfo1.sum == 0)
                                                    //当前排无任务
                                                    if (a.N_CURRENT_NUM < a.N_CAPACITY) result = a;
                                                    else
                                                    {
                                                        //空排
                                                        result = list[i];
                                                        //查询后面当前货位后一个
                                                        result = db.Queryable<Location>().Where(b => b.S_AREA_CODE == a.S_AREA_CODE && b.N_ROW > a.N_ROW && b.S_LOCK_STATE == "无").OrderBy(b => b.N_COL).First();
                                                    }
                                                    if (result != null)
                                                    {
                                                        break;
                                                    }
                                                }
                                                else LogHelper.Info("未找到该排");
                                            }
                                            else
                                            {
                                                LogHelper.Info("该排有锁");
                                                else
                                                {
                                                    LogHelper.Info($"入库算法05:查询到当前排有锁，排号：{a.N_ROW}");

                                                }
                                            }
                                        }
                                    }
                                }
                                else LogHelper.Info($"未获取到空排，库区编码：{areaInfo.areaCode}");
                                #endregion
                                else
                                {
                                    LogHelper.Info($"入库算法02:未查询到可入货位");
                                }
                                if (result == null)
                                {
                                    //todo 还需要判断锁
                                    #region 查找所有数量是空的排
                                    LogHelper.Info($"入库算法06:无可用货位，获取空排货位。", "WMSAlgoRithm");
                                    //2.0 简化查询只查每一排第一列
                                    var list = db.Queryable<Location>().Where(a => a.S_AREA_CODE == it.areaCode).OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).PartitionBy(a => a.N_ROW).ToList().Where(a => a.N_CURRENT_NUM == 0).ToList();
                                    //2.1 选一个空排
                                    if (list.Count > 0)
                                    {
                                        LogHelper.Info($"入库算法06:无可用货位，获取空排货位数量为：{list.Count}。", "WMSAlgoRithm");
                                        for (int i = 0; i < list.Count; i++)
                                        {
                                            LogHelper.Info($"入库算法07:获取空排货位：货位编码：{list[i].S_CODE.Trim()},当前数量：{list[i].N_CURRENT_NUM},排号：{list[i].N_ROW},库区编码：{list[i].S_AREA_CODE.Trim()}", "WMSAlgoRithm");
                                            if (list[i].S_LOCK_STATE.Trim().Contains("无"))
                                            {
                                                //二次校验当前排所有货位都是空的，防止系统数据错乱
                                                int row = list[i].N_ROW;
                                                string areaCode = list[i].S_AREA_CODE.Trim();
                                                var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == areaCode && b.N_ROW == row && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                                if (lockInfo == null)
                                                {
                                                    var locInfo1 = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaCode && a.N_ROW == row).Select(a => new { sum = SqlFunc.AggregateSum(a.N_CURRENT_NUM) }).First();
                                                    if (locInfo1 != null)
                                                    {
                                                        LogHelper.Info($"{locInfo1.sum},row:{row}");
                                                        if (locInfo1.sum == 0)
                                                        {
                                                            //空排
                                                            result = list[i];
                                                            break;
                                                        }
                                                    }
                                                    else LogHelper.Info("未找到该排");
                                                }
                                                else
                                                {
                                                    LogHelper.Info("该排有锁");
                                                }
                                            }
                                        }
                                    }
                                    else LogHelper.Info($"未获取到空排，库区编码：{it.areaCode}");
                                    #endregion
                                }

                                if(result != null)
                                {
                                    break;
                                }
                            }
                        }
                        catch (Exception ex)
                        {
                            Console.WriteLine("GetLocationIn:" + ex.Message + ex.StackTrace);
                            LogHelper.Error("GetLocationIn:" + ex.Message, ex);
                        }
                    }
                    catch (Exception ex)
                    {
                        Console.WriteLine("GetLocationIn:" + ex.Message + ex.StackTrace);
                        LogHelper.Error("GetLocationIn:" + ex.Message, ex);
                    }
                    
                }
                else
                {
@@ -1406,47 +1428,55 @@
            }
            else
            {
                LogHelper.Info($"出库算法01:area：{areaName},itemCode:{itemCode}");
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == areaName && a.enable == 1).FirstOrDefault();
                if(areaInfo != null)
                var areaInfo = Settings.areaInfos.Where(a => a.areaName.Contains(areaName) && a.enable == 1).OrderByDescending(a => a.pri).ToList();
                if(areaInfo.Count > 0)
                {
                    var locList = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM > 0).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).Includes(a => a.LocCntrRel).ToList();
                    if(locList.Count > 0)
                    foreach(var it in areaInfo)
                    {
                        LogHelper.Info($"出库算法02:查询到可出货位数量：{locList.Count}");
                        foreach (var a in locList)
                        LogHelper.Info($"出库算法01:area：{it.areaName},itemCode:{itemCode}");
                        var locList = db.Queryable<Location>().Where(a => a.S_AREA_CODE == it.areaCode && a.N_CURRENT_NUM > 0).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).Includes(a => a.LocCntrRel).ToList();
                        if (locList.Count > 0)
                        {
                            LogHelper.Info($"出库算法03:查询货位：{a.S_CODE},锁状态：{a.S_LOCK_STATE}");
                            if (a.S_LOCK_STATE == "无")
                            LogHelper.Info($"出库算法02:查询到可出货位数量：{locList.Count}");
                            foreach (var a in locList)
                            {
                                var cntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_CODE).First();
                                if(cntrInfo != null)
                                LogHelper.Info($"出库算法03:查询货位：{a.S_CODE},锁状态：{a.S_LOCK_STATE}");
                                if (a.S_LOCK_STATE == "无")
                                {
                                    LogHelper.Info($"出库算法04:当前货位绑定的托盘码为：{cntrInfo.S_CNTR_CODE}");
                                    string endItemCode = "";
                                    var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
                                    if(itemInfo != null && itemInfo.S_ITEM_CODE == itemCode)
                                    var cntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_CODE).First();
                                    if (cntrInfo != null)
                                    {
                                        endItemCode = itemInfo.S_ITEM_CODE;
                                    }
                                    if(endItemCode == itemCode)
                                    {
                                        //判断当前排有无锁
                                        var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == areaInfo.areaCode && b.N_ROW == a.N_ROW && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                        if (lockInfo == null)
                                        LogHelper.Info($"出库算法04:当前货位绑定的托盘码为：{cntrInfo.S_CNTR_CODE}");
                                        string endItemCode = "";
                                        var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
                                        if (itemInfo != null && itemInfo.S_ITEM_CODE == itemCode)
                                        {
                                            result = a;
                                            break;
                                            endItemCode = itemInfo.S_ITEM_CODE;
                                        }
                                        else
                                        if (endItemCode == itemCode)
                                        {
                                            LogHelper.Info($"出库算法05:当前排有锁，货位号：{lockInfo.S_CODE}");
                                            //判断当前排有无锁
                                            var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == it.areaCode && b.N_ROW == a.N_ROW && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                            if (lockInfo == null)
                                            {
                                                result = a;
                                                break;
                                            }
                                            else
                                            {
                                                LogHelper.Info($"出库算法05:当前排有锁，货位号：{lockInfo.S_CODE}");
                                            }
                                        }
                                    }
                                }
                            }
                        }
                        if(result != null)
                        {
                            break;
                        }
                    }
                    
                }
                else
                {
@@ -1462,7 +1492,7 @@
            if(usingNow == "Y")
            {
                //即产即用
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶胚即产空框" && a.enable == 1).FirstOrDefault();
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶坯即产空框" && a.enable == 1).FirstOrDefault();
                if (areaInfo != null)
                {
                    var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM > 0 && a.S_LOCK_STATE == "无").Includes(a => a.LocCntrRel).First();
@@ -1473,13 +1503,13 @@
                }
                else
                {
                    LogHelper.Info("瓶胚即产空框未配置");
                    LogHelper.Info("瓶坯即产空框未配置");
                }
            }
            else
            {
                //非即产即用
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶胚非即产空框" && a.enable == 1).FirstOrDefault();
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶坯非即产空框" && a.enable == 1).FirstOrDefault();
                if (areaInfo != null)
                {
                    var locList = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM > 0).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).Includes(a => a.LocCntrRel).ToList();
@@ -1499,7 +1529,7 @@
                }
                else
                {
                    LogHelper.Info("瓶胚非即产空框未配置");
                    LogHelper.Info("瓶坯非即产空框未配置");
                }
            }
            
@@ -1521,7 +1551,7 @@
            if (taskName.Contains("即产"))
            {
                //注塑机急产即用下线，首先下线到即产即用满框线边，满眶线边满了，下到即产即用满框缓存区，满框缓存区满了，下到入库接驳堆叠位
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶胚即产满框" && a.enable == 1).FirstOrDefault();
                var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶坯即产满框" && a.enable == 1).FirstOrDefault();
                if(areaInfo != null)
                {
                    var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM < a.N_CAPACITY && a.S_LOCK_STATE == "无").OrderBy(a => a.N_ROW).First();
@@ -1532,11 +1562,11 @@
                }
                else
                {
                    LogHelper.Info($"瓶坯注塑满托下线：瓶胚即产满框 未配置");
                    LogHelper.Info($"瓶坯注塑满托下线：瓶坯即产满框 未配置");
                }
                if (result == null)
                {
                    result = TaskProcess.BCPInOrOut(db, true, "瓶胚即产满框缓存", itemCode);
                    result = TaskProcess.BCPInOrOut(db, true, "瓶坯即产满框缓存", itemCode);
                }
                if(result == null)
                {
@@ -1553,7 +1583,7 @@
        private static Location getJBLoc(SqlSugarClient db, Location result)
        {
            //注塑机非即产即用下线，下到入库接驳堆叠位
            var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶胚入库接驳" && a.enable == 1).FirstOrDefault();
            var areaInfo = Settings.areaInfos.Where(a => a.areaName == "瓶坯入库接驳" && a.enable == 1).FirstOrDefault();
            if (areaInfo != null)
            {
                var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM < a.N_CAPACITY && a.S_LOCK_STATE == "无").OrderBy(a => a.N_COL).First();
@@ -1568,7 +1598,7 @@
            }
            else
            {
                LogHelper.Info($"瓶坯注塑满托下线：瓶胚入库接驳 未配置");
                LogHelper.Info($"瓶坯注塑满托下线：瓶坯入库接驳 未配置");
            }

            return result;
@@ -1585,7 +1615,7 @@
        {
            Location result = null;

            string endAreaName = taskName.Contains("瓶盖") ? "瓶盖非即产空框" : taskName.Contains("库存") ? "瓶胚非即产空框" : "瓶胚即产空框";
            string endAreaName = taskName.Contains("瓶盖") ? "瓶盖非即产空框" : taskName.Contains("库存") ? "瓶坯非即产空框" : "瓶坯即产空框";
            var areaInfo = Settings.areaInfos.Where(a => a.areaName == endAreaName && a.enable == 1).FirstOrDefault();
            if (areaInfo != null)
            {