From f210a0e0fc0552bfacb2489de099bd512b8e74e7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 05 十一月 2025 09:03:39 +0800
Subject: [PATCH] 提交
---
Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs | 196 +++++++++++++++++++++++-------------------------
1 files changed, 93 insertions(+), 103 deletions(-)
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
index b4f5c50..48ec2b7 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
@@ -202,91 +202,71 @@
- ///// <summary>
- ///// 渚涘簲鍟嗘敮浠樻姤鍚嶈垂 鉃�
- ///// </summary>
- ///// <param name="input"></param>
- ///// <returns></returns>
- //[DisplayName("渚涘簲鍟嗘敮浠樻姤鍚嶈垂")]
- //[ApiDescriptionSettings(Name = "AddBaomingfei"), HttpPost]
- //public async Task<bool> AddBaomingfei(SuplierBaomingfeiInput input)
- //{
+ /// <summary>
+ /// 渚涘簲鍟嗘姤鍚� 鉃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("渚涘簲鍟嗘姤鍚�")]
+ [ApiDescriptionSettings(Name = "AddBaoming"), HttpPost]
+ public async Task<bool> AddBaoming(SuplierBaomingfeiInput input)
+ {
- // long userId = 0;
- // long? usertrueId = null;
- // if (long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId))
- // {
- // usertrueId = userId;
- // }
- // var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+ long userId = 0;
+ long? usertrueId = null;
+ if (long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId))
+ {
+ usertrueId = userId;
+ }
+ var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- // string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- // if (CustomerLogoinType != "GYS" )
- // {
- // throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳芥敮浠樻姤鍚嶈垂锛�");
- // }
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳芥敮浠樻姤鍚嶈垂锛�");
+ }
- // var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
- // if (tenderOrder == null)
- // {
- // throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
- // }
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
+ var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
+ if (tenderOrder == null)
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
+ }
- // //if (tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
- // //{
- // var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
- // if(tenderOrderBidding!=null && (tenderOrderBidding.IsTransfer.HasValue && tenderOrderBidding.IsTransfer.Value))
- // {
- // throw Oops.Oh("宸茬粡浠樻锛�");
- // }
+ //if (tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
+ //{
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
+ if (tenderOrderBidding != null )
+ {
+ throw Oops.Oh("宸茬粡鎶ュ悕锛�");
+ }
+ tenderOrderBidding = new TenderOrderBidding();
+ tenderOrderBidding.Id = Guid.NewGuid();
+ tenderOrderBidding.TenderId = input.TenderOrderId;
+ tenderOrderBidding.IsTransfer = false;
+ tenderOrderBidding.Zhifujine = null;
+ tenderOrderBidding.TransferTime = DateTime.Now;
+ tenderOrderBidding.TransferNo = "";// "BMF" + tenderOrderBidding.Id.ToString("N");
+ tenderOrderBidding.TradeNo = ""; //DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
- // if (tenderOrderBidding == null)
- // {
- // tenderOrderBidding = new TenderOrderBidding();
- // tenderOrderBidding.Id = Guid.NewGuid();
- // tenderOrderBidding.TenderId = input.TenderOrderId;
- // tenderOrderBidding.IsTransfer = true;
- // tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
- // tenderOrderBidding.TransferTime = DateTime.Now;
- // tenderOrderBidding.TransferNo = "BMF"+tenderOrderBidding.Id.ToString("N");
- // tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ tenderOrderBidding.CreateTime = DateTime.Now;
+ tenderOrderBidding.CreateUserId = usertrueId;
+ tenderOrderBidding.CreateUserName = RealName;
+ tenderOrderBidding.UpdateTime = DateTime.Now;
+ tenderOrderBidding.UpdateUserId = usertrueId;
+ tenderOrderBidding.UpdateUserName = RealName;
+ tenderOrderBidding.CusExtendId = customerExId;
+ return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
- // tenderOrderBidding.CreateTime = DateTime.Now;
- // tenderOrderBidding.CreateUserId = usertrueId;
- // tenderOrderBidding.CreateUserName = RealName;
- // tenderOrderBidding.UpdateTime = DateTime.Now;
- // tenderOrderBidding.UpdateUserId = usertrueId;
- // tenderOrderBidding.UpdateUserName = RealName;
- // return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
- // }
- // else
- // {
- // tenderOrderBidding.IsTransfer = true;
- // tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
- // tenderOrderBidding.TransferTime = DateTime.Now;
- // tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
- // tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
- // tenderOrderBidding.UpdateTime = DateTime.Now;
- // tenderOrderBidding.UpdateUserId = usertrueId;
- // tenderOrderBidding.UpdateUserName = RealName;
- // return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
- // }
-
-
-
- // //}
- // //else
- // //{
- // // throw Oops.Oh("鏃犻渶鏀粯鎶ュ悕璐癸紒");
- // //}
-
- //}
+ }
@@ -323,7 +303,7 @@
throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
}
- var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrder.CusExtendId ).FirstAsync();
+ var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.Id == tenderOrder.CusExtendId ).FirstAsync();
var cusExtend1 = new FBS_CusExtend();
if (cusExtend != null)
{
@@ -386,29 +366,37 @@
if(tenderOrderBidding == null)
{
- tenderOrderBidding = new TenderOrderBidding();
- tenderOrderBidding.Id = Guid.NewGuid();
- tenderOrderBidding.TenderId = input.TenderOrderId;
- tenderOrderBidding.Touboaowenjian = input.Touboaowenjian;
- tenderOrderBidding.TouboaowenjianName = input.TouboaowenjianName;
- tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = 0;
- tenderOrderBidding.CreateTime = DateTime.Now;
- tenderOrderBidding.CreateUserId = usertrueId;
- tenderOrderBidding.CreateUserName = RealName;
- tenderOrderBidding.UpdateTime = DateTime.Now;
- tenderOrderBidding.UpdateUserId = usertrueId;
- tenderOrderBidding.UpdateUserName = RealName;
- tenderOrderBidding.CusExtendId = customerExId;
- if( !tenderOrder.Baomingfei.HasValue || tenderOrder.Baomingfei.Value<=0)
+ throw Oops.Oh("蹇呴』鍏堟姤鍚嶏紒");
+ //tenderOrderBidding = new TenderOrderBidding();
+ //tenderOrderBidding.Id = Guid.NewGuid();
+ //tenderOrderBidding.TenderId = input.TenderOrderId;
+ //tenderOrderBidding.Touboaowenjian = input.Touboaowenjian;
+ //tenderOrderBidding.TouboaowenjianName = input.TouboaowenjianName;
+ //tenderOrderBidding.IsTransfer = true;
+ //tenderOrderBidding.Zhifujine = 0;
+ //tenderOrderBidding.CreateTime = DateTime.Now;
+ //tenderOrderBidding.CreateUserId = usertrueId;
+ //tenderOrderBidding.CreateUserName = RealName;
+ //tenderOrderBidding.UpdateTime = DateTime.Now;
+ //tenderOrderBidding.UpdateUserId = usertrueId;
+ //tenderOrderBidding.UpdateUserName = RealName;
+ //tenderOrderBidding.CusExtendId = customerExId;
+ //if( !tenderOrder.Baomingfei.HasValue || tenderOrder.Baomingfei.Value<=0)
+ //{
+ // tenderOrderBidding.IsTransfer = true;
+ // tenderOrderBidding.Zhifujine = 0;
+ // tenderOrderBidding.TransferTime = DateTime.Now;
+ // tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
+ // tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ //}
+ //return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
+ }
+ else
+ {
+ if (!tenderOrderBidding.IsTransfer.HasValue || !tenderOrderBidding.IsTransfer.Value)
{
- tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = 0;
- tenderOrderBidding.TransferTime = DateTime.Now;
- tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
- tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ throw Oops.Oh("閲囪喘鏂规病鏈夌‘璁ゆ姤鍚嶏紒");
}
- return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
}
tenderOrderBidding.Touboaowenjian = input.Touboaowenjian;
@@ -416,14 +404,14 @@
tenderOrderBidding.UpdateTime = DateTime.Now;
tenderOrderBidding.UpdateUserId = usertrueId;
tenderOrderBidding.UpdateUserName = RealName;
- if (!tenderOrder.Baomingfei.HasValue || tenderOrder.Baomingfei.Value <= 0)
- {
- tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = 0;
- tenderOrderBidding.TransferTime = DateTime.Now;
- tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
- tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
- }
+ //if (!tenderOrder.Baomingfei.HasValue || tenderOrder.Baomingfei.Value <= 0)
+ //{
+ // tenderOrderBidding.IsTransfer = true;
+ // tenderOrderBidding.Zhifujine = 0;
+ // tenderOrderBidding.TransferTime = DateTime.Now;
+ // tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
+ // tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ //}
return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
}
@@ -471,6 +459,8 @@
IsSelected = a.IsSelected,
IsSelectedName = a.IsSelected.HasValue&& a.IsSelected.Value?"鏄�":"鍚�",
FabuDate = b.FabuDate.HasValue ? b.FabuDate.Value : DateTime.Now,
+ CreateTime = a.CreateTime,
+ Baomingfei = b.Baomingfei,
});
var pagedList = await query.OrderBuilder(input, "", "KaibiaoDate", true).ToPagedListAsync(input.Page, input.PageSize);
--
Gitblit v1.9.1