From 4c87e40a3ca38b3fc2dab600cb033946e80bcbbd Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 07 四月 2026 13:05:18 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/CyOS/CyOSSDriver.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
index ddd0db6..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;
@@ -47,7 +48,7 @@
Expression<Func<OA_DeliverPlanPaiche, bool>> SearchList = (x) => true;
SearchList = SearchList.And(x => x.FirmId == _oAServices.firmId);
SearchList = SearchList.And(x => x.DriverId == Permissions.KeyId);//鍙湅鑷繁
- SearchList = SearchList.And(x => x.ShifouDelivery != 2);//杩囨护鏈夋晥
+ SearchList = SearchList.And(x => x.ShifouDelivery != 2 && x.ShifouDelivery != 0);//杩囨护鏈夋晥
if (Param.DeliverKeyID != null)
{
SearchList = SearchList.And(x => x.DriverId == Param.DeliverKeyID);
@@ -121,11 +122,19 @@
public async Task<int > StartDeliverPlan(Guid KeyId)
{
+
if (!await CheckRols())
{
throw Oops.Oh("娌℃湁鏉冮檺");
}
- var a= await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
+ DateTime specificDateTime = new DateTime(2025, 4, 9, 23, 59, 59);//2025骞�4鏈�10 鏃ヤ箣鍚庣殑锛屽繀椤讳竴鍗曚竴鍗曠偣鍑诲畬鎴愬悗鎵嶈兘閫佽揣
+ var count = await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid != KeyId && x.ShifouDelivery != 2 && x.Deliveredstatus == DeliveredType.Deliver&&x.DeliverTime> specificDateTime).CountAsync();
+ if(count > 0)
+ {
+ throw Oops.Oh($"浣犺繕鏈墈count}閫佽揣浠诲姟娌℃湁纭瀹屾垚锛屼笉鑳藉紑濮嬫柊鐨勪换鍔�");
+ }
+
+ var a= await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
if(a==null)
throw Oops.Oh("娌℃湁鏉冮檺");
if(a.Deliveredstatus!= DeliveredType.Undeliver)
@@ -206,17 +215,43 @@
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;
- return await _client.UpdateNav(a).Include(x=>x.Attachments,new SqlSugar.UpdateNavOptions()
- {
- OneToManyInsertOrUpdate = true,//閰嶇疆鍚敤 鎻掑叆銆佹洿鏂版垨鍒犻櫎妯″紡
- }).Include(x=>x.DeliverPlans,new UpdateNavOptions()
- {
- OneToManyInsertOrUpdate=true,
- }
- ).ExecuteCommandAsync();
+ return await _client.UpdateNav(a).Include(x=>x.Attachments).ExecuteCommandAsync();
+
+ //await _client.AsTenant().BeginTranAsync();
+ //try
+ //{
+ // var id = await _client.Insertable(pram).ExecuteReturnIdentityAsync();
+ // if (pram.WorkPlanAttachments?.Count > 0)
+ // {
+ // foreach (var item in pram.WorkPlanAttachments)
+ // {
+ // item.OA_WorkPlanId = id;
+
+ // }
+ // await _client.Insertable(pram.WorkPlanAttachments).ExecuteCommandAsync();
+ // }
+ // await _client.AsTenant().CommitTranAsync();
+ //}
+ //catch (Exception)
+ //{
+ // await _client.AsTenant().RollbackTranAsync();
+ // throw;
+ //}
//await _client.AsTenant().BeginTranAsync();
//try
@@ -457,10 +492,7 @@
//{
// OneToManyInsertOrUpdate = true,
//})
- .Include(x => x.CarConditionAttachments,new UpdateNavOptions
- {
- OneToManyInsertOrUpdate = true,
- }).ExecuteCommandAsync();
+ .Include(x => x.CarConditionAttachments).ExecuteCommandAsync();
}
--
Gitblit v1.9.1