0628

海波 张

2025-06-28 f80938e8a03d9343672b4fb3179836b019f6b9d8

 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();
@@ -999,6 +999,19 @@

            return db.Queryable<InPri>().Where(a=>a.Enable=="Y") .ToList();
        }
        /// <summary>
        /// 获取出库提高优先级表
        /// </summary>
        /// <returns></returns>
        internal static OutMinutePriority GetOutMinutePriority()
        {

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

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

        


        /// <summary>