交互修改

海波 张

2025-06-25 83a7b2db0150d30576461055707367e8189ebc6e

 wms/TaskHelper.cs

@@ -413,9 +413,9 @@

                if (CreateTask(task1) && CreateTask(task2))
                {
                    LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                    LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                    LocationHelper.LockLoc(operation.CONNECTION, "其他锁", 3);
                    //LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                    //LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                    //LocationHelper.LockLoc(operation.CONNECTION, "其他锁", 3);
                    LogHelper.Info($"任务{task1.S_CODE},{task2.S_CODE}创建成功", "任务");
                    var db = new SqlHelper<object>().GetInstance();
                    db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
@@ -440,7 +440,7 @@

            var count = LocationHelper.GetConnectionTaskCount(operation.CONNECTION);
            LogHelper.Info($"CreateOneTask 作业:{operation.S_CODE},接驳位:{operation.CONNECTION}，任务数量：{count}", "任务");
            if (count<4)
            if (count<=2)
            {

                // 任务1
@@ -525,9 +525,9 @@

                    if (CreateTask(task1) && CreateTask(task2))
                    {
                        LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                        LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                        LocationHelper.LockLoc(operation.CONNECTION, "入库锁", 1);
                        //LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                        //LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                        //LocationHelper.LockLoc(operation.CONNECTION, "入库锁", 1);
                        LogHelper.Info($"任务{task1.S_CODE},{task2.S_CODE}创建成功", "任务");
                        var db = new SqlHelper<object>().GetInstance();
                        db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
@@ -984,7 +984,7 @@

            var db = new SqlHelper<object>().GetInstance();

            return db.Queryable<UnlimitedLoc>().ToList();
            return db.Queryable<UnlimitedLoc>().Where(a=>a.Enable=="Y").ToList();
        }


@@ -1000,6 +1000,39 @@
            return db.Queryable<InPri>().Where(a=>a.Enable=="Y") .ToList();
        }

        

        /// <summary>
        /// 添加agv动作缓存
        /// </summary>
        /// <param name="agv"></param>
        /// <returns></returns>
        internal static bool CreateAgvActionState(AgvActionState agv)
        {
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                return db.Insertable<AgvActionState>(agv).ExecuteCommand() > 0;
            }
            catch (Exception ex)
            {
                Console.WriteLine(ex.Message);
                throw;
            }
        }


        /// <summary>
        /// 获取agv动作
        /// </summary>
        /// <returns></returns>
        internal static List<AgvActionState> GetAgvActionState( string taskNo)
        {

            var db = new SqlHelper<object>().GetInstance();

            return db.Queryable<AgvActionState>().Where(a => a.task_no==taskNo).ToList();
        }


    }
}