1

pulg

2025-07-01 9db9cd04a1a9971220438ccb856a6896b4a399ac

1

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1135,6 +1135,17 @@
                                                continue;
                                            }
                                        }
                                        if (CDlist.Contains(EdnRarea))
                                        {
                                            var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_STATE == "入库锁");
                                            //var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "入库锁"));
                                            if (ls.Count() > 2)
                                            {
                                                LogHelper.Info($"{EdnRarea}任务数1管制3");
                                                continue;
                                            }
                                        }

                                        //else if (CDlist.Contains(EdnRarea))
                                        //{
                                        //    var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "入库锁")).ToList();
@@ -1487,7 +1498,6 @@
                    if (tklist.Count() > 0)
                    {
                        var tk = tklist.FirstOrDefault();

                        var loc = LocationHelper.GetLoc(plc.location[0]);
                        if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "无")
                        {

 HH.WCS.QingXiNongfu/dispatch/NDC.cs

@@ -82,6 +82,28 @@
                return false;
            }
        }

        /// <summary>
        /// 修改优先级
        /// </summary>
        /// <param name="taskNo">任务号</param>
        /// <param name="paramNo">优先级</param>
        /// <returns></returns>
        public static bool ChangeParamPri(string taskNo, int paramNo = 0)
        {
            bool bResult = false;
            var dic = new Dictionary<string, string>();
            dic.Add("No", taskNo);
            if (paramNo >= 0)
            {
                dic.Add("Pri", paramNo.ToString());
            }
            dic.Add("IKey", "");
            var result = ChangeOrder(dic);
            if (result.Res.ErrCode == 0) { bResult = true; }
            return bResult;
        }

        public static AGVResult AddNewOrderNew(int ts, int pri, string taskNo, Dictionary<string, string> param)
        {
            //< Req >< Order TS = '1' Pri = '1' No = 'TN2302020001' Ext1 = '' Ext2 = '' N_CNTR_COUNT = '' >< Param Name = 'From' Value = '2' />< Param Name = 'To' Value = '1' /></ Order ></ Req >

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -1114,9 +1114,9 @@
            }
            if (state == 9)
            {
                CacheBitUpdate(mst, load: true);
                var g = LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
                var T = LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
                CacheBitUpdate(mst, load: true);
            }
            return r;
        }

 HH.WCS.QingXiNongfu/wms/TaskHelper.cs

@@ -1,4 +1,4 @@
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.dispatch;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
using SqlSugar;
@@ -239,43 +239,55 @@
        }
        internal static void End(WMSTask task)
        {
            var db = new SqlHelper<WMSTask>().GetInstance();
            var db = new SqlHelper<object>().GetInstance();


            //plg 2025年6月13日 10:42:24
            if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD" && !string.IsNullOrEmpty(task.S_TWO_END_LOC))
            if (task.S_END_LAREA == "YWLYLTKQ" || task.S_END_LAREA == "YWLTKKTQ")
            {
                var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == task.S_TWO_END_LOC).First();
                if (model != null)
                //查询出库锁YWLWJJB
                var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE == "出库锁");
                if (ls.Any())
                {
                    //先解锁终点 在锁定
                    db.Ado.BeginTran();
                    try
                    var tas = db.Queryable<WMSTask>().Where(a => a.S_START_LOC == ls.First().S_LOC_CODE).ToList().FirstOrDefault();
                    if (tas.S_B_STATE == "已推送")
                    {
                        model.S_LOCK_STATE = "无";
                        var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
                        LogHelper.Info(task.S_TWO_END_LOC + "LockLoc:锁结果" + res);
                        db.Ado.CommitTran();
                        NDC.ChangeParamPri(tas.S_TASK_NO, 70);
                    }
                    catch (Exception ex)
                    {
                        db.Ado.RollbackTran();
                        LogHelper.Info("CreateTask 失败 " + ex.Message);
                    }

                    LogHelper.Info(task.S_TWO_END_LOC + "二段任务 开始。 ");
                    var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_TWO_END_LOC, "原物料搬运-纸箱", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
                    //if (b)
                    //{
                    //    if (task != null)
                    //    {
                    //        task.S_B_STATE = "完成";
                    //        task.T_END_TIME = DateTime.Now;
                    //        db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_END_TIME }).ExecuteCommand();
                    //    }
                    //}
                }
            }
            ////plg 2025年6月13日 10:42:24
            //if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD" && !string.IsNullOrEmpty(task.S_TWO_END_LOC))
            //{
            //    var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == task.S_TWO_END_LOC).First();
            //    if (model != null)
            //    {
            //        //先解锁终点 在锁定
            //        db.Ado.BeginTran();
            //        try
            //        {
            //            model.S_LOCK_STATE = "无";
            //            var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
            //            LogHelper.Info(task.S_TWO_END_LOC + "LockLoc:锁结果" + res);
            //            db.Ado.CommitTran();
            //        }
            //        catch (Exception ex)
            //        {
            //            db.Ado.RollbackTran();
            //            LogHelper.Info("CreateTask 失败 " + ex.Message);
            //        }

            //        LogHelper.Info(task.S_TWO_END_LOC + "二段任务 开始。 ");
            //        var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_TWO_END_LOC, "原物料搬运-纸箱", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
            //        //if (b)
            //        //{
            //        //    if (task != null)
            //        //    {
            //        //        task.S_B_STATE = "完成";
            //        //        task.T_END_TIME = DateTime.Now;
            //        //        db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_END_TIME }).ExecuteCommand();
            //        //    }
            //        //}
            //    }
            //}
            if (task != null)
            {
                task.S_B_STATE = "完成";