From 595df5dac0a782bfdadab766b4dd62d326b0a383 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 21 十月 2025 14:53:04 +0800
Subject: [PATCH] 增加川印设备维修回写
---
cylsg/cylsg.Application/CyOS/CyOSStaffController.cs | 427 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 418 insertions(+), 9 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs b/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs
index e4e014e..c325c20 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSStaffController.cs
@@ -7,14 +7,18 @@
using ECTESTOA;
using EzCoreNet.Redis;
using Furion.LinqBuilder;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Models;
using System;
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
{
@@ -22,6 +26,7 @@
/// 宸濆嵃鏅�氬憳宸ユ帶鍒跺櫒
/// </summary>
[Authorize]
+ [ApiDescriptionSettings("CYOA")]
public class CyOSStaffController : IDynamicApiController
{
private readonly IOAServices _OAServices;
@@ -42,6 +47,7 @@
[HttpPost]
public async Task<WorekPlandto> getplanelist(SearchOaWorekPlan param)
{
+
if(! await CheckRols())
{
throw Oops.Oh("娌℃湁鏉冮檺");
@@ -129,7 +135,7 @@
throw Oops.Oh("绉戠洰ID RewardResult涓嶈兘涓虹┖");
}
- OaSubjectSet? kemu = null;
+ OaSubjectSet kemu = null;
try
{
var kemuid= pram.RewardResult.toInt();
@@ -196,12 +202,6 @@
pram.RewardMoney = 0;
pram.RewardType = 1;
pram.Keyid = null;
-
-
-
-
-
-
await _SugarClient.InsertNav(pram).Include(x=>x.WorkPlanAttachments).ExecuteCommandAsync();
return true;
@@ -307,7 +307,7 @@
}
/// <summary>
- /// 鑾峰彇璇︽儏
+ /// 鑾峰彇璐㈠姟鐢宠鍗曡鎯�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
@@ -350,6 +350,381 @@
/// <summary>
+ /// 鑾峰彇棰勭害閰嶉�佷俊鎭�
+ /// </summary>
+ /// <param name="Param"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<AppointmentDeliverRet> GetListAppointmentDeliverList(ApoointmentDeliverSearchParam Param)
+ {
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+
+ Expression<Func<OA_DeliverTixing, bool>> SearchList = (x) => true;
+ SearchList = SearchList.And(x => x.FirmId == _OAServices.firmId);
+ SearchList = SearchList.And(x => x.Creater == Permissions.MemberId);
+ if (!string.IsNullOrEmpty(Param.Content))
+ {
+ SearchList = SearchList.And(x => x.Remark.Contains(Param.Content));
+ }
+ if (Param.MemberId != null)
+ {
+ SearchList = SearchList.And(x => x.FirmId == Param.MemberId);
+ }
+ if (Param.TimeStart !=null)
+ {
+ SearchList = SearchList.And(x => x.CreateTime> Param.TimeStart);
+ }
+ if (Param.TimeEnd != null)
+ {
+ SearchList = SearchList.And(x => x.CreateTime < Param.TimeEnd.Value.AddDays(1));
+ }
+
+
+
+ if (Param.DeliverState != null)
+ {
+ SearchList = SearchList.And(x => x.Chulistatus == Param.DeliverState);
+ }
+ //寮哄埗澧炲姞鍛樺伐杩囨护
+ RefAsync<int> totle = 0;
+ var data = await _SugarClient.Queryable<OA_DeliverTixing>()
+ .Where(SearchList).OrderByDescending(x => x.ChuliTime).ToPageListAsync(Param.page.PageIndex, Param.page.PageSize, totle);
+
+ Param.page.TotalCount = totle;
+
+ return new AppointmentDeliverRet
+
+ {
+ Data = data,
+ page= Param.page,
+
+ };
+ }
+
+
+ /// <summary>
+ /// 鍒涘缓涓�涓绾﹂厤閫�
+ /// </summary>
+ /// <param name="Param"></param>
+ /// <returns></returns>
+ [LimitFilter(LimiType = Limttype.User,timespan =5,ResponseMeg ="璇峰嬁鍦�5鍐呴噸澶嶈姹�",InCount =1)]
+ public async Task<int> CreatAppointmentDeliver(OA_DeliverTixing Param)
+ {
+ if( string.IsNullOrEmpty(Param.Remark))
+ throw Oops.Oh("鍐呭蹇呭～");
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+
+ Param.FirmId = _OAServices.firmId;
+ Param.CreateTime = DateTime.Now;
+ Param.Creater = Permissions.MemberId;
+ Param.Chulistatus = AppointmentDeliverState.unAccept;
+
+ return await _SugarClient.Insertable(Param).ExecuteCommandAsync();
+ }
+
+ /// <summary>
+ /// 淇敼棰勭害鎻愰啋
+ /// </summary>
+ /// <param name="Param"></param>
+ /// <returns></returns>
+ public async Task<int> UpDataAppointmentDeliver(OA_DeliverTixing Param)
+ {
+ if( Param.Chulistatus== AppointmentDeliverState.Accept)
+ throw Oops.Oh("鐘舵�佷笉鍙慨鏀逛负鍙楃悊鐘舵��");
+ if (!(Param.Keyid>0))
+ throw Oops.Oh("Keyid涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(Param.Remark))
+ throw Oops.Oh("鍐呭蹇呭～");
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+ var data= await _SugarClient.Queryable<OA_DeliverTixing>().Where(x => x.Keyid == Param.Keyid&&x.FirmId==_OAServices.firmId&&x.Creater==Permissions.MemberId).FirstAsync();
+ if (data == null)
+ throw Oops.Oh("娌℃壘鍒版暟鎹�");
+ if(data.Chulistatus == AppointmentDeliverState.Accept)
+ throw Oops.Oh("宸插彈鐞嗙姸鎬佷笉鍙慨鏀�");
+ if (data.Remark!=Param.Remark)
+ {
+ data.Remark = Param.Remark;
+ data.LastUpdateTime = DateTime.Now;
+ data.Updater = Permissions.MemberId;
+ return await _SugarClient.Updateable(data).ExecuteCommandAsync();
+ }
+ return 1;
+
+
+ }
+ /// <summary>
+ /// 鍒犻櫎棰勭害鎻愰啋
+ /// </summary>
+ /// <param name="Param"></param>
+ /// <returns></returns>
+ public async Task<int> DelAppointmentDeliver(OA_DeliverTixing Param)
+ {
+ if (!(Param.Keyid > 0))
+ throw Oops.Oh("Keyid涓嶈兘涓虹┖");
+
+
+ if (!await CheckRols())
+ {
+ throw Oops.Oh("娌℃湁鏉冮檺");
+ }
+ var data = await _SugarClient.Queryable<OA_DeliverTixing>().Where(x => x.Keyid == Param.Keyid && x.Creater == Permissions.MemberId&&x.FirmId==_OAServices.firmId).FirstAsync();
+ if (data == null)
+ throw Oops.Oh("娌℃壘鍒版暟鎹垨鑰呮病鏈夋潈闄�");
+ if( data.Chulistatus!= AppointmentDeliverState.unAccept)
+ throw Oops.Oh("宸插彈鐞嗙姸鎬佷笉鍙垹闄�");
+
+ return await _SugarClient.Deleteable(data).ExecuteCommandAsync();
+
+
+ }
+
+ /// <summary>
+ /// 鑾峰彇閫佽揣鍗�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<DeliverOderPageRet> GetDeliverPlans(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);//鍙湅鑷繁 瀹㈡埛缁忕悊鏄嚜宸�
+ SearchList = SearchList.And(x => x.ShifouDelivery != 2 && 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.DeliveredState != null)
+ {
+ if (Param.DeliveredState != DeliveredType.Delivered)
+ {
+ SearchList = SearchList.And(x => x.Deliveredstatus != DeliveredType.Delivered);
+ }
+ else
+ {
+ SearchList = SearchList.And(x => x.Deliveredstatus == DeliveredType.Delivered);
+ }
+ }
+
+ //寮哄埗澧炲姞鍛樺伐杩囨护
+ RefAsync<int> totle = 0;
+ var data = await _SugarClient.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Driver).Includes(x=>x.DeliverPlans)
+ .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> GetDeliverPlanInfo(Guid KeyId)
+ {
+
+ if (!await CheckRols())
+ {
+ 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&&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>
/// <returns></returns>
@@ -380,7 +755,7 @@
/// <summary>
/// 鍛樺伐濮撳悕
/// </summary>
- public string? StaffName { get; set; }
+ public string StaffName { get; set; }
/// <summary>
/// 鍛樺伐Id
/// </summary>
@@ -432,4 +807,38 @@
public decimal TotalMoney { get; set; } = 0;
}
+
+ /// <summary>
+ /// 閰嶉�侀绾�
+ /// </summary>
+ public class AppointmentDeliverRet
+ {
+ /// <summary>
+ /// 鏁版嵁鍒楄〃
+ /// </summary>
+ public List<OA_DeliverTixing> Data { get; set; }
+
+ /// <summary>
+ /// 椤甸潰鍙傛暟
+ /// </summary>
+ public PageModel page { get; set; }
+
+ }
+
+
+ /// <summary>
+ /// 閰嶉�佸崟鏁版嵁杩斿洖
+ /// </summary>
+ public class DeliverOderPageRet
+ {
+ /// <summary>
+ /// 鏁版嵁鍒楄〃
+ /// </summary>
+ public List<OA_DeliverPlanPaiche> Data { get; set; }
+
+ /// <summary>
+ /// 椤甸潰鍙傛暟
+ /// </summary>
+ public PageModel page { get; set; }
+ }
}
--
Gitblit v1.9.1