From 757e9a10418043eb1a5c5e41975d3eb39db66a80 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 20 六月 2025 14:27:04 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/CyOS/CyOSStaffController.cs | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 159 insertions(+), 4 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs b/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs
index d0249df..c325c20 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs
@@ -13,10 +13,12 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
+using System.Runtime.ConstrainedExecution;
using System.Text;
using System.Threading.Tasks;
using TencentCloud.Hunyuan.V20230901.Models;
using TencentCloud.Mrs.V20200910.Models;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ProductOfflineGetSameCityTemplateResponse.Types.Template.Types;
namespace cylsg.Application.CyOS
{
@@ -133,7 +135,7 @@
throw Oops.Oh("绉戠洰ID RewardResult涓嶈兘涓虹┖");
}
- OaSubjectSet? kemu = null;
+ OaSubjectSet kemu = null;
try
{
var kemuid= pram.RewardResult.toInt();
@@ -503,7 +505,7 @@
Expression<Func<OA_DeliverPlanPaiche, bool>> SearchList = (x) => true;
SearchList = SearchList.And(x => x.FirmId == _OAServices.firmId);
SearchList = SearchList.And(x => x.BusinessManagerId == 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);
@@ -565,10 +567,163 @@
throw Oops.Oh("娌℃湁鏉冮檺");
}
return await _SugarClient.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Attachments).Includes(x=>x.Driver).Includes(x=>x.DeliverPlans)
- .Where(x => x.BusinessManagerId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
+ .Where(x => x.BusinessManagerId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2&&x.ShifouDelivery!=0).FirstAsync();
}
+ /// <summary>
+ /// 鑾峰彇闂鍙嶉璁㈠崟
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<DeliverOderPageRet> GetProblemPlans(DeliverPlanSearchParam Param)
+ {
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+
+ Expression<Func<OA_DeliverPlanPaiche, bool>> SearchList = (x) => true;
+ SearchList = SearchList.And(x => x.FirmId == _OAServices.firmId);
+ SearchList = SearchList.And(x => x.BusinessManagerId == Permissions.KeyId||x.DriverId==Permissions.KeyId);//鍙湅鑷繁 鍒涘缓鐨勬垨鑰呮槸鍙嶉鑰呮槸鑷繁鐨�
+ SearchList = SearchList.And(x => x.ShifouDelivery ==0);//杩囨护鏈夋晥
+ if (Param.DeliverKeyID != null)
+ {
+ SearchList = SearchList.And(x => x.DriverId == Param.DeliverKeyID);
+ }
+ //瀹㈡埛鍚嶇О
+ if (!string.IsNullOrEmpty(Param.CorporateClient))
+ {
+ SearchList = SearchList.And(x => x.CompanyName.Contains(Param.CorporateClient));
+ }
+ if (Param.TimeStart != null)
+ {
+ SearchList = SearchList.And(x => x.DeliverTime >= Param.TimeStart.Value.Date);
+ }
+ if (Param.TimeEnd != null)
+ {
+ SearchList = SearchList.And(x => x.DeliverTime < Param.TimeEnd.Value.Date.AddDays(1));
+ }
+ if (Param.WanjieStatus != null)
+ {
+ SearchList = SearchList.And(x => x.Wanjiestatus == Param.WanjieStatus);
+
+ }
+
+ //寮哄埗澧炲姞鍛樺伐杩囨护
+ RefAsync<int> totle = 0;
+ var data = await _SugarClient.Queryable<OA_DeliverPlanPaiche>().Includes(x=>x.ZerenrenInfo).Includes(x=>x.Driver)
+ .Where(SearchList).OrderByDescending(x => x.CreateTime.Value.Date).OrderBy(x => SqlFunc.Asc(x.Sort)).ToPageListAsync(Param.page.PageIndex, Param.page.PageSize, totle);
+
+ Param.page.TotalCount = totle;
+
+
+ return new DeliverOderPageRet
+
+ {
+ Data = data,
+ page = Param.page,
+
+ };
+
+
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐢ㄦ埛鍙嶉鍗曡鎯�
+ /// </summary>
+ /// <param name="KeyId"></param>
+ /// <returns></returns>
+ public async Task<OA_DeliverPlanPaiche> GetProblemPlanInfo(Guid KeyId)
+ {
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+ return await _SugarClient.Queryable<OA_DeliverPlanPaiche>().Includes(x=>x.ZerenrenInfo).Includes(x=>x.Driver)
+ .Where(x => x.Keyid == KeyId && x.ShifouDelivery == 0).FirstAsync();
+ //
+ }
+
+ /// <summary>
+ /// 鍒涘缓涓�涓敤鎴峰弽棣堣鍗�
+ /// </summary>
+ /// <param name="Param"></param>
+ /// <returns></returns>
+ [LimitFilter(LimiType = Limttype.User, timespan = 5, ResponseMeg = "璇峰嬁鍦�5鍐呴噸澶嶈姹�", InCount = 1)]
+ public async Task<int> CreatProblemPlan(OA_DeliverPlanPaiche Param)
+ {
+
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+
+
+
+ OA_DeliverPlanPaiche DeliverPlan = new OA_DeliverPlanPaiche()
+ {
+ Keyid = Guid.NewGuid(),
+ FirmId = _OAServices.firmId,
+ BuyerId = Param.BuyerId ?? Guid.Empty,
+ DeliverTime =DateTime.Now,
+ DeliveredTime=DateTime.Now,
+ CarId = 0,
+ Wentifankui = Param.Wentifankui,
+ Xingzhengzhuize = "",
+ Yichangchuli = "",
+ Zhuyishixiang = "",
+ Gongzuokaoping = "",
+
+
+ Transferstatus = 1,
+ Sort =1 ,
+ Creater = Param.Creater ?? Permissions.MemberId,
+ CreateTime = DateTime.Now,
+ DriverId = Param.DriverId,
+ SellerOrderId = "",
+ Dianhua = "",
+ Dizhi = "",
+ Remark = Param.Remark,
+ BusinessManagerId =Permissions.KeyId,
+ Biddingcompany =0,
+ ShifouDelivery = 0,
+ Lianxiren ="",
+ Deliveredstatus = (int)DeliveredType.Undeliver,
+ CompanyName = Param.CompanyName,
+ Wanjiestatus= WanjieStatusType.UnFinish,
+
+
+
+
+ };
+
+ return await _SugarClient.Insertable(DeliverPlan).ExecuteCommandAsync();
+ }
+
+ /// <summary>
+ /// 鍒犻櫎 闂鍙嶉
+ /// </summary>
+ /// <param name="keyid"></param>
+ /// <returns></returns>
+ [HttpDelete]
+ public async Task<int > DeleteProblemPlan(Guid keyid)
+ {
+
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+ var a=await _SugarClient.Queryable<OA_DeliverPlanPaiche>().Where(x => x.Keyid == keyid && x.ShifouDelivery == 0 && x.Wanjiestatus != WanjieStatusType.Finish&&x.BusinessManagerId==Permissions.KeyId).FirstAsync();
+ if(a != null)
+ {
+ return await _SugarClient.Deleteable(a).ExecuteCommandAsync();
+ }
+ throw Oops.Oh("娌℃湁鏉冮檺鎴栬�呴棶棰樺凡缁忓鐞嗗畬缁�");
+ }
/// <summary>
/// 鍒ゆ柇鏄惁鍏锋湁鏉冮檺
/// </summary>
@@ -600,7 +755,7 @@
/// <summary>
/// 鍛樺伐濮撳悕
/// </summary>
- public string? StaffName { get; set; }
+ public string StaffName { get; set; }
/// <summary>
/// 鍛樺伐Id
/// </summary>
--
Gitblit v1.9.1