From 24f914a80d01fa8e5c6cfcba14ae59a6c0a117a8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 八月 2025 09:39:22 +0800
Subject: [PATCH] 修改
---
Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs | 40 ++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs | 43 +++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs | 34 ++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 339 ++++++++++++++++++++++-
Admin.NET/FZCZTB.NET.MD/Collection.cs | 8
Admin.NET/FZCZTB.NET.MD/TenderOrder.cs | 25 +
Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs | 293 ++++++++++++++++----
7 files changed, 690 insertions(+), 92 deletions(-)
diff --git a/Admin.NET/FZCZTB.NET.MD/Collection.cs b/Admin.NET/FZCZTB.NET.MD/Collection.cs
index 3eb8a0c..73c601a 100644
--- a/Admin.NET/FZCZTB.NET.MD/Collection.cs
+++ b/Admin.NET/FZCZTB.NET.MD/Collection.cs
@@ -27,6 +27,14 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public Guid TenderId { get; set; }
+
+
+ /// <summary>
+ /// 鍒涘缓鑰匔usExtendId
+ /// </summary>
+ [OwnerUser]
+ [SugarColumn(ColumnDescription = "鍒涘缓鑰匔usExtendId", IsOnlyIgnoreUpdate = true)]
+ public long? CusExtendId { get; set; }
}
diff --git a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
index 921d258..9d78141 100644
--- a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
+++ b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
@@ -228,7 +228,7 @@
/// <summary>
- /// 璁㈠崟鐘舵��
+ /// 璁㈠崟鐘舵�� 1淇濆瓨 2 鍙戝竷 3 涓爣
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "璁㈠崟鐘舵��")]
public int? OrderStatus { get; set; }
@@ -334,11 +334,34 @@
[SugarColumn(IsNullable = true, ColumnDescription = "涓爣鏃堕棿")]
public DateTime? ZhongbiaoDate { get; set; }
+
+ /// <summary>
+ /// 涓爣鍏憡
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "涓爣鍏憡")]
+ public string Zhongbiaogonggao { get; set; }
+
+ /// <summary>
+ /// 涓爣鍏憡Name
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "涓爣鍏憡Name")]
+ public string ZhongbiaogonggaoName { get; set; }
+
+
+
/// <summary>
/// 涓爣tittle
/// </summary>
[SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "涓爣tittle")]
public string ZhongbiaoTittle { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰匔usExtendId
+ /// </summary>
+ [OwnerUser]
+ [SugarColumn(ColumnDescription = "鍒涘缓鑰匔usExtendId", IsOnlyIgnoreUpdate = true)]
+ public long? CusExtendId { get; set; }
+
}
}
diff --git a/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs b/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs
index ffd92ac..88501a9 100644
--- a/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs
+++ b/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs
@@ -86,6 +86,46 @@
[SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "鏀粯杩斿洖鏍囧彿")]
public string TradeNo { get; set; }
+ /// <summary>
+ /// 鍒涘缓鑰匔usExtendId
+ /// </summary>
+ [OwnerUser]
+ [SugarColumn(ColumnDescription = "鍒涘缓鑰匔usExtendId", IsOnlyIgnoreUpdate = true)]
+ public long? CusExtendId { get; set; }
+
+
+
+
+ /// <summary>
+ /// 鏄惁鏀粯浠ｇ悊璐�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁鏀粯浠ｇ悊璐�")]
+ public bool? IsDailiTransfer { get; set; }
+
+ /// <summary>
+ /// 浠ｇ悊璐规敮浠樻椂闂�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠ｇ悊璐规敮浠樻椂闂�")]
+ public DateTime? DailiTransferTime { get; set; }
+
+
+ /// <summary>
+ /// 浠ｇ悊璐规敮浠樼紪鍙�
+ /// </summary>
+ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "浠ｇ悊璐规敮浠樼紪鍙�")]
+ public string DailiTransferNo { get; set; }
+
+ /// <summary>
+ ///浠ｇ悊鏀粯閲戦
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠ｇ悊鏀粯閲戦")]
+ public decimal? DailiZhifujine { get; set; }
+
+ /// <summary>
+ /// 浠ｇ悊鏀粯杩斿洖鏍囧彿
+ /// </summary>
+ [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "浠ｇ悊鏀粯杩斿洖鏍囧彿")]
+ public string DailiTradeNo { get; set; }
}
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
index 84eb371..b4f5c50 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
@@ -31,6 +31,7 @@
using MimeKit;
using static SKIT.FlurlHttpClient.Wechat.Api.Events.TransferCustomerServiceReply.Types;
using Aop.Api.Domain;
+using FZCZTB.NET.MD.CutomerMd.Extend;
namespace FZCZTB.TSCL.Application;
/// <summary>
@@ -76,9 +77,13 @@
{
usertrueId = userId;
}
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- var collection = await _CollectionRep.AsQueryable().Where(x =>x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
+ var collection = await _CollectionRep.AsQueryable().Where(x =>x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
if (input.isColection && collection != null)
{
return true;
@@ -104,6 +109,7 @@
entity.CreateUserName = RealName;
entity.UpdateUserId = usertrueId;
entity.UpdateUserName = RealName;
+ entity.CusExtendId = customerExId;
entity.TenderId = input.TenderOrderId;
}
return await _CollectionRep.InsertAsync(entity);
@@ -124,8 +130,11 @@
long userId = 0;
long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId);
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
var query = _sqlSugarClient.Queryable<Collection,TenderOrder>((a, b) => a.TenderId == b.Id)
- .Where((a, b) => a.CreateUserId == userId)
+ .Where((a, b) => a.CusExtendId == customerExId)
.WhereIF(!string.IsNullOrWhiteSpace(input.ProjectName), (a, b) => b.ProjectName.Contains(input.ProjectName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Dailijigoumingcheng), (a, b) => b.Dailijigoumingcheng.Contains(input.Dailijigoumingcheng.Trim()))
@@ -193,14 +202,103 @@
+ ///// <summary>
+ ///// 渚涘簲鍟嗘敮浠樻姤鍚嶈垂 鉃�
+ ///// </summary>
+ ///// <param name="input"></param>
+ ///// <returns></returns>
+ //[DisplayName("渚涘簲鍟嗘敮浠樻姤鍚嶈垂")]
+ //[ApiDescriptionSettings(Name = "AddBaomingfei"), HttpPost]
+ //public async Task<bool> AddBaomingfei(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);
+
+ // string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ // if (CustomerLogoinType != "GYS" )
+ // {
+ // throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳芥敮浠樻姤鍚嶈垂锛�");
+ // }
+
+ // 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 (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;
+ // 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("鏃犻渶鏀粯鎶ュ悕璐癸紒");
+ // //}
+
+ //}
+
+
+
+
/// <summary>
- /// 渚涘簲鍟嗘敮浠樻姤鍚嶈垂 鉃�
+ /// 渚涘簲鍟嗚幏鍙栦唬鐞嗕汉鐨勬敮浠樹俊鎭� 鉃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [DisplayName("渚涘簲鍟嗘敮浠樻姤鍚嶈垂")]
+ [DisplayName("渚涘簲鍟嗚幏鍙栦唬鐞嗕汉鐨勬敮浠樹俊鎭�")]
[ApiDescriptionSettings(Name = "AddBaomingfei"), HttpPost]
- public async Task<bool> AddBaomingfei(SuplierBaomingfeiInput input)
+ public async Task<FBS_CusExtend> AddBaomingfei(SuplierBaomingfeiInput input)
{
@@ -212,67 +310,33 @@
}
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
-
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳借幏鍙栦唬鐞嗕汉鐨勬敮浠樹俊鎭紒");
+ }
+
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("宸茬粡浠樻锛�");
- }
+ var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrder.CusExtendId ).FirstAsync();
+ var cusExtend1 = new FBS_CusExtend();
+ if (cusExtend != null)
+ {
+ cusExtend1.EnterpriseName = cusExtend.EnterpriseName;
+ cusExtend1.BankName = cusExtend.BankName;
+ cusExtend1.BankAccount = cusExtend.BankAccount;
+ cusExtend1.BankAccountIMG = cusExtend.BankAccountIMG;
+ }
- 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;
- 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("鏃犻渶鏀粯鎶ュ悕璐癸紒");
- //}
-
+ return cusExtend1;
}
-
@@ -293,22 +357,32 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳戒笂浼犳嫑鏍囨枃浠讹紒");
+ }
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
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)
- {
- if (tenderOrderBidding == null || (!tenderOrderBidding.IsTransfer.HasValue || tenderOrderBidding.IsTransfer.Value == false))
- {
- throw Oops.Oh("蹇呴』鍏堟敮浠樻墠鑳芥姇鏍囷紒");
- }
- }
+ //if(tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
+ //{
+ // if (tenderOrderBidding == null || (!tenderOrderBidding.IsTransfer.HasValue || tenderOrderBidding.IsTransfer.Value == false))
+ // {
+ // throw Oops.Oh("蹇呴』鍏堟敮浠樻墠鑳芥姇鏍囷紒");
+ // }
+ //}
if(tenderOrderBidding == null)
{
@@ -325,6 +399,15 @@
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);
}
@@ -333,6 +416,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); // 璁㈠崟鍙�
+ }
return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
}
@@ -350,8 +441,11 @@
long userId = 0;
long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId);
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
var query = _sqlSugarClient.Queryable<TenderOrderBidding, TenderOrder>((a, b) => a.TenderId == b.Id)
- .Where((a, b) => a.CreateUserId == userId)
+ .Where((a, b) => a.CusExtendId == customerExId)
.WhereIF(!string.IsNullOrWhiteSpace(input.ProjectName), (a, b) => b.ProjectName.Contains(input.ProjectName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Dailijigoumingcheng), (a, b) => b.Dailijigoumingcheng.Contains(input.Dailijigoumingcheng.Trim()))
@@ -393,4 +487,73 @@
return pagedList;
}
+
+
+
+
+ /// <summary>
+ /// 渚涘簲鍟嗕笅杞戒腑鏍囨枃浠� 鉃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("渚涘簲鍟嗕笅杞戒腑鏍囨枃浠�")]
+ [ApiDescriptionSettings(Name = "DownZhongbiao"), HttpPost]
+ public async Task<TenderOrderOutput> DownZhongbiao(SuplierBaomingfeiInput input)
+ {
+
+
+ long userId = 0;
+ long? usertrueId = null;
+ if (long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId))
+ {
+ usertrueId = userId;
+ }
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳戒笂浼犳嫑鏍囨枃浠讹紒");
+ }
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+ var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+
+
+
+
+
+ var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
+ if (tenderOrder == null)
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
+ }
+ if(tenderOrder.OrderStatus !=3)
+ {
+ throw Oops.Oh("鍙湁涓爣涔嬪悗鎵嶈兘涓嬭浇涓爣鏂囦欢锛�");
+ }
+
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
+
+ if (tenderOrderBidding == null )
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�");
+ }
+ if (!tenderOrderBidding.IsSelected.HasValue && tenderOrderBidding.IsSelected.Value)
+ {
+ throw Oops.Oh("娌℃湁涓爣锛�");
+ }
+ if (!tenderOrderBidding.IsDailiTransfer.HasValue && tenderOrderBidding.IsDailiTransfer.Value)
+ {
+ throw Oops.Oh("娌℃湁缂寸撼浠ｇ悊璐癸紒");
+ }
+
+ var tenderOrderOutput = new TenderOrderOutput();
+
+ tenderOrderOutput.Zhongbiaowenjian = tenderOrder.Zhongbiaowenjian;
+ tenderOrderOutput.ZhongbiaowenjianName = tenderOrder.ZhongbiaowenjianName;
+ return tenderOrderOutput;
+ }
+
}
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
index 243d096..c78d65a 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
@@ -998,10 +998,23 @@
/// <summary>
- /// 涓爣渚涘簲鍟唅d 閫楀彿鍒嗛殧锛� 12121212,232323,232323,232323
+ /// 涓爣鍏憡
/// </summary>
- [Required(ErrorMessage = "涓爣渚涘簲鍟唅d涓嶈兘涓虹┖")]
- public string SupplierUserIds { get; set; }
+ [Required(ErrorMessage = "涓爣鍏憡Name涓嶈兘涓虹┖")]
+ public string Zhongbiaogonggao { get; set; }
+
+ /// <summary>
+ /// 涓爣鍏憡Name
+ /// </summary>
+ [Required(ErrorMessage = "涓爣鍏憡Name涓嶈兘涓虹┖")]
+ public string ZhongbiaogonggaoName { get; set; }
+
+
+ /// <summary>
+ /// 涓爣鎶曟爣Id 閫楀彿鍒嗛殧锛� F0D64522-BF2B-4759-9431-EE89952283CA,4A1A779A-4263-4229-8DA6-AD4E56052F44,F0D64522-BF2B-4759-9431-EE89952283CA [FB_TenderOrderBidding]鐨刬d
+ /// </summary>
+ [Required(ErrorMessage = "涓爣鎶曟爣Id涓嶈兘涓虹┖")]
+ public string TenderOrderBiddingIds { get; set; }
/// <summary>
@@ -1027,6 +1040,21 @@
}
+/// <summary>
+/// 閲囪喘浠ｇ悊浜哄彇浜轰緵搴斿晢宸叉敮浠樻姤鍚嶈垂
+/// </summary>
+public class QuerenSuplierBaomingfeiInput
+{
+ /// <summary>
+ /// 鎷涙爣Id
+ /// </summary>
+ [Required(ErrorMessage = "鎷涙爣Id涓嶈兘涓虹┖")]
+ public Guid TenderOrderBiddingId { get; set; }
+
+
+
+}
+
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
index 159c2e5..442c7d3 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
@@ -365,6 +365,16 @@
public DateTime? ZhongbiaoDate { get; set; }
/// <summary>
+ /// 涓爣鍏憡
+ /// </summary>
+ public string Zhongbiaogonggao { get; set; }
+
+ /// <summary>
+ /// 涓爣鍏憡Name
+ /// </summary>
+ public string ZhongbiaogonggaoName { get; set; }
+
+ /// <summary>
/// 涓爣tittle
/// </summary>
public string ZhongbiaoTittle { get; set; }
@@ -609,6 +619,39 @@
/// </summary>
public string? UpdateUserName { get; set; }
+ /// <summary>
+ /// 鍒涘缓鑰匔usExtendId
+ /// </summary>
+ public long? CusExtendId { get; set; }
+
+
+
+ /// <summary>
+ /// 鏄惁鏀粯浠ｇ悊璐�
+ /// </summary>
+ public bool? IsDailiTransfer { get; set; }
+
+ /// <summary>
+ /// 浠ｇ悊璐规敮浠樻椂闂�
+ /// </summary>
+ public DateTime? DailiTransferTime { get; set; }
+
+
+ /// <summary>
+ /// 浠ｇ悊璐规敮浠樼紪鍙�
+ /// </summary>
+ public string DailiTransferNo { get; set; }
+
+ /// <summary>
+ ///浠ｇ悊鏀粯閲戦
+ /// </summary>
+ public decimal? DailiZhifujine { get; set; }
+
+ /// <summary>
+ /// 浠ｇ悊鏀粯杩斿洖鏍囧彿
+ /// </summary>
+ public string DailiTradeNo { get; set; }
+
}
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
index 703035d..2b1d6d4 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
@@ -31,6 +31,7 @@
using MimeKit;
using static FZCZTB.TSCL.Application.ChangeTenderOrderOut;
using FZCZTB.NET.MD.CutomerMd.Extend;
+using FZCZTB.NET.MD.CutomerMd;
namespace FZCZTB.TSCL.Application;
/// <summary>
@@ -241,8 +242,12 @@
long userId = 0;
long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId);
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
+
var query = _TenderOrderRep.AsQueryable()
- .Where(x => x.CreateUserId == userId)
+ .Where(x => x.CusExtendId == customerExId)
.WhereIF(!string.IsNullOrWhiteSpace(input.Xingzhengquyu), u => u.Xingzhengquyu.Contains(input.Xingzhengquyu.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Hangyepinmu), u => u.Hangyepinmu == input.Hangyepinmu.Trim())
.WhereIF( input.OrderStatus.HasValue, u => u.OrderStatus == input.OrderStatus)
@@ -354,7 +359,7 @@
{
tenderOrderBiddingOutput.IsTransferName = "鍚�";
}
- var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrderBiddingOutput.CreateUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass).FirstAsync();
+ var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.Id == tenderOrderBiddingOutput.CusExtendId).FirstAsync();
if (cusExtend != null)
{
tenderOrderBiddingOutput.ChangshangName = cusExtend.EnterpriseName;
@@ -368,6 +373,75 @@
return tenderOrderOutput;
}
+
+ /// <summary>
+ /// 閲囪喘浠ｇ悊浜哄鍔犻潪鏀垮簻璁㈠崟澶勭悊鑾峰彇鑱旂郴鏂瑰紡
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("閲囪喘浠ｇ悊浜哄鍔犻潪鏀垮簻璁㈠崟鑾峰彇鑱旂郴鏂瑰紡")]
+ [ApiDescriptionSettings(Name = "Addgetcontact"), HttpPost]
+ public async Task<TenderOrderOutput> Addgetcontact()
+ {
+ long userId = 0;
+ long? usertrueId = null;
+ if (long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId))
+ {
+ usertrueId = userId;
+ }
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鑾峰彇鑱旂郴鏂瑰紡锛�");
+ }
+
+ var tenderOrderOutput = new TenderOrderOutput();
+
+ var fBS_CusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>()
+ .Where(x => x.Id == customerExId).FirstAsync();
+ if (fBS_CusExtend != null)
+ {
+ if (CustomerLogoinType != "DLJG" )
+ {
+ tenderOrderOutput.Dailijigoumingcheng = fBS_CusExtend.EnterpriseName;
+ tenderOrderOutput.DailiLianxiren = fBS_CusExtend.OperatorName;
+ tenderOrderOutput.DailiLianxidianhua = fBS_CusExtend.OperatorPhone;
+ tenderOrderOutput.DailiDianziyoujian = fBS_CusExtend.EnterpriseEmail;
+ tenderOrderOutput.DailiTongxindizhi = fBS_CusExtend.Residence;
+ tenderOrderOutput.DailiXiangmujingli = "";
+ tenderOrderOutput.DailijingliLianxidianhua = "";
+ }
+ else if (CustomerLogoinType != "CGR")
+ {
+ tenderOrderOutput.Caigourenmingcheng = fBS_CusExtend.EnterpriseName;
+ tenderOrderOutput.Xingzhengquyu = "";
+ tenderOrderOutput.XingzhengquyuName = "";
+ tenderOrderOutput.Jigoudaima = fBS_CusExtend.UnifiedSocialCreditCode;
+ tenderOrderOutput.Daimaleixing = "";
+ tenderOrderOutput.DaimaleixingName = "";
+ tenderOrderOutput.Lianxiren = fBS_CusExtend.OperatorName;
+ tenderOrderOutput.Lianxidianhua = fBS_CusExtend.OperatorPhone;
+ tenderOrderOutput.Tongxindizhi = fBS_CusExtend.Residence;
+ tenderOrderOutput.Dianziyoujian = fBS_CusExtend.EnterpriseEmail;
+ tenderOrderOutput.Xiangmujingbanren = "";
+ tenderOrderOutput.Zhiwu = "";
+ tenderOrderOutput.Jingbanrendianhua = "";
+ }
+
+ }
+
+
+ return tenderOrderOutput;
+
+ }
+
/// <summary>
/// 閲囪喘浠ｇ悊浜哄鍔犻潪鏀垮簻璁㈠崟澶勭悊 鉃�
@@ -386,6 +460,18 @@
{
usertrueId = userId;
}
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if(CustomerLogoinType!= "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷鎷涙爣锛�");
+ }
+
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
entity.CreateTime = DateTime.Now;
entity.UpdateTime = DateTime.Now;
@@ -393,6 +479,7 @@
entity.CreateUserName = RealName;
entity.UpdateUserId = usertrueId;
entity.UpdateUserName = RealName;
+ entity.CusExtendId = customerExId;
entity.OrderStatus = 1;
entity.Tousu = false;
entity.Zhiyi = false;
@@ -416,6 +503,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊鎷涙爣锛�");
+ }
+
var tenderOrder = _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).First();
if(tenderOrder == null)
{
@@ -451,6 +546,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊闈炴斂搴滆鍗曡川鐤戯紒");
+ }
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
var tenderOrder = _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).First();
@@ -483,6 +586,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊闈炴斂搴滆鍗曟姇璇夛紒");
+ }
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
var tenderOrder = _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).First();
@@ -508,6 +619,13 @@
[ApiDescriptionSettings(Name = "Delete"), HttpPost]
public async Task Delete(DeleteTenderOrderInput input)
{
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍒犻櫎鎷涙爣锛�");
+ }
+
//var entity = await _TenderOrderRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
var entity = await _sqlSugarClient.Queryable<TenderOrder>().Where(x=>x.Id== input.Id).FirstAsync() ?? throw Oops.Oh(ErrorCodeEnum.D1002);
//await _TenderOrderRep.FakeDeleteAsync(entity); //鍋囧垹闄�
@@ -523,6 +641,14 @@
[ApiDescriptionSettings(Name = "BatchDelete"), HttpPost]
public async Task<bool > BatchDelete([Required(ErrorMessage = "涓婚敭鍒楄〃涓嶈兘涓虹┖")]List<DeleteTenderOrderInput> input)
{
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鎵归噺鍒犻櫎鎷涙爣锛�");
+ }
+
var exp = Expressionable.Create<TenderOrder>();
foreach (var row in input) exp = exp.Or(it => it.Id == row.Id);
var list = await _TenderOrderRep.AsQueryable().Where(exp.ToExpression()).ToListAsync();
@@ -621,6 +747,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷鎷涙爣锛�");
+ }
+
var tenderOrder = _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).First();
if (tenderOrder == null)
{
@@ -659,6 +793,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊闈炴斂搴滆鍗曟爣棰橈紒");
+ }
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
var tenderOrder = _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).First();
@@ -691,6 +833,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷鍙樻洿鍏憡锛�");
+ }
+
var tenderOrder = _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderId).First();
if (tenderOrder == null)
{
@@ -783,12 +933,79 @@
[ApiDescriptionSettings(Name = "CHangeDelete"), HttpPost]
public async Task CHangeDelete(DeleteTenderOrderInput input)
{
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍒犻櫎鍙樻洿鍏憡锛�");
+ }
+
//var entity = await _TenderOrderRep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
var entity = await _sqlSugarClient.Queryable<ChangeOrder>().Where(x => x.Id == input.Id).FirstAsync() ?? throw Oops.Oh(ErrorCodeEnum.D1002);
//await _TenderOrderRep.FakeDeleteAsync(entity); //鍋囧垹闄�
await _ChangeOrderRep.DeleteAsync(entity); //鐪熷垹闄�
}
+
+
+
+ /// <summary>
+ /// 閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樻姤鍚嶈垂 鉃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樻姤鍚嶈垂")]
+ [ApiDescriptionSettings(Name = "QuerenBaomingfei"), HttpPost]
+ public async Task<bool> QuerenBaomingfei(QuerenSuplierBaomingfeiInput 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);
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗗凡鏀粯鎶ュ悕璐癸紒");
+ }
+
+
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.Id == input.TenderOrderBiddingId).FirstAsync();
+
+ if (tenderOrderBidding == null )
+ {
+ throw Oops.Oh("娌℃壘鍒版姇鏍囦俊鎭紒");
+ }
+
+ if (tenderOrderBidding != null && (tenderOrderBidding.IsTransfer.HasValue && tenderOrderBidding.IsTransfer.Value))
+ {
+ throw Oops.Oh("宸茬粡浠樻锛�");
+ }
+
+
+ var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == tenderOrderBidding.TenderId).FirstAsync();
+ if (tenderOrder == null)
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
+ }
+
+ 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);
+
+ }
/// <summary>
@@ -808,6 +1025,14 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷涓爣鏂囦欢锛�");
+ }
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
@@ -822,15 +1047,18 @@
throw Oops.Oh("宸茬粡涓爣鐨勯」鐩笉鑳藉啀娆′腑鏍囷紒");
}
- var ssss = input.SupplierUserIds.Split(',');
- if (string.IsNullOrEmpty(input.SupplierUserIds))
+ var ssss = input.TenderOrderBiddingIds.Split(',');
+ if (string.IsNullOrEmpty(input.TenderOrderBiddingIds))
{
throw Oops.Oh("娌℃湁閫変腑涓爣渚涘簲鍟嗭紒");
}
- foreach ( var sss in ssss)
+
+
+
+ foreach ( var sss in ssss)
{
- var SupplierUserId = long.Parse(sss);
- var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == SupplierUserId).FirstAsync();
+ var tenderOrderBiddingId = Guid.Parse(sss);
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.Id == tenderOrderBiddingId).FirstAsync();
if (tenderOrderBidding == null)
{
throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�");
@@ -843,46 +1071,50 @@
{
throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒");
}
+
+
}
-
+
+
+
+
tenderOrder.ZhongbiaoId = null;
- //tenderOrder.ZhongbiaoName = input.SupplierUserName;
tenderOrder.ZhongbiaoName = "";
- foreach (var sss in ssss)
- {
- var SupplierUserId = long.Parse(sss);
- var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == SupplierUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass).FirstAsync();
- if (cusExtend != null)
- {
- tenderOrder.ZhongbiaoName += cusExtend.EnterpriseName+",";
- }
- }
-
-
tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian;
tenderOrder.ZhongbiaowenjianName = input.ZhongbiaowenjianName;
+ tenderOrder.Zhongbiaogonggao = input.Zhongbiaogonggao;
+ tenderOrder.ZhongbiaogonggaoName = input.ZhongbiaogonggaoName;
tenderOrder.ZhongbiaoDate = DateTime.Now;
tenderOrder.UpdateTime = DateTime.Now;
tenderOrder.UpdateUserId = usertrueId;
tenderOrder.UpdateUserName = RealName;
tenderOrder.OrderStatus = 3;
tenderOrder.ZhongbiaoTittle = input.ZhongbiaoTittle;
- await _TenderOrderRep.UpdateAsync(tenderOrder);
+
foreach (var sss in ssss)
{
- var SupplierUserId = long.Parse(sss);
- var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == SupplierUserId).FirstAsync();
+ var tenderOrderBiddingId = Guid.Parse(sss);
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.Id == tenderOrderBiddingId).FirstAsync();
tenderOrderBidding.IsSelected = true;
tenderOrderBidding.SelectedTime = tenderOrder.ZhongbiaoDate;
tenderOrderBidding.UpdateTime = DateTime.Now;
tenderOrderBidding.UpdateUserId = usertrueId;
tenderOrderBidding.UpdateUserName = RealName;
await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
+
+ var SupplierUserId = tenderOrderBidding.CusExtendId??0;
+ var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.Id == SupplierUserId).FirstAsync();
+ if (cusExtend != null)
+ {
+ tenderOrder.ZhongbiaoName += cusExtend.EnterpriseName + ",";
+ }
}
+ tenderOrder.ZhongbiaoName = tenderOrder.ZhongbiaoName.Trim(',');
+ await _TenderOrderRep.UpdateAsync(tenderOrder);
return true;
@@ -895,4 +1127,65 @@
}
+
+
+ /// <summary>
+ /// 閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樹唬鐞嗚垂 鉃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樹唬鐞嗚垂")]
+ [ApiDescriptionSettings(Name = "QuerenDailifei"), HttpPost]
+ public async Task<bool> QuerenDailifei(QuerenSuplierBaomingfeiInput 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);
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗗凡鏀粯浠ｇ悊璐癸紒");
+ }
+
+
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.Id == input.TenderOrderBiddingId).FirstAsync();
+
+ if (tenderOrderBidding == null)
+ {
+ throw Oops.Oh("娌℃壘鍒版姇鏍囦俊鎭紒");
+ }
+
+ if (tenderOrderBidding != null && (tenderOrderBidding.IsDailiTransfer.HasValue && tenderOrderBidding.IsDailiTransfer.Value))
+ {
+ throw Oops.Oh("宸茬粡浠樻锛�");
+ }
+
+
+ var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == tenderOrderBidding.TenderId).FirstAsync();
+ if (tenderOrder == null)
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
+ }
+
+ tenderOrderBidding.IsDailiTransfer = true;
+ tenderOrderBidding.DailiZhifujine = 0;
+ tenderOrderBidding.DailiTransferTime = DateTime.Now;
+ tenderOrderBidding.DailiTransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
+ tenderOrderBidding.DailiTradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ tenderOrderBidding.UpdateTime = DateTime.Now;
+ tenderOrderBidding.UpdateUserId = usertrueId;
+ tenderOrderBidding.UpdateUserName = RealName;
+ return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
+
+ }
+
+
}
--
Gitblit v1.9.1