From 24494c18efba9c7fbc952e5af35b961d648e3ecd Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 07 四月 2026 10:03:42 +0800
Subject: [PATCH] no message
---
cylsg/EzInitqMessageDef/InitQMessages.cs | 8 +
cylsg/EzInitQ/CY_MessageServiser.cs | 127 +++++++++++++++++++++
cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs | 4
cylsg/EzInitqMessageDef/MsqModels.cs | 46 +++++++
cylsg/EzInitQ/Startup.cs | 2
cylsg/cylsg.Model/ECTEModel/OA_WorkReminder.cs | 121 ++++++++++++++++++++
cylsg/cylsg.Application/CyOS/CyOSSDriver.cs | 13 ++
7 files changed, 317 insertions(+), 4 deletions(-)
diff --git a/cylsg/EzInitQ/CY_MessageServiser.cs b/cylsg/EzInitQ/CY_MessageServiser.cs
new file mode 100644
index 0000000..ecb2543
--- /dev/null
+++ b/cylsg/EzInitQ/CY_MessageServiser.cs
@@ -0,0 +1,127 @@
+锘縰sing cylsg.Core;
+using cylsg.Model.ECTEModel;
+using EzCoreNet.Redis;
+using EzInitqMessageDef;
+using EzWechat;
+using Furion;
+using Furion.FriendlyException;
+using InitQ.Abstractions;
+using InitQ.Attributes;
+using MapsterMapper;
+using Models;
+using Newtonsoft.Json;
+using SqlSugar;
+using StackExchange.Profiling.Internal;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EzInitQ
+{
+ /// <summary>
+ /// 宸濆嵃 娑堟伅闃熷垪澶勭悊鍑芥暟
+ /// </summary>
+ public class CY_MessageServiser: IRedisSubscribe
+ {
+
+ /// <summary>
+ /// 宸濆嵃鍘傚晢ID
+ /// </summary>
+ public Guid firmId => new Guid("88B49967-D590-452C-93C6-0049A75FA5FF");
+ /// <summary>
+ /// 鍙告満闂鍙嶉 鍒嗗彂闂
+ /// </summary>
+ /// <param name="msg"></param>
+ [Subscribe(InitQMessages.CYOSDeiverWentiFankuai)]
+ public async void CYOSDeiverWentiFanKui(string msg)
+ {
+
+ ISqlSugarClient _OAsqlSugarClient = App.GetService<ISqlSugarClient>().AsTenant().GetConnection("ECTESTOADB");
+
+
+ var userdata = JsonConvert.DeserializeObject<CY_OSDeiverWentiFankuaiModes>(msg);
+
+ if(userdata ==null)
+ throw Oops.Oh($"闃熷垪CYOSDeiverWentiFankuai 澶勭悊澶辫触锛岃妫�鏌ユ秷鎭牸寮�++++++++{msg}");
+ if(userdata.OA_DeliverPlanPaicheID==null)
+ throw Oops.Oh($"闃熷垪CYOSDeiverWentiFankuai 澶勭悊澶辫触锛屾病鏈夎幏鍙栧埌娲捐溅ID+++++++++{msg}");
+
+ //var DbC = new BaseRepository<OA_DeliverPlanPaiche>();
+ var data= await _OAsqlSugarClient.Queryable<OA_DeliverPlanPaiche>().Includes(x=>x.Driver).Where(x=>x.Keyid==userdata.OA_DeliverPlanPaicheID).FirstAsync();
+ if(data==null)
+ throw Oops.Oh($"闃熷垪CYOSDeiverWentiFankuai 澶勭悊澶辫触锛屾病鏈夎幏鍙栧埌娲捐溅淇℃伅+++++++++{msg}");
+
+ if(data.Driver==null)
+ {
+ throw Oops.Oh($"闃熷垪CYOSDeiverWentiFankuai 澶勭悊澶辫触锛屾病鏈夎幏鍙栧埌鍙告満淇℃伅+++++++++{msg}");
+
+ }
+
+ //var WorkReminderDb = new BaseRepository<OA_WorkReminder>();
+ //璁㈠崟ID
+ var SellerOrderId = await _OAsqlSugarClient.Queryable<OA_DeliverPlan>().Where(x => x.DeliverPlanPaicheid == data.Keyid).Select(x=>x.SellerOrderId).FirstAsync();
+ string? orderDocumentName = null;
+ if (SellerOrderId != null)
+ orderDocumentName = await _OAsqlSugarClient.Queryable<EC_OrderBasic>().Where(x => x.SellerOrderId == SellerOrderId).Select(x => x.DocumentName).FirstAsync();
+
+ //鍒涘缓浜�
+ var creerter = await _OAsqlSugarClient.Queryable<OaStaff>().Where(x => x.MemberId == data.Creater).Select(x => x.Name).FirstAsync();
+ if(creerter!=null)
+ {
+ await _OAsqlSugarClient.Insertable(new OA_WorkReminder
+ {
+ Content = $" 娲鹃��:{data.CompanyName} 鍦板潃:{data.Dizhi}, {data.Remark??""} {orderDocumentName??""}銆� 閫佽揣鍙嶉:{userdata.WenTi}",
+ RemenderObject = creerter,
+ Remender = data.Driver.Name,
+ RemenderTime= userdata.CreateTime
+
+ }).ExecuteCommandAsync();
+ }
+
+ //娲捐溅浠诲姟
+ var PaiCheRenwu= await _OAsqlSugarClient.Queryable<OA_DeliverTixing>().Includes(x=>x.SentStaff).Where(x=>x.DeliverPlanPaicheId==data.Keyid).FirstAsync();
+ if(PaiCheRenwu!=null)
+ {
+ await _OAsqlSugarClient.Insertable(new OA_WorkReminder
+ {
+ Content = $" 娲鹃��:{data.CompanyName} 鍦板潃:{data.Dizhi}, {data.Remark ?? ""} {orderDocumentName ?? ""}銆� 閫佽揣鍙嶉:{userdata.WenTi}",
+ Remender = data.Driver.Name ,
+ RemenderObject = PaiCheRenwu?.SentStaff?.Name??"",
+ RemenderTime = userdata.CreateTime
+
+ }).ExecuteCommandAsync();
+ }
+
+ if (data.Zerenren!=null)
+ {
+ //var zherenrenDb = new BaseRepository<OaStaff>();
+ var zherenren = await _OAsqlSugarClient.Queryable<OaStaff>().Where(x=>x.Keyid==data.Zerenren&&x.FirmId== firmId).Select(x=>x.Name).FirstAsync();
+ if(zherenren!=null)
+ {
+ await _OAsqlSugarClient.Insertable(new OA_WorkReminder
+ {
+ Content = $" 娲鹃��:{data.CompanyName} 鍦板潃:{data.Dizhi}, {data.Remark ?? ""} {orderDocumentName ?? ""}銆� 閫佽揣鍙嶉:{userdata.WenTi}",
+ RemenderObject = zherenren,
+ Remender = data.Driver.Name,
+ RemenderTime = userdata.CreateTime
+
+ }).ExecuteCommandAsync();
+
+
+
+ }
+
+ }
+
+
+
+
+
+ }
+
+
+
+ }
+}
diff --git a/cylsg/EzInitQ/Startup.cs b/cylsg/EzInitQ/Startup.cs
index 4ce942f..b0e5417 100644
--- a/cylsg/EzInitQ/Startup.cs
+++ b/cylsg/EzInitQ/Startup.cs
@@ -21,7 +21,7 @@
m.SuspendTime = 1000;
m.IntervalTime = 1000;
m.ConnectionString = App.Configuration["InitQRedisConfig:ConnectionString"];
- m.ListSubscribe = new List<Type>() { typeof(PayServiceMessageQ) };
+ m.ListSubscribe = new List<Type>() { typeof(PayServiceMessageQ),typeof(CY_MessageServiser) };
m.ShowLog = false;
});
diff --git a/cylsg/EzInitqMessageDef/InitQMessages.cs b/cylsg/EzInitqMessageDef/InitQMessages.cs
index 53d333a..4585a9f 100644
--- a/cylsg/EzInitqMessageDef/InitQMessages.cs
+++ b/cylsg/EzInitqMessageDef/InitQMessages.cs
@@ -22,6 +22,14 @@
///閲嶆柊鏀粯
/// </summary>
public const string WxTransferAg = "WxTransferAg";
+
+ /// <summary>
+ /// 宸濆嵃鍙嶉
+ /// </summary>
+ public const string CYOSDeiverWentiFankuai = "CYOSDeiverWentiFankuai";
+
+
+
/// <summary>
/// 鍚戝爢鏍堜腑鍘嬪叆涓�涓秷鎭�
/// </summary>
diff --git a/cylsg/EzInitqMessageDef/MsqModels.cs b/cylsg/EzInitqMessageDef/MsqModels.cs
index c368608..3d86178 100644
--- a/cylsg/EzInitqMessageDef/MsqModels.cs
+++ b/cylsg/EzInitqMessageDef/MsqModels.cs
@@ -12,7 +12,7 @@
public class WxTransferMsqModels
{
/// <summary>
- /// 浣撶幇閲戦
+ /// 鎻愮幇閲戦
/// </summary>
public decimal money { get; set; }
@@ -21,4 +21,48 @@
/// </summary>
public int UserID { get; set; }
}
+ /// <summary>
+ /// 宸濆嵃闂鍙嶉妯″瀷
+ /// </summary>
+ public class CY_OSDeiverWentiFankuaiModes
+ {
+ /// <summary>
+ /// 璁㈠崟妯″瀷
+ /// </summary>
+ public Guid? OA_DeliverPlanPaicheID { get; set; }
+
+
+ /// <summary>
+ /// 闂
+ /// </summary>
+ public string WenTi { get; set; }
+
+ /// <summary>
+ /// 鍙戣捣鏃堕棿
+ /// </summary>
+ public DateTime CreateTime { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔鏂瑰紡
+ /// </summary>
+ public WentiFankuaiOpEmun op { get; set; }= WentiFankuaiOpEmun.add;
+
+
+
+ }
+ /// <summary>
+ /// 闂鍙嶉鐘舵��
+ /// </summary>
+ public enum WentiFankuaiOpEmun
+ {
+ /// <summary>
+ /// 澧炲姞
+ /// </summary>
+ add,
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
+ move
+
+ }
}
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
index a31037f..b851afc 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
@@ -2,6 +2,7 @@
using cylsg.Model.utilityViewModel;
using ECTESTOA;
using EzCoreNet.Redis;
+using EzInitqMessageDef;
using Furion.LinqBuilder;
using Microsoft.AspNetCore.Http.HttpResults;
using Models;
@@ -214,6 +215,18 @@
if(Param.Deliveredstatus== DeliveredType.Delivered)
a.DeliveredTime = DateTime.Now;
a.Wentifankui = Param.Wentifankui;
+ if( !string.IsNullOrEmpty( Param.Wentifankui))
+ {
+
+ //闂鍙嶉涓嶄负绌猴紝鍒欐彃鍏ュ弽棣堜俊鎭�
+
+ await InitQMessages.SendMessageAsync<CY_OSDeiverWentiFankuaiModes>(InitQMessages.CYOSDeiverWentiFankuai, new CY_OSDeiverWentiFankuaiModes
+ {
+ CreateTime = DateTime.Now,
+ OA_DeliverPlanPaicheID = a.Keyid,
+ WenTi = Param.Wentifankui,
+ });
+ }
a.Deliveredstatus= Param.Deliveredstatus;
a.Attachments = Param.Attachments;
diff --git a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
index 84d657c..fb1506c 100644
--- a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
@@ -246,7 +246,7 @@
OA_DeliverTixing? tixing=null;
if(Param.DeliverTixingId>0)
{
- //鏄彁閱掕鍗曪紝闇�瑕佹墽琛屾彁閱掑崟 鐘舵�佸共鐓�
+ //鏄彁閱掕鍗曪紝闇�瑕佹墽琛屾彁閱掑崟 鐘舵��
tixing = await _client.Queryable<OA_DeliverTixing>().Where(x => x.Keyid == Param.DeliverTixingId).FirstAsync();
if(tixing == null)
{
@@ -292,7 +292,7 @@
Dianhua = Param.Dianhua,
Dizhi = Param.Dizhi,
Remark = Param.Remark,
- BusinessManagerId = cor == null ? 0 : cor.BusinessManagerId,
+ BusinessManagerId = cor == null ? 0 : cor.BusinessManagerId,
Biddingcompany = cor == null ? 0 : (cor.Biddingcompany ?? 0),
ShifouDelivery = 1,
Lianxiren = Param.Lianxiren,
diff --git a/cylsg/cylsg.Model/ECTEModel/OA_WorkReminder.cs b/cylsg/cylsg.Model/ECTEModel/OA_WorkReminder.cs
new file mode 100644
index 0000000..106dee5
--- /dev/null
+++ b/cylsg/cylsg.Model/ECTEModel/OA_WorkReminder.cs
@@ -0,0 +1,121 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace cylsg.Model.ECTEModel
+{
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarTable("OA_WorkReminder")]
+ public class OA_WorkReminder
+ {
+
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "Keyid", IsPrimaryKey = true, IsIdentity = true)]
+ public int Keyid { get; set; }
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "FirmId")]
+ public Guid FirmId { get; set; } = new Guid("88B49967-D590-452C-93C6-0049A75FA5FF");
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "Content")]
+ public string Content { get; set; } = null!;
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "Remender")]
+ public string? Remender { get; set; }
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemenderObject")]
+ public string? RemenderObject { get; set; }
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemenderType")]
+ public int? RemenderType { get; set; } = 0;
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemenderDept")]
+ public string? RemenderDept { get; set; } = "";
+
+ /// <summary>
+ /// 澶� 娉�:鍙嶉鏃堕棿
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemenderTime")]
+ public DateTime? RemenderTime { get; set; }
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "Remark")]
+ public string? Remark { get; set; } = "";
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemenderDelState")]
+ public int? RemenderDelState { get; set; } = 0;
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemenderObjectDelState")]
+ public int? RemenderObjectDelState { get; set; } = 0;
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "IsFinish")]
+ public int? IsFinish { get; set; } = 0;
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "FeedBackContent")]
+ public string? FeedBackContent { get; set; }
+
+ /// <summary>
+ /// 澶� 娉�:
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RemindState")]
+ public int? RemindState { get; set; } = 0;
+
+
+ }
+
+
+}
--
Gitblit v1.9.1