11

pulg

2025-06-05 28bea7128b8c24a6a664e880f1425e1fa24b9b5f

11

 HH.WCS.ZCQTJ/Bll/StateTaskBLL.cs

@@ -557,9 +557,9 @@
                            }
                            else
                            {
                                Texp.And(e => e.S_AREA_CODE == executeStatePara.transportTask.S_START_LAREA);
                                //  Texp.And(e => e.S_AREA_CODE == executeStatePara.transportTask.S_START_LAREA);
                                Texp.And(e => e.S_AREA_CODE == executeStatePara.transportTask.S_END_LAREA);
                            }

                            Texp.And(e => e.D_DATE == DateTime.Now.ToString("yyyy-MM-dd"));
                            var taskview = newDb.Queryable<DayAreaTaskEntitys>().Where(Texp.ToExpression())?.First();
                            if (taskview == null)//创建

 HH.WCS.ZCQTJ/Program.cs

@@ -21,6 +21,8 @@
    {
        static void Main(string[] args)
        {


            string currentProcessName = Process.GetCurrentProcess().ProcessName;
            Process[] processes = Process.GetProcessesByName(currentProcessName);
            if (processes.Length > 1)

 HH.WCS.ZCQTJ/api/AgvController.cs

@@ -29,6 +29,11 @@
    {
        private static object locko1 = new object();

        /// <summary>
        /// hosttoagv上报
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        //[Route("AGVCallbackState")]
        public ReturnResult AGVCallbackState(AgvTaskState model)
@@ -45,10 +50,12 @@
                    var transportTask = newDb.Queryable<WMSTask>().Where(e => e.S_TASK_NO == model.No)?.First();
                    if (transportTask == null)
                    {
                        LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
                        throw new Exception("未查询到该任务");
                    }
                    if (transportTask.S_B_STATE == "取消" || transportTask.S_B_STATE == "完成")
                    {
                        LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
                        return new ReturnResult();
                    }
                    if ((model.State == 3 && model.ForkliftNo != "0") || (string.IsNullOrEmpty(transportTask.S_EQ_NO) && model.ForkliftNo != "0"))
@@ -84,6 +91,7 @@

                                newDb.RollbackTran();
                            }
                            LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
                            return new ReturnResult();
                        }

@@ -109,10 +117,11 @@

                                newDb.RollbackTran();
                            }
                            LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
                            return new ReturnResult();
                        }
                        var ta = BLLCreator.Create<StateTaskBLL>().ExecuteState(model.No, SataeLis, logPara, transportTask);
                        LogHelper.TaskDetail(logPara, "完工回报返回：" + JsonConvert.SerializeObject(ta));
                        LogHelper.TaskDetail(logPara, $"完工回报返回：任务号为:{model.No}" + JsonConvert.SerializeObject(ta));
                        TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData, transportTask);
                        if (transportTask.S_NOTE.Equals("agv任务") && model.State == 7 && ta.Success)
                        {
@@ -136,14 +145,17 @@
                    {
                        TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData, transportTask);
                    }
                    LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
                    return new ReturnResult();
                }
                catch (Exception ex)
                {
                    LogHelper.TaskDetail(logPara, "完工回报报错：" + JsonConvert.SerializeObject(ex));
                    LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
                    return new ReturnResult();
                }
            });
            LogHelper.TaskDetail(logPara, $"完工回报 任务号{model.No} 返回给AGV信息{JsonConvert.SerializeObject(new ReturnResult())}");
            return new ReturnResult();
        }


 HH.WCS.ZCQTJ/api/WmsController.cs

@@ -3475,9 +3475,6 @@
        [Route("asss")]
        public OperateResult asss()
        {
            var transportTask = STAttribute.GetValueTwo("TTXB-送满取空");
            var ListString = JsonConvert.DeserializeObject<List<ConfigValueListTwo>>(transportTask);
            return OperateResult.Succeed(JsonConvert.SerializeObject(ListString));
            // List<OperateResult> nn = new List<OperateResult>();
            //var ca = BLLCreator.Create<IdGuid>().TaskNo("CK");
            //LogHelper.Info("任务下发", "MES下发任务参数:");
@@ -3491,7 +3488,7 @@
            //nn.Add(OperateResult.Succeed("", GGF2));
            //return nn;
            // BLLCreator.CreateSingleton<DingDingHelper>().button1_Click($"{Supplier.requestPk} {DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}");
            // BLLCreator.CreateSingleton<DingDingHelper>().button1_Click($"{Supplier.requestPk}", Supplier.taskNo ?? "");
            // BLLCreator.CreateSingleton<DingDingHelper>().ace();

            //    var gg = BLLCreator.CreateSingleton<DingDingHelper>().SendTextMessageToUser("WMS通知:库存不足", "kks53nw");
            //BLLCreator.CreateSingleton<DingDingHelper>().button1_Click($"测试   {DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")} ");

 HH.WCS.ZCQTJ/core/TaskOver.cs

@@ -54,7 +54,6 @@
                                    BLLCreator.CreateSingleton<DingDingHelper>().button1_Click(ghh);
                                }
                            }

                        }
                    }
                    catch (Exception ex)

 HH.WCS.ZCQTJ/util/DingTalk.cs

@@ -648,6 +648,9 @@
            }
        }




        static void SendMarkdownMessageItem(string webhookUrl, string accessToken, string secret, string title, string markdownContent, string phone)
        {
            long timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
@@ -712,9 +715,6 @@
            string title = "Markdown Message";
            SendMarkdownMessageItem(webhookUrl, accessToken, secret, title, markdownContent, phone);
        }



        #endregion
    }
}

 HH.WCS.ZCQTJ/util/HttpHelper.cs

@@ -131,9 +131,9 @@
                reader = new StreamReader(stream);
                return reader.ReadToEnd();
            }
            catch
            catch (Exception ex)
            {
                return "";
                return ex.Message;
            }
            finally
            {