From 49c8ac08b9e1a29d24266aef39af9519b792feae Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 14 一月 2025 13:21:42 +0800
Subject: [PATCH] 接收ERP其他出库订单，新增销售订单客户物料信息字段
---
MES.Service/service/MessageCenterManager.cs | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/MES.Service/service/MessageCenterManager.cs b/MES.Service/service/MessageCenterManager.cs
index 255bac7..6f322c6 100644
--- a/MES.Service/service/MessageCenterManager.cs
+++ b/MES.Service/service/MessageCenterManager.cs
@@ -8,16 +8,49 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- public List<MessageCenter> GetPushFailedPage(MessageCenter query)
+ public (List<MessageCenter> item, int TotalCount) GetPushFailedPage(
+ MessageCenter query)
+ {
+ var totalCount = IsShow(query);
+
+ //璁＄畻鍒嗛〉鍙傛暟
+ var startRow = (query.PageIndex - 1) * query.Limit + 1;
+ var endRow = query.PageIndex * query.Limit;
+
+ var sql = string.Format(
+ "SELECT * FROM (SELECT \"ID\",\"TABLE_NAME\",\"URL\",\"METHOD\",\"DATA\",\"RESULT\",\"RESULT_DATA\",\"STATUS\",\"CREATE_BY\",\"CREATE_DATE\",\"TITLE\",\"PAGE_NAME\",\"DEAL_WITH\",\"PID\",\"SEQ\",\"ROUTE\",\"CONTENT_TYPE\",\"IS_MESSAGE\",\"UPDATE_BY\",\"UPDATE_DATE\", ROW_NUMBER() OVER (ORDER BY DEAL_WITH) AS RowIndex\n FROM (SELECT \"ID\",\"TABLE_NAME\",\"URL\",\"METHOD\",\"DATA\",\"RESULT\",\"RESULT_DATA\",\"STATUS\",\"CREATE_BY\",\"CREATE_DATE\",\"TITLE\",\"PAGE_NAME\",\"DEAL_WITH\",\"PID\",\"SEQ\",\"ROUTE\",\"CONTENT_TYPE\",\"IS_MESSAGE\",\"UPDATE_BY\",\"UPDATE_DATE\" FROM MESSAGE_CENTER WHERE RESULT = 0 AND SEQ = 1 AND TITLE IS NOT NULL ORDER BY CREATE_DATE DESC)) T WHERE RowIndex BETWEEN {0} AND {1} ",
+ startRow, endRow);
+
+ var messageCenters =
+ Db.Ado.SqlQuery<MessageCenter>(sql);
+
+ return (messageCenters, totalCount);
+ }
+
+ //鏌ョ湅鏄惁鏈夋湭澶勭悊鐨勬秷鎭�
+ public int IsShow(MessageCenter query)
{
return Context.Queryable<MessageCenter>()
.Where(it =>
it.Result == 0 && it.Status == 1 &&
it.Seq == 1 && it.Title != null)
.WhereIF(query.isShow == 1, it => it.DealWith == 0)
- .OrderByDescending(it => it.CreateDate)
- .ToPageList(1, 20);
+ .Count();
}
+
+
+ //灏嗘秷鎭缃负宸茶鐨�
+ public int UpdateRead(MessageCenter query)
+ {
+ return Db.Updateable<MessageCenter>()
+ .SetColumns(s => s.DealWith == 1)
+ .SetColumns(s => s.UpdateBy == query.UpdateBy)
+ .SetColumns(s =>
+ s.UpdateDate == DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
+ .Where(s => s.Id == query.Id)
+ .ExecuteCommand();
+ }
+
public int save(MessageCenter entity)
{
@@ -70,6 +103,10 @@
.SetColumns(a => a.ResultData == entity.ResultData)
.SetColumns(a => a.Status == entity.Status)
.SetColumns(a => a.DealWith == entity.DealWith)
+ .SetColumnsIF(!string.IsNullOrEmpty(entity.UpdateBy),
+ a => a.UpdateBy == entity.UpdateBy)
+ .SetColumnsIF(!string.IsNullOrEmpty(entity.UpdateDate),
+ a => a.UpdateDate == entity.UpdateDate)
.Where(a => a.Id == entity.Id)
.ExecuteCommand();
});
--
Gitblit v1.9.3