From a4f725f0fc99e1e51106af1b60263ac3bd2a7c30 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期二, 13 八月 2024 10:09:14 +0800
Subject: [PATCH] 合并上格新增代码
---
MESApplication/Controllers/Base/MessageCenterController.cs | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/MESApplication/Controllers/MessageCenterController.cs b/MESApplication/Controllers/Base/MessageCenterController.cs
similarity index 75%
rename from MESApplication/Controllers/MessageCenterController.cs
rename to MESApplication/Controllers/Base/MessageCenterController.cs
index e275539..529df7f 100644
--- a/MESApplication/Controllers/MessageCenterController.cs
+++ b/MESApplication/Controllers/Base/MessageCenterController.cs
@@ -3,13 +3,15 @@
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Base;
[ApiController]
[Route("api/[controller]")]
public class MessageCenterController : ControllerBase
{
+ private readonly GetErpParametersServer ErpParametersServer = new();
private readonly MessageCenterManager m = new();
@@ -34,13 +36,60 @@
}
}
- [HttpPost("GetByPid")]
- public ResponseResult ResetUpdate(int pid)
+ //Resend
+ [HttpPost("Resend")]
+ public ResponseResult Resend(MessageCenter data)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList(it => it.Pid == pid);
+ resultInfos.tbBillList = ErpParametersServer.Resend(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //saveError
+ [HttpPost("SetError")]
+ public ResponseResult SetError([FromBody] MessageCenter data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.SetError(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("GetByPid")]
+ public ResponseResult ResetUpdate([FromBody] JObject data)
+ {
+ var pid = Convert.ToDecimal(data["pid"].ToString());
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+
+ var messageCenter = m.GetById(pid);
+ var messageCenters = m.GetList(it => it.Pid == pid);
+ messageCenters.Add(messageCenter);
+ resultInfos.tbBillList = messageCenters;
return new ResponseResult
{
status = 0,
@@ -60,7 +109,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.getPushFailedPage(query);
+ resultInfos.tbBillList = m.GetPushFailedPage(query);
return new ResponseResult
{
status = 0,
@@ -106,8 +155,9 @@
/// </summary>
/// <returns></returns>
[HttpPost("GetById")]
- public ResponseResult GetById(int id)
+ public ResponseResult GetById([FromBody] JObject data)
{
+ var id = Convert.ToDecimal(data["id"].ToString());
try
{
dynamic resultInfos = new ExpandoObject();
--
Gitblit v1.9.3