1

pulg

2025-06-17 67ada359f4623556d2d5277048798bd2b31772d4

 HH.WCS.ZCQTJ/process/TaskProcess.cs

@@ -870,6 +870,11 @@
                                    }
                                }
                            }
                            else if (tac.CtiaMode == "立库")
                            {
                                task.S_TYPE = "入库";
                                BLLCreator.CreateSingleton<WcsTask>().WcsCallback(task, state, forkliftNo);
                            }
                        }
                    }
                }
@@ -1028,7 +1033,7 @@

                                }
                            }
                            if (tac.CtiaMode == "VMI")
                            else if (tac.CtiaMode == "VMI")
                            {
                                var Alone = newDb.Queryable<SqlCountEntitys>().Where(e => e.ConfigId == tac.host)?.First();
                                if (Alone == null)
@@ -1105,6 +1110,11 @@
                                    }
                                    LogHelper.Info("完工回报", "写安全信号交互表 IMES_AGV_BAST_ENTRY_TRANSF_DONE 字段为 0成功");
                                }
                            }
                            else if (tac.CtiaMode == "立库")
                            {
                                task.S_TYPE = "入库";
                                var tra = BLLCreator.Create<WcsTask>().WcsCallback(task, state, forkliftNo);
                            }
                        }
                    }
@@ -2345,7 +2355,8 @@
            new areaPriorClass
            {
                 areaCode=Ztask.S_END_LAREA,
                 Prior=0
                 Prior=0,
                 S_FlowNo=Ztask.S_FlowNo
            }
            };
                var aEntity = new InAssignEntity()
@@ -2673,18 +2684,31 @@
        /// <param name="mst"></param>
        internal static bool SendTask(WMSTask mst)
        {

            var chi = new SqlHelper<object>().GetInstance();
            var newDb = chi.CopyNew();
            try
            {

                var result = false;
                var start = 0; var end = 0;
                var taskType = mst.S_TYPE.Trim();
                var taskState = mst.S_B_STATE.Trim();
                if (taskState == "未执行" || taskState == "待推送")
                {
                    var dic = new Dictionary<string, string>();
                    var dic1 = new Dictionary<string, string>();
                    LogHelper.Info("NDC", $"agv任务号:{mst.S_TASK_NO}");
                    LogHelper.Info("NDC", $"agv任务起点:{mst.S_START_LOC}");
                    start = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
                    var transportTask = newDb.Queryable<ConfigJsonEntitys>().Where(e => e.Autoindex == "特殊流程站点")?.First();
                    if (transportTask != null)
                    {
                        var ListString = JsonConvert.DeserializeObject<AgvCodeTs>(transportTask.TypeJson);
                        if (ListString != null && ListString.LocationCode != null && ListString.EndAreaCode != null && ListString.LocationCode.Contains(mst.S_START_LOC) && ListString.EndAreaCode.Contains(mst.S_END_LAREA))
                        {
                            start = LocationHelper.GetAgvSiteZc2(mst.S_START_LOC);
                        }
                    }
                    LogHelper.Info("NDC", $"agv 查询的站点(起点):{start}");
                    LogHelper.Info("NDC", $"agv任务终点:{mst.S_END_LOC}");
                    end = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
@@ -2692,8 +2716,6 @@
                    Console.WriteLine($"SendTask {mst.S_TASK_NO}");
                    Console.WriteLine("start=" + start);
                    Console.WriteLine("end= " + end);
                    var dic = new Dictionary<string, string>();
                    var dic1 = new Dictionary<string, string>();
                    dic.Add("Pri", mst.N_PRIORITY.ToString());//优先级
                    dic.Add("No", mst.S_TASK_NO.Trim());
                    dic1.Add("From", start.ToString());//起点
@@ -2706,7 +2728,7 @@
                    }
                    else
                    {
                        var tac = SqlSugarHelper.Db.Queryable<TN_TcpCont>().Where(a => a.LocationCode == mst.S_END_LOC)?.First();
                        var tac = newDb.Queryable<TN_TcpCont>().Where(a => a.LocationCode == mst.S_END_LOC)?.First();

                        if (tac != null && tac.C_IS_RFID == "Y")
                        {