From d248dd6e2366123531f678963df24953e6ec139c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 14 八月 2025 09:12:05 +0800
Subject: [PATCH] 修改多供应商中标
---
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs | 4 +-
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 69 +++++++++++++++++++++++-----------
Admin.NET/FZCZTB.NET.MD/TenderOrder.cs | 2
Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs | 26 +++++++------
4 files changed, 64 insertions(+), 37 deletions(-)
diff --git a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
index 1634e02..c73065e 100644
--- a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
+++ b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
@@ -307,7 +307,7 @@
/// <summary>
/// 涓爣鏂囦欢
/// </summary>
- [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "涓爣鏂囦欢")]
+ [SugarColumn(Length = 2000, IsNullable = true, ColumnDescription = "涓爣鏂囦欢")]
public string Zhongbiaowenjian { get; set; }
/// <summary>
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
index b4be808..8408896 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
@@ -221,8 +221,8 @@
- if (tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
- {
+ //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))
{
@@ -236,13 +236,13 @@
tenderOrderBidding = new TenderOrderBidding();
tenderOrderBidding.Id = Guid.NewGuid();
tenderOrderBidding.TenderId = input.TenderOrderId;
- //tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei.Value;
+ 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.CreateTime = DateTime.Now;
tenderOrderBidding.CreateUserId = usertrueId;
tenderOrderBidding.CreateUserName = RealName;
tenderOrderBidding.UpdateTime = DateTime.Now;
@@ -252,9 +252,11 @@
}
else
{
- tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei.Value;
+ 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;
@@ -263,11 +265,11 @@
- }
- else
- {
- throw Oops.Oh("鏃犻渶鏀粯鎶ュ悕璐癸紒");
- }
+ //}
+ //else
+ //{
+ // throw Oops.Oh("鏃犻渶鏀粯鎶ュ悕璐癸紒");
+ //}
}
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 92c3cc6..c5f0289 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
@@ -965,10 +965,10 @@
/// <summary>
- /// 涓爣渚涘簲鍟唅d
+ /// 涓爣渚涘簲鍟唅d 閫楀彿鍒嗛殧锛� 12121212,232323,232323,232323
/// </summary>
[Required(ErrorMessage = "涓爣渚涘簲鍟唅d涓嶈兘涓虹┖")]
- public long SupplierUserId { get; set; }
+ public string SupplierUserIds { get; set; }
/// <summary>
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
index 5ce9d3c..5d5d3a4 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
@@ -821,28 +821,44 @@
throw Oops.Oh("宸茬粡涓爣鐨勯」鐩笉鑳藉啀娆′腑鏍囷紒");
}
-
- var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == input.SupplierUserId).FirstAsync();
- if (tenderOrderBidding == null)
+ var ssss = input.SupplierUserIds.Split(',');
+ if (string.IsNullOrEmpty(input.SupplierUserIds))
{
- throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�");
+ throw Oops.Oh("娌℃湁閫変腑涓爣渚涘簲鍟嗭紒");
}
- if (tenderOrderBidding.IsTransfer != true )
+ foreach ( var sss in ssss)
{
- throw Oops.Oh("娌℃湁鏀粯鎶ュ悕璐广�備笉鑳戒腑鏍囷紒");
- }
- if (string.IsNullOrEmpty(tenderOrderBidding.Touboaowenjian) )
- {
- throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒");
+ var SupplierUserId = long.Parse(sss);
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == SupplierUserId).FirstAsync();
+ if (tenderOrderBidding == null)
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�");
+ }
+ if (tenderOrderBidding.IsTransfer != true)
+ {
+ throw Oops.Oh("娌℃湁鏀粯鎶ュ悕璐广�備笉鑳戒腑鏍囷紒");
+ }
+ if (string.IsNullOrEmpty(tenderOrderBidding.Touboaowenjian))
+ {
+ throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒");
+ }
}
- tenderOrder.ZhongbiaoId = input.SupplierUserId;
+
+
+ tenderOrder.ZhongbiaoId = null;
//tenderOrder.ZhongbiaoName = input.SupplierUserName;
- var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == input.SupplierUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass ).FirstAsync();
- if (cusExtend != null)
+ tenderOrder.ZhongbiaoName = "";
+ foreach (var sss in ssss)
{
- tenderOrder.ZhongbiaoName = cusExtend.EnterpriseName;
+ 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.ZhongbiaoDate = DateTime.Now;
@@ -854,17 +870,26 @@
await _TenderOrderRep.UpdateAsync(tenderOrder);
- tenderOrderBidding.IsSelected = true;
- tenderOrderBidding.SelectedTime = tenderOrder.ZhongbiaoDate;
- tenderOrderBidding.UpdateTime = DateTime.Now;
- tenderOrderBidding.UpdateUserId = usertrueId;
- tenderOrderBidding.UpdateUserName = RealName;
+ 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();
+ tenderOrderBidding.IsSelected = true;
+ tenderOrderBidding.SelectedTime = tenderOrder.ZhongbiaoDate;
+ tenderOrderBidding.UpdateTime = DateTime.Now;
+ tenderOrderBidding.UpdateUserId = usertrueId;
+ tenderOrderBidding.UpdateUserName = RealName;
+ await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
+ }
+
+ return true;
-
-
- return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
+
+
+
+
}
--
Gitblit v1.9.1