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/TenderOrder/Dto/TenderOrderOutput.cs | 20 +
Admin.NET/FZCZTB.NET.MD/CaigourenGuanli.cs | 103 ++++++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs | 212 +++++++++++++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 289 +++++++++++++++---
Admin.NET/FZCZTB.NET.MD/TenderOrder.cs | 33 +
Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs | 196 ++++++------
6 files changed, 684 insertions(+), 169 deletions(-)
diff --git a/Admin.NET/FZCZTB.NET.MD/CaigourenGuanli.cs b/Admin.NET/FZCZTB.NET.MD/CaigourenGuanli.cs
new file mode 100644
index 0000000..65562dc
--- /dev/null
+++ b/Admin.NET/FZCZTB.NET.MD/CaigourenGuanli.cs
@@ -0,0 +1,103 @@
+锘縰sing Admin.NET.Core;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FZCZTB.NET.MD
+{
+ /// <summary>
+ /// 鎶曡瘔璐ㄧ枒缁撴灉
+ /// </summary>
+ [SugarTable("FB_CaigourenGuanli")]
+ [IncreTable]
+ public partial class CaigourenGuanli : basemodelNoId
+ {
+ /// <summary>
+ /// 閲囪喘浜篒D锛屼富閿�
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true)]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 閲囪喘浜哄悕绉�
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "閲囪喘浜哄悕绉�")]
+ public string Caigourenmingcheng { get; set; }
+
+ /// <summary>
+ /// 琛屾斂鍖哄煙
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "琛屾斂鍖哄煙")]
+ public string Xingzhengquyu { get; set; }
+
+ /// <summary>
+ /// 琛屾斂鍖哄煙鍚嶇О
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "琛屾斂鍖哄煙鍚嶇О")]
+ public string XingzhengquyuName { get; set; }
+
+ /// <summary>
+ /// 鏈烘瀯浠ｇ爜
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "鏈烘瀯浠ｇ爜")]
+ public string Jigoudaima { get; set; }
+
+ /// <summary>
+ /// 浠ｇ爜绫诲瀷
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "浠ｇ爜绫诲瀷")]
+ public string Daimaleixing { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴浜�
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "鑱旂郴浜�")]
+ public string Lianxiren { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "鑱旂郴鐢佃瘽")]
+ public string Lianxidianhua { get; set; }
+
+ /// <summary>
+ /// 閫氫俊鍦板潃
+ /// </summary>
+ [SugarColumn(Length = 250, IsNullable = true, ColumnDescription = "閫氫俊鍦板潃")]
+ public string Tongxindizhi { get; set; }
+
+ /// <summary>
+ /// 鐢靛瓙閭欢
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "鐢靛瓙閭欢")]
+ public string Dianziyoujian { get; set; }
+
+ /// <summary>
+ /// 椤圭洰缁忓姙浜�
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "椤圭洰缁忓姙浜�")]
+ public string Xiangmujingbanren { get; set; }
+
+ /// <summary>
+ /// 鑱屽姟
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "鑱屽姟")]
+ public string Zhiwu { get; set; }
+
+ /// <summary>
+ /// 缁忓姙浜虹數璇�
+ /// </summary>
+ [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "缁忓姙浜虹數璇�")]
+ public string Jingbanrendianhua { get; set; }
+
+
+ /// <summary>
+ /// 鍒涘缓鑰匔usExtendId
+ /// </summary>
+ public long? CusExtendId { get; set; }
+ }
+}
diff --git a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
index 9d78141..0391692 100644
--- a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
+++ b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -48,9 +49,9 @@
public string Caigoufangshi { get; set; }
/// <summary>
- /// 閲囪喘閬囩畻
+ /// 閲囪喘棰勭畻
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "閲囪喘閬囩畻")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "閲囪喘棰勭畻", Length = 18, DecimalDigits = 4)]
public decimal? Caigouyusuan { get; set; }
/// <summary>
@@ -62,14 +63,26 @@
/// <summary>
/// 鎶ュ悕璐�
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鎶ュ悕璐�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鎶ュ悕璐�", Length = 18, DecimalDigits = 4)]
public decimal? Baomingfei { get; set; }
/// <summary>
/// 鎶曟爣淇濊瘉閲�
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鎶曟爣淇濊瘉閲�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鎶曟爣淇濊瘉閲�", Length = 18, DecimalDigits = 4)]
public decimal? Toubiaobaozhengjin { get; set; }
+
+ /// <summary>
+ /// 灞ョ害淇濊瘉閲�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鎶曟爣淇濊瘉閲�",Length = 18, DecimalDigits = 4)]
+ public decimal? LVyuebaozhengjin { get; set; }
+
+ /// <summary>
+ /// 鎷涙爣浠ｇ悊璐�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鎶曟爣淇濊瘉閲�", Length = 18, DecimalDigits = 4)]
+ public decimal? Zhaobiaodailifei { get; set; }
/// <summary>
@@ -212,6 +225,11 @@
public string DailijingliLianxidianhua { get; set; }
+ /// <summary>
+ /// 鏄惁鎺ュ彈淇濆嚱
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁鎺ュ彈淇濆嚱")]
+ public bool? Isbaohan { get; set; }
/// <summary>
/// 璐ㄧ枒鏈夋棤
@@ -363,5 +381,12 @@
[SugarColumn(ColumnDescription = "鍒涘缓鑰匔usExtendId", IsOnlyIgnoreUpdate = true)]
public long? CusExtendId { get; set; }
+
+ /// <summary>
+ /// 鍙戝竷瑙掕壊
+ /// </summary>
+ [SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "鍙戝竷瑙掕壊")]
+ public string CustomerLogoinType { 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 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);
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 c78d65a..f44e8dc 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
@@ -65,6 +65,22 @@
/// </summary>
public virtual decimal? Toubiaobaozhengjin { get; set; }
+ /// <summary>
+ /// 灞ョ害淇濊瘉閲�
+ /// </summary>
+ public decimal? LVyuebaozhengjin { get; set; }
+
+ /// <summary>
+ /// 鎷涙爣浠ｇ悊璐�
+ /// </summary>
+ public decimal? Zhaobiaodailifei { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎺ュ彈淇濆嚱
+ /// </summary>
+ public bool? Isbaohan { get; set; }
+
+
/// <summary>
/// 鑱斿悎浣撴姇鏍�
@@ -247,6 +263,36 @@
}
+
+
+/// <summary>
+/// 閲囪喘浜哄垎椤垫煡璇㈣緭鍏ュ弬鏁�
+/// </summary>
+public class PageCaigiourenInput : BasePageInput
+{
+
+ /// <summary>
+ /// 鏂板鏃ユ湡鑼冨洿
+ /// </summary>
+ public DateTime?[] CreateDateRange { get; set; }
+
+ /// <summary>
+ /// 閲囪喘浜哄悕绉�
+ /// </summary>
+ public string Caigourenmingcheng { get; set; }
+
+ /// <summary>
+ /// 琛屾斂鍖哄煙
+ /// </summary>
+ public string Xingzhengquyu { get; set; }
+
+
+
+
+
+
+}
+
/// <summary>
/// 闈炴斂搴滆鍗曞鍔犺緭鍏ュ弬鏁�
/// </summary>
@@ -299,6 +345,21 @@
/// 鎶曟爣淇濊瘉閲�
/// </summary>
public decimal? Toubiaobaozhengjin { get; set; }
+
+ /// <summary>
+ /// 灞ョ害淇濊瘉閲�
+ /// </summary>
+ public decimal? LVyuebaozhengjin { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎺ュ彈淇濆嚱
+ /// </summary>
+ public bool? Isbaohan { get; set; }
+
+ /// <summary>
+ /// 鎷涙爣浠ｇ悊璐�
+ /// </summary>
+ public decimal? Zhaobiaodailifei { get; set; }
/// <summary>
/// 鑱斿悎浣撴姇鏍�
@@ -444,6 +505,102 @@
}
+
+
+
+
+/// <summary>
+/// 闈炴斂搴滆鍗曞鍔犺緭鍏ュ弬鏁�
+/// </summary>
+public class AddCaigourenGuanliInput
+{
+
+ /// <summary>
+ /// 閲囪喘浜篒D锛屼富閿�
+ /// </summary>
+
+ public Guid? Id { get; set; }
+
+ /// <summary>
+ /// 閲囪喘浜哄悕绉�
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "閲囪喘浜哄悕绉板瓧绗﹂暱搴︿笉鑳借秴杩�100")]
+ public string Caigourenmingcheng { get; set; }
+
+ /// <summary>
+ /// 琛屾斂鍖哄煙510000,510100,510101
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "琛屾斂鍖哄煙瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Xingzhengquyu { get; set; }
+
+ /// <summary>
+ /// 琛屾斂鍖哄煙鍚嶇О 鍥涘窛鐪� / 鎴愰兘甯� / 甯傛湰绾�
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "琛屾斂鍖哄煙鍚嶇О瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string XingzhengquyuName { get; set; }
+
+ /// <summary>
+ /// 鏈烘瀯浠ｇ爜
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "鏈烘瀯浠ｇ爜瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Jigoudaima { get; set; }
+
+ /// <summary>
+ /// 浠ｇ爜绫诲瀷
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "浠ｇ爜绫诲瀷瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Daimaleixing { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴浜�
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "鑱旂郴浜虹О瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Lianxiren { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "鑱旂郴鐢佃瘽瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Lianxidianhua { get; set; }
+
+ /// <summary>
+ /// 閫氫俊鍦板潃
+ /// </summary>
+ [MaxLength(250, ErrorMessage = "閫氫俊鍦板潃瀛楃闀垮害涓嶈兘瓒呰繃250")]
+ public string Tongxindizhi { get; set; }
+
+ /// <summary>
+ /// 鐢靛瓙閭欢
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "鐢靛瓙閭欢瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Dianziyoujian { get; set; }
+
+ /// <summary>
+ /// 椤圭洰缁忓姙浜�
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "椤圭洰缁忓姙浜哄瓧绗﹂暱搴︿笉鑳借秴杩�100")]
+ public string Xiangmujingbanren { get; set; }
+
+ /// <summary>
+ /// 鑱屽姟
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "鑱屽姟瀛楃闀垮害涓嶈兘瓒呰繃100")]
+ public string Zhiwu { get; set; }
+
+ /// <summary>
+ /// 缁忓姙浜虹數璇�
+ /// </summary>
+ [MaxLength(100, ErrorMessage = "缁忓姙浜虹數璇濆瓧绗﹂暱搴︿笉鑳借秴杩�100")]
+ public string Jingbanrendianhua { get; set; }
+
+
+
+
+
+
+
+}
+
/// <summary>
/// 闈炴斂搴滆鍗曞垹闄よ緭鍏ュ弬鏁�
@@ -984,17 +1141,7 @@
public Guid TenderOrderId { get; set; }
- /// <summary>
- /// 涓爣鏂囦欢
- /// </summary>
- [Required(ErrorMessage = "涓爣鏂囦欢涓嶈兘涓虹┖")]
- public string Zhongbiaowenjian { get; set; }
-
- /// <summary>
- /// 涓爣鏂囦欢Name
- /// </summary>
- [Required(ErrorMessage = "涓爣鏂囦欢Name涓嶈兘涓虹┖")]
- public string ZhongbiaowenjianName { get; set; }
+
/// <summary>
@@ -1025,6 +1172,49 @@
}
+
+
+
+
+
+/// <summary>
+/// 浠ｇ悊鍟嗗彂甯冧腑鏍囨枃浠�
+/// </summary>
+public class OrderZhongbiaoWenjianInput
+{
+ /// <summary>
+ /// 鎷涙爣Id
+ /// </summary>
+ [Required(ErrorMessage = "鎷涙爣Id涓嶈兘涓虹┖")]
+ public Guid TenderOrderId { get; set; }
+
+
+ /// <summary>
+ /// 涓爣鏂囦欢
+ /// </summary>
+ [Required(ErrorMessage = "涓爣鏂囦欢涓嶈兘涓虹┖")]
+ public string Zhongbiaowenjian { get; set; }
+
+ /// <summary>
+ /// 涓爣鏂囦欢Name
+ /// </summary>
+ [Required(ErrorMessage = "涓爣鏂囦欢Name涓嶈兘涓虹┖")]
+ public string ZhongbiaowenjianName { get; set; }
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+
/// <summary>
/// 渚涘簲鍟嗘敮浠樻姤鍚嶈垂
/// </summary>
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 52ff946..2471d29 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
@@ -75,6 +75,16 @@
/// </summary>
public decimal? Toubiaobaozhengjin { get; set; }
+ /// <summary>
+ /// 灞ョ害淇濊瘉閲�
+ /// </summary>
+ public decimal? LVyuebaozhengjin { get; set; }
+
+ /// <summary>
+ /// 鎷涙爣浠ｇ悊璐�
+ /// </summary>
+ public decimal? Zhaobiaodailifei { get; set; }
+
/// <summary>
/// 鑱斿悎浣撴姇鏍�
@@ -212,6 +222,11 @@
/// </summary>
public string DailijingliLianxidianhua { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎺ュ彈淇濆嚱
+ /// </summary>
+ public bool? Isbaohan { get; set; }
/// <summary>
@@ -386,6 +401,11 @@
public ChangeOrder? changeOrder { get; set; }
/// <summary>
+ /// 鍙戝竷瑙掕壊
+ /// </summary>
+ public string CustomerLogoinType { get; set; }
+
+ /// <summary>
/// 鎶曟爣鎯呭喌
/// </summary>
public List<TenderOrderBiddingOutput>? tenderOrderBiddings { 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 5e5dc03..8dec6c4 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
@@ -47,13 +47,15 @@
private readonly SqlSugarRepository<SysRegion> _sysRegionRep;
private readonly SqlSugarRepository<ChangeOrder> _ChangeOrderRep;
private readonly SqlSugarRepository<TenderOrderBidding> _TenderOrderBiddingRep;
+ private readonly SqlSugarRepository<CaigourenGuanli> _CaigourenGuanliRep;
public TenderOrderService(SqlSugarRepository<TenderOrder> TenderOrderRep, ISqlSugarClient sqlSugarClient,
SqlSugarRepository<SysDictData> sysDictDataRep,
SysCacheService sysCacheService,
SqlSugarRepository<SysRegion> sysRegionRep,
SqlSugarRepository<ChangeOrder> changeOrderRep
- , SqlSugarRepository<TenderOrderBidding> TenderOrderBiddingRep)
+ ,SqlSugarRepository<TenderOrderBidding> TenderOrderBiddingRep
+ ,SqlSugarRepository<CaigourenGuanli> CaigourenGuanliRep)
{
_TenderOrderRep = TenderOrderRep;
_sqlSugarClient = sqlSugarClient;
@@ -62,6 +64,7 @@
_sysRegionRep = sysRegionRep;
_ChangeOrderRep = changeOrderRep;
_TenderOrderBiddingRep = TenderOrderBiddingRep;
+ _CaigourenGuanliRep = CaigourenGuanliRep;
}
@@ -244,10 +247,16 @@
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 query = _TenderOrderRep.AsQueryable()
- .Where(x => x.CusExtendId == customerExId)
+ .Where(x => x.CusExtendId == customerExId && x.CustomerLogoinType == CustomerLogoinType)
.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)
@@ -335,7 +344,7 @@
var tenderOrderBiddings = await _sqlSugarClient.Queryable<TenderOrderBidding>()
.Where(x => x.TenderId == input.Id)
- .Where(x=>x.IsTransfer == true)
+ //.Where(x=>x.IsTransfer == true)
.Select<TenderOrderBiddingOutput>().ToListAsync();
if (tenderOrderBiddings != null)
@@ -493,9 +502,121 @@
entity.OrderStatus = 1;
entity.Tousu = false;
entity.Zhiyi = false;
+ entity.CustomerLogoinType = CustomerLogoinType;
return await _TenderOrderRep.InsertAsync(entity);
}
+
+
+
+
+
+ /// <summary>
+ /// 閲囪喘浠ｇ悊浜哄鍔犻潪鏀垮簻璁㈠崟澶勭悊 鉃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("鎷涙爣浠ｇ悊鏈烘瀯澧炲姞閲囪喘浜�")]
+ [ApiDescriptionSettings(Name = "AddOrUpdateCaigouren"), HttpPost]
+ public async Task<bool> AddOrUpdateCaigouren(AddCaigourenGuanliInput input)
+ {
+ var entity = input.Adapt<CaigourenGuanli>();
+
+ 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;
+
+ if (CustomerLogoinType != "DLJG" )
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯 鎵嶈兘鏂板鎷涙爣锛�");
+ }
+ var ssss = false;
+ if (input.Id.HasValue)
+ {
+ var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+ entity.UpdateTime = DateTime.Now;
+ entity.UpdateUserId = usertrueId;
+ entity.UpdateUserName = RealName;
+ entity.CusExtendId = customerExId;
+ ssss = await _CaigourenGuanliRep.UpdateAsync(entity);
+ }
+ else
+ {
+ entity.Id = Guid.NewGuid();
+ var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+ entity.CreateTime = DateTime.Now;
+ entity.UpdateTime = DateTime.Now;
+ entity.CreateUserId = usertrueId;
+ entity.CreateUserName = RealName;
+ entity.UpdateUserId = usertrueId;
+ entity.UpdateUserName = RealName;
+ entity.CusExtendId = customerExId;
+ ssss = await _CaigourenGuanliRep.InsertAsync(entity);
+ }
+
+
+
+ return ssss;
+ }
+
+
+
+
+ /// <summary>
+ /// 閲囪喘浠ｇ悊浜哄垹闄ら噰璐汉 鉂�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("閲囪喘浠ｇ悊浜哄垹闄ら噰璐汉")]
+ [ApiDescriptionSettings(Name = "DeleteCaigouren"), HttpPost]
+ public async Task DeleteCaigouren(DeleteTenderOrderInput input)
+ {
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "DLJG" )
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎵嶈兘鍒犻櫎閲囪喘浜猴紒");
+ }
+
+
+ var entity = await _sqlSugarClient.Queryable<CaigourenGuanli>().Where(x => x.Id == input.Id).FirstAsync() ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+ await _CaigourenGuanliRep.DeleteAsync(entity); //鐪熷垹闄�
+ }
+
+
+ /// <summary>
+ /// 鎷涙爣浠ｇ悊鍒嗛〉鏌ヨ閲囪喘浜� 馃敄
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("鎷涙爣浠ｇ悊鍒嗛〉鏌ヨ閲囪喘浜�")]
+ [ApiDescriptionSettings(Name = "PageCaigouren"), HttpPost]
+ public async Task<SqlSugarPagedList<CaigourenGuanli>> PageCaigouren(PageCaigiourenInput input)
+ {
+ 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 = _CaigourenGuanliRep.AsQueryable()
+ .Where(x => x.CusExtendId == customerExId)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Xingzhengquyu), u => u.Xingzhengquyu.Contains(input.Xingzhengquyu.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Caigourenmingcheng), u => u.Caigourenmingcheng.Contains(input.Caigourenmingcheng.Trim()))
+ .WhereIF(input.CreateDateRange != null && input.CreateDateRange.Length == 2, u => u.CreateTime >= input.CreateDateRange[0] && u.CreateTime <= input.CreateDateRange[1])
+ .Select<CaigourenGuanli>();
+ return await query.OrderBuilder(input, "", "CreateTime", true).ToPagedListAsync(input.Page, input.PageSize);
+ }
+
/// <summary>
/// 閲囪喘浠ｇ悊浜烘洿鏂伴潪鏀垮簻璁㈠崟澶勭悊 鉁忥笍
@@ -960,11 +1081,11 @@
/// <summary>
- /// 閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樻姤鍚嶈垂 鉃�
+ /// 閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢鎶ュ悕 鉃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [DisplayName("閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樻姤鍚嶈垂")]
+ [DisplayName("閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢鎶ュ悕")]
[ApiDescriptionSettings(Name = "QuerenBaomingfei"), HttpPost]
public async Task<bool> QuerenBaomingfei(QuerenSuplierBaomingfeiInput input)
{
@@ -982,7 +1103,7 @@
if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
- throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗗凡鏀粯鎶ュ悕璐癸紒");
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗘姤鍚嶏紒");
}
@@ -995,7 +1116,7 @@
if (tenderOrderBidding != null && (tenderOrderBidding.IsTransfer.HasValue && tenderOrderBidding.IsTransfer.Value))
{
- throw Oops.Oh("宸茬粡浠樻锛�");
+ throw Oops.Oh("宸茬粡纭鎶ュ悕锛�");
}
@@ -1006,10 +1127,10 @@
}
tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
+ 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); // 璁㈠崟鍙�
+ tenderOrderBidding.TransferNo = usertrueId.Value.ToString();// "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;
@@ -1019,13 +1140,13 @@
/// <summary>
- /// 浠ｇ悊鍟嗗彂甯冧腑鏍囨枃浠� 鉃�
+ /// 浠ｇ悊鍟嗗彂甯冧腑鏍囧叕鍛� 鉃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [DisplayName("浠ｇ悊鍟嗗彂甯冧腑鏍囨枃浠�")]
- [ApiDescriptionSettings(Name = "AddZhongbiao"), HttpPost]
- public async Task<bool> AddZhongbiao(OrderZhongbiaoInput input)
+ [DisplayName("浠ｇ悊鍟嗗彂甯冧腑鏍囧叕鍛�")]
+ [ApiDescriptionSettings(Name = "AddZhongbiaoGonggao"), HttpPost]
+ public async Task<bool> AddZhongbiaoGonggao(OrderZhongbiaoInput input)
{
@@ -1075,12 +1196,12 @@
}
if (tenderOrderBidding.IsTransfer != true)
{
- throw Oops.Oh("娌℃湁鏀粯鎶ュ悕璐广�備笉鑳戒腑鏍囷紒");
+ throw Oops.Oh("娌℃湁鎶ュ悕纭銆備笉鑳戒腑鏍囷紒");
}
- if (string.IsNullOrEmpty(tenderOrderBidding.Touboaowenjian))
- {
- throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒");
- }
+ //if (string.IsNullOrEmpty(tenderOrderBidding.Touboaowenjian))
+ //{
+ // throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒");
+ //}
}
@@ -1090,10 +1211,8 @@
- tenderOrder.ZhongbiaoId = null;
+ tenderOrder.ZhongbiaoId = usertrueId;
tenderOrder.ZhongbiaoName = "";
- tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian;
- tenderOrder.ZhongbiaowenjianName = input.ZhongbiaowenjianName;
tenderOrder.Zhongbiaogonggao = input.Zhongbiaogonggao;
tenderOrder.ZhongbiaogonggaoName = input.ZhongbiaogonggaoName;
tenderOrder.ZhongbiaoDate = DateTime.Now;
@@ -1140,13 +1259,13 @@
/// <summary>
- /// 閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樹唬鐞嗚垂 鉃�
+ /// 浠ｇ悊鍟嗗彂甯冧腑鏍囨枃浠� 鉃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [DisplayName("閲囪喘浠ｇ悊浜虹‘璁や緵搴斿晢宸叉敮浠樹唬鐞嗚垂")]
- [ApiDescriptionSettings(Name = "QuerenDailifei"), HttpPost]
- public async Task<bool> QuerenDailifei(QuerenSuplierBaomingfeiInput input)
+ [DisplayName("浠ｇ悊鍟嗗彂甯冧腑鏍囨枃浠�")]
+ [ApiDescriptionSettings(Name = "AddZhongbiaoWenjian"), HttpPost]
+ public async Task<bool> AddZhongbiaoWenjian(OrderZhongbiaoWenjianInput input)
{
@@ -1156,46 +1275,114 @@
{
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("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗗凡鏀粯浠ｇ悊璐癸紒");
+ 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 RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == tenderOrderBidding.TenderId).FirstAsync();
+
+ 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("娌℃湁鍙戝竷涓爣鍏憡锛�");
+ }
+
- 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);
+
+
+
+
+
+
+ tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian;
+ tenderOrder.ZhongbiaowenjianName = input.ZhongbiaowenjianName;
+
+
+ tenderOrder.UpdateTime = DateTime.Now;
+ tenderOrder.UpdateUserId = usertrueId;
+ tenderOrder.UpdateUserName = RealName;
+ await _TenderOrderRep.UpdateAsync(tenderOrder);
+
+ return true;
+
+
+
+
+
+
}
+
+
+ ///// <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