双钱-需求变更：增加了两个搬送流程，增加了两个库区，主要是修改对空托上线脱皮机的逻辑

杨张扬

6 天以前 c321182cdcbc7d6489d969810f0610e48ac2b5ed

 core/Monitor.cs

@@ -351,11 +351,105 @@
        }

        /// <summary>
        /// 检测原材料产线下线附近是否有空位
        /// </summary>
        internal static void CheckEmptyLoc_YclOutLineArea()
        {
            try
            {
                var db = new SqlHelper<object>().GetInstance();

                var endLoc = db.Queryable<TN_Location>().
                Where(o => o.S_AREA_CODE == Settings.Areas[15]
                && o.N_LOCK_STATE == 0 
                && o.S_LOCK_STATE == "无" 
                && o.C_ENABLE == "Y" 
                && o.N_CURRENT_NUM == 0
                && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                ).//原材料产线附近空托库区
                First();

                if (endLoc == null)
                {
                    LogHelper.Info($"原材料产线附近空托库区{Settings.Areas[15]}，已满，无需再入空托");
                    return;
                }

                var startLoc = db.Queryable<TN_Location>().
                Where(o => o.S_AREA_CODE == Settings.Areas[3]
                && o.N_LOCK_STATE == 0
                && o.S_LOCK_STATE == "无"
                && o.C_ENABLE == "Y"
                && o.N_CURRENT_NUM > 0
                && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
                ).ToList().//空托堆叠库区
                OrderByDescending(o => o.N_CURRENT_NUM).
                First();

                if (startLoc == null)
                {
                    startLoc = db.Queryable<TN_Location>().
                    Where(o => o.S_AREA_CODE == Settings.Areas[16]
                    && o.N_LOCK_STATE == 0
                    && o.S_LOCK_STATE == "无"
                    && o.C_ENABLE == "Y"
                    && o.N_CURRENT_NUM > 0
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
                    ).ToList().//空托货架库区
                    OrderByDescending(o => o.N_CURRENT_NUM).
                    First();
                }

                if (startLoc == null)
                {
                    LogHelper.Info($"起点没有找到合适的空托货位，要求有货");
                    return;
                }

                var cntrList = db.Queryable<TN_Loc_Container>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).OrderBy(a => a.T_CREATE, OrderByType.Asc).ToList();

                if (cntrList.Count < 1)
                {
                    LogHelper.Info($"起点{startLoc.S_CODE}未找到货位容器关系信息");
                    return;
                }

                string cntrString = "";
                for (int i = 0; i < cntrList.Count; i++)
                {
                    if (i == cntrList.Count - 1)//最后一个字符串连接不加逗号
                    {
                        cntrString += cntrList[i].S_CNTR_CODE;
                    }
                    else
                    {
                        cntrString += cntrList[i].S_CNTR_CODE + ",";
                    }
                }

                if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "空托自动上线", 3, cntrString))//创建搬送任务，起点终点容器
                {
                    LocationHelper.LockLoc(startLoc.S_CODE, 2);//起点出库锁，
                    LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁

                    LogHelper.Info($"生成空托自动上线任务成功，容器：{cntrString}，起点：{startLoc.S_CODE}");
                }
                else
                {
                    LogHelper.Info($"生成空托自动上线任务失败，容器：{cntrString}，起点：{startLoc.S_CODE}");
                }
            }
            catch (Exception ex)
            {

            }
        }

        /// <summary>
        /// 线边满托货位自动解绑
        /// </summary>
        internal static void XBChekcFull()
        {
            var db = new SqlHelper<object>().GetInstance();
            try
            {

@@ -991,12 +1085,29 @@
                }

                var endLoc = db.Queryable<TN_Location>().
                    Where(a => a.S_AREA_CODE == Settings.Areas[15] && a.N_LOCK_STATE == 0 
                    && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()
                    ).First();//先找 原材料产线附近空托库区
                
                if (endLoc == null)
                {
                    endLoc = db.Queryable<TN_Location>().
                    Where(a => a.S_AREA_CODE == Settings.Areas[16] && a.N_LOCK_STATE == 0
                    && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()
                    ).First();
                }// 再找 空托货架库区

                if (endLoc == null)
                {
                    endLoc = db.Queryable<TN_Location>().
                    Where(a => a.S_AREA_CODE == Settings.Areas[4] && a.N_LOCK_STATE == 0 
                    && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()
                    ).
                    OrderBy(a => a.N_CURRENT_NUM, OrderByType.Asc).
                    First();
                    ).First();
                }// 最后找 空托缓存库区


                if (endLoc == null)
                {