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> 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,11 +236,11 @@ 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.CreateUserId = usertrueId; @@ -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("无需支付报名费!"); //} } Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
@@ -965,10 +965,10 @@ /// <summary> /// 中标供应商id /// 中标供应商id 逗号分隔! 12121212,232323,232323,232323 /// </summary> [Required(ErrorMessage = "中标供应商id不能为空")] public long SupplierUserId { get; set; } public string SupplierUserIds { get; set; } /// <summary> Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
@@ -821,8 +821,15 @@ throw Oops.Oh("已经中标的项目不能再次中标!"); } var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == input.SupplierUserId).FirstAsync(); var ssss = input.SupplierUserIds.Split(','); if (string.IsNullOrEmpty(input.SupplierUserIds)) { throw Oops.Oh("没有选中中标供应商!"); } 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(); if (tenderOrderBidding == null) { throw Oops.Oh("不存在的投标!"); @@ -835,14 +842,23 @@ { 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(); 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.ZhongbiaoName += cusExtend.EnterpriseName+","; } } tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian; tenderOrder.ZhongbiaoDate = DateTime.Now; @@ -854,17 +870,26 @@ 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(); 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); }