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/CyOsDeliverManage.cs | 84 ++++++++++--
cylsg/cylsg.Model/ECTEModel/OA_CarManage.cs | 18 +
cylsg/cylsg.Application/CyOS/CyOSStaffController.cs | 163 ++++++++++++++++++++++
cylsg/cylsg.Application/CyOS/CyOSSettingController.cs | 59 ++++++++
cylsg/cylsg.Application/CyOS/CyOSSDriver.cs | 2
cylsg/cylsg.Model/ECTEModel/OA_DeliverPlanPaiche.cs | 47 ++++++
6 files changed, 343 insertions(+), 30 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
index 66543aa..a31037f 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
@@ -47,7 +47,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);
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
index 87256d7..dcdb043 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
@@ -95,7 +95,7 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [AllowAnonymous]
+
public async Task<List<OaStaff>> Getdrivers()
{
return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
@@ -109,6 +109,43 @@
}
+ /// <summary>
+ /// 鑾峰彇杞﹁締鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<List<OA_CarManage>> GetCarList()
+ {
+ var listdata= await _client.Queryable<OA_CarManage>().Includes(x => x.Staff).Where(x => x.MemberID == _oAServices.firmId ).Select(x=>new OA_CarManage
+ {
+ Keyid = x.Keyid,
+ CarNumber = x.CarNumber,
+ Staff=x.Staff
+ })
+ .ToListAsync();
+
+ foreach (var item in listdata)
+ {
+ if(item.Staff!=null)
+ {
+ if (item.Staff.Status != "鍦ㄨ亴")
+ {
+ item.Mark = "璇ュ憳宸ヤ笉灞炰簬鍦ㄨ亴鐘舵��,娲捐溅鍚庡彲鑳芥棤娉曞畬鎴愬悗缁祦绋�";
+ }
+ if (item.Staff.BF_IsDriver )
+ {
+ item.Mark+= "璇ュ憳宸ヤ笉鏄笓鑱屽徃鏈�";
+ }
+ item.CarNumber = item.CarNumber + "(" + item.Staff.Name + ")";
+ item.Staff = null;
+ }
+ item.StaffID = 0;
+
+
+ }
+
+ return listdata;
+ }
/// <summary>
/// 鑾峰彇7澶╁唴鍙告満鍒楄〃
/// </summary>
@@ -145,9 +182,25 @@
////.ToListAsync();
}
+ /// <summary>
+ /// 鑾峰彇鍛樺伐鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public async Task<List<OaStaff>>GetStaffList()
+ {
+ return await _client.Queryable<OaStaff>().Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
+ {
+ Name = x.Name,
+ MemberId = x.MemberId,
+ Keyid = x.Keyid,
+
-
-
+ }).WithCache(30).ToListAsync();
+ }
}
+
+
+
}
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>
diff --git a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
index deda07e..ecaad95 100644
--- a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
@@ -262,8 +262,8 @@
}
OA_CarManage car = null;
- if (Param.DriverId != null)
- car = await _client.Queryable<OA_CarManage>().Where(x => x.StaffID == Param.DriverId && x.MemberID == _oAServices.firmId).FirstAsync();
+ if (Param.CarId != null)
+ car = await _client.Queryable<OA_CarManage>().Where(x => x.Keyid == Param.CarId && x.MemberID == _oAServices.firmId).Includes(x=>x.Staff).FirstAsync();
OA_CorporateClients cor = null;
@@ -287,7 +287,7 @@
Sort = Param.Sort,
Creater = Param.Creater ?? Permissions.MemberId,
CreateTime = DateTime.Now,
- DriverId = Param.DriverId,
+ DriverId = car?.Staff?.Keyid??0,
SellerOrderId = await CreatDeliverPlanSn(),
Dianhua = Param.Dianhua,
Dizhi = Param.Dizhi,
@@ -340,10 +340,14 @@
Expression<Func<OA_DeliverPlanPaiche, bool>> SearchList = (x) => true;
SearchList = SearchList.And(x => x.FirmId == _oAServices.firmId);
//SearchList = SearchList.And(x => x.Creater == Permissions.MemberId);//鍙湅鑷繁
- 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);
+ }
+ if (Param.CarId != null)
+ {
+ SearchList = SearchList.And(x => x.CarId == Param.CarId);
}
//瀹㈡埛鍚嶇О
if (!string.IsNullOrEmpty(Param.CorporateClient))
@@ -372,8 +376,15 @@
//寮哄埗澧炲姞鍛樺伐杩囨护
RefAsync<int> totle = 0;
- var data = await _client.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Driver).Includes(x => x.SentStaff).Includes(x=>x.DeliverPlans)
- .Where(SearchList).OrderBy(x => x.DeliverTime).OrderBy(x => x.Sort).ToPageListAsync(Param.page.PageIndex, Param.page.PageSize, totle);
+ var data = await _client.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Car,car=>car.Staff).Includes(x => x.SentStaff).Includes(x=>x.DeliverPlans)
+ .Where(SearchList).OrderBy(x => x.DeliverTime).OrderBy(x => x.Sort).Mapper(x =>
+ {
+ if (x.Car?.Staff != null)
+ {
+ x.Car.CarNumber = x.Car.CarNumber + "(" + x.Car.Staff.Name + ")";
+ x.Car.Staff = null;
+ }
+ }).ToPageListAsync(Param.page.PageIndex, Param.page.PageSize, totle);
Param.page.TotalCount = totle;
return new DeliverOderPageRet
@@ -405,11 +416,41 @@
data.LastUpdateTime = DateTime.Now;
data.Updater = Permissions.MemberId;
- if (data.DriverId != Param.DriverId)
+ //浠ヨ溅杈嗛�夋嫨涓轰富 锛屼笉鍦ㄥ疄鐜板徃鏈洪�昏緫
+ //if (data.DriverId != Param.DriverId)
+ //{
+ // data.DriverId = Param.DriverId;
+ // var car = await _client.Queryable<OA_CarManage>().Where(x => x.StaffID == Param.DriverId && x.MemberID == _oAServices.firmId).FirstAsync();
+ // data.CarId = car == null ? 0 : car.Keyid;
+
+ // //foreach (var item in data.DeliverPlans)
+ // //{
+ // // item.DriverId = Param.DriverId;
+ // // item.CarId = car == null ? 0 : car.Keyid;
+ // // item.Updater = Permissions.MemberId;
+ // // item.LastUpdateTime = DateTime.Now;
+ // // item.DeliverTime = Param.DeliverTime;
+
+ // //}
+ //}
+ if (data.CarId != Param.CarId)
{
- data.DriverId = Param.DriverId;
- var car = await _client.Queryable<OA_CarManage>().Where(x => x.StaffID == Param.DriverId && x.MemberID == _oAServices.firmId).FirstAsync();
- data.CarId = car == null ? 0 : car.Keyid;
+
+ var car = await _client.Queryable<OA_CarManage>().Where(x => x.Keyid == Param.CarId && x.MemberID == _oAServices.firmId).Includes(x=>x.Staff).FirstAsync();
+ if(car == null)
+ {
+ throw Oops.Oh("娌℃湁鎵惧埌鏈夋晥杞﹁締淇℃伅");
+
+ }
+
+ data.CarId = Param.CarId;
+ if (car.Staff != null)
+ {
+ data.DriverId = car.Staff.Keyid;
+ }
+ else
+ data.DriverId = 0;
+ //data.CarId = car == null ? 0 : car.Keyid;
//foreach (var item in data.DeliverPlans)
//{
@@ -422,7 +463,6 @@
//}
}
-
data.DeliverTime = Param.DeliverTime;
data.Remark = Param.Remark;
@@ -487,6 +527,7 @@
foreach (var item in data.DeliverPlans)
{
item.DriverId = 0;
+ item.CarId = 0;
item.DeliverPlanPaicheid = Guid.Empty;
item.Deliveredstatus = DeliveredType.Undeliver;
item.Updater = Permissions.MemberId;
@@ -558,8 +599,15 @@
{
throw Oops.Oh("娌℃湁鏉冮檺");
}
- return await _client.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Attachments).Includes(x => x.Driver).Includes(x => x.Manager).Includes(x=>x.DeliverPlans)
- .Where(x => x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
+ return await _client.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Attachments).Includes(x => x.Car, car => car.Staff).Includes(x => x.Manager).Includes(x=>x.DeliverPlans)
+ .Where(x => x.Keyid == KeyId && x.ShifouDelivery != 2).Mapper(x=>
+ {
+ if(x.Car?.Staff!=null)
+ {
+ x.Car.CarNumber = x.Car.CarNumber + "(" + x.Car.Staff.Name + ")";
+ x.Car.Staff = null;
+ }
+ }).FirstAsync();
}
@@ -745,7 +793,10 @@
/// 鍙告満KeyID
/// </summary>
public int? DeliverKeyID { get; set; }
-
+ /// <summary>
+ /// 杞﹁締鐨刱eyid
+ /// </summary>
+ public int? CarId { get; set; }
/// <summary>
/// 瀹㈡埛鍚嶇О
@@ -756,6 +807,11 @@
/// 閰嶉�佺姸鎬�
/// </summary>
public DeliveredType? DeliveredState { get; set; }
+
+ /// <summary>
+ /// 闂鍙嶉鐨勬槸鍚﹀畬缁撶姸鎬�
+ /// </summary>
+ public WanjieStatusType? WanjieStatus { get; set; }
/// <summary>
/// 椤甸潰鍙傛暟
/// </summary>
diff --git a/cylsg/cylsg.Model/ECTEModel/OA_CarManage.cs b/cylsg/cylsg.Model/ECTEModel/OA_CarManage.cs
index 8abaeba..8e562b1 100644
--- a/cylsg/cylsg.Model/ECTEModel/OA_CarManage.cs
+++ b/cylsg/cylsg.Model/ECTEModel/OA_CarManage.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using cylsg.Model.ECTEModel;
using SqlSugar;
namespace Models
{
@@ -87,8 +88,12 @@
/// 榛樿鍊�:
///</summary>
[SugarColumn(ColumnName="StaffID" ) ]
- public int? StaffID { get; set; }
-
+ public int? StaffID { get; set; }
+ /// <summary>
+ /// 鍙告満璇︽儏
+ /// </summary>
+ [Navigate( NavigateType.OneToOne,nameof(StaffID))]
+ public OaStaff? Staff { get; set; }
/// <summary>
/// 澶� 娉�:
/// 榛樿鍊�:
@@ -122,9 +127,12 @@
/// 榛樿鍊�:
///</summary>
[SugarColumn(ColumnName="InsuranceContent" ) ]
- public string? InsuranceContent { get; set; }
-
-
+ public string? InsuranceContent { get; set; }
+ /// <summary>
+ /// 琛ュ～鍏呭瓧娈碉紝鐢ㄤ簬鎻愮ず鍛樺伐寮傚父淇℃伅 涓嶅湪搴撳唴閮�
+ /// </summary>
+ [SugarColumn(IsIgnore =true)]
+ public string? Mark { get; set; }
}
}
\ No newline at end of file
diff --git a/cylsg/cylsg.Model/ECTEModel/OA_DeliverPlanPaiche.cs b/cylsg/cylsg.Model/ECTEModel/OA_DeliverPlanPaiche.cs
index 6892bb0..c957aa3 100644
--- a/cylsg/cylsg.Model/ECTEModel/OA_DeliverPlanPaiche.cs
+++ b/cylsg/cylsg.Model/ECTEModel/OA_DeliverPlanPaiche.cs
@@ -35,7 +35,7 @@
public Guid? BuyerId { get; set; }
/// <summary>
- /// 澶� 娉�:瀹為檯鍒拌揪鏃堕棿
+ /// 澶� 娉�:瀹為檯鍒拌揪鏃堕棿 锛屽綋浣滀负闂鍙嶉鐨勬椂鍊欙紝涓烘彁浜ゅ弽棣堢殑鏃堕棿
/// 榛樿鍊�:
///</summary>
[SugarColumn(ColumnName = "DeliveredTime")]
@@ -68,6 +68,11 @@
///</summary>
[SugarColumn(ColumnName = "CarId")]
public int? CarId { get; set; }
+ /// <summary>
+ /// 鍙告満
+ /// </summary>
+ [Navigate(NavigateType.OneToOne, nameof(CarId), nameof(OaStaff.Keyid))]
+ public OA_CarManage? Car { get; set; }
/// <summary>
/// 澶� 娉�:鍙告満id
@@ -205,7 +210,7 @@
public int? Biddingcompany { get; set; }
/// <summary>
- /// 澶� 娉�: 2蹇界暐
+ /// 澶� 娉�: 2蹇界暐 鏄淳杞︾殑鏄�1锛屼笉娲捐溅濉�0(澧炲姞闂鍙嶉)
/// 榛樿鍊�:
///</summary>
[SugarColumn(ColumnName = "shifouDelivery")]
@@ -263,7 +268,7 @@
/// 闄勪欢鍒楄〃 3
/// </summary>
[Navigate(NavigateType.OneToMany, nameof(OA_attachment.OA_Id), nameof(Keyid), "AttachmentType=3")]
- public List<OA_attachment> Attachments { get; set; }
+ public List<OA_attachment> ?Attachments { get; set; }
/// <summary>
@@ -271,8 +276,44 @@
/// </summary>
[SugarColumn(IsIgnore =true)]
public int? DeliverTixingId { get; set; }
+
+ /// <summary>
+ /// 瀹岀粨鐘舵��
+ /// </summary>
+ [SugarColumn(IsNullable = true)]
+ public WanjieStatusType? Wanjiestatus { get; set; }
+ /// <summary>
+ /// 璐ｄ换浜篒D
+ /// </summary>
+ [SugarColumn(IsNullable = true)]
+ public int? Zerenren { get; set; }
+ /// <summary>
+ /// 璐ｄ换浜篒D
+ /// </summary>
+ [Navigate(NavigateType.OneToOne, nameof(Zerenren),nameof(OaStaff.Keyid))]
+ public OaStaff? ZerenrenInfo { get; set; }
+ /// <summary>
+ /// 缃氭
+ /// </summary>
+ [SugarColumn(IsNullable = true)]
+ public decimal? Fakuan { get; set; }
}
+
+ /// <summary>
+ /// 瀹岀粨鐘舵��
+ /// </summary>
+ public enum WanjieStatusType
+ {
+ /// <summary>
+ /// 鏈畬鎴�
+ /// </summary>
+ UnFinish = 0,
+ /// <summary>
+ /// 宸插畬鎴�
+ /// </summary>
+ Finish = 1
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1