transport loading order status in brisanje
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@@ -43,6 +44,10 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
ViewData["IdVehicleFk"] = new SelectList(_context.Vehicles.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdVehicle", "RegistrationNumber");
|
||||
ViewData["IdLoadingFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
ViewData["IdUnloadingFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
ViewData["States"] = new SelectList(Enum.GetValues(typeof(Models.Transport.TransportLoadingOrder.TransportLoadingOrderState))
|
||||
.Cast<Models.Transport.TransportLoadingOrder.TransportLoadingOrderState>()
|
||||
.Select(x => new { Name = Classes.Global.GetAttribute<DisplayAttribute>(x).Name, Value = x.ToString() })
|
||||
.ToList(), "Value", "Name");
|
||||
|
||||
if (id == null)
|
||||
{
|
||||
@@ -54,7 +59,7 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
TransportLoadingOrder = new Models.Transport.TransportLoadingOrder
|
||||
{
|
||||
OrderCity = _context.CodeTableCompanies.Single(x => x.IdCompany == user.IdCompanyFk).City,
|
||||
OrderDate = DateTime.Now,
|
||||
OrderDate = DateTime.Now.Date,
|
||||
PreText = string.Join("<br/>", prePostTexts.Where(x => x.Type == CodeTablePrePostTextLink.TypeEnum.PreText).Select(x => x.CodeTablePrePostText.Content)),
|
||||
PostText = string.Join("<br/>", prePostTexts.Where(x => x.Type == CodeTablePrePostTextLink.TypeEnum.PostText).Select(x => x.CodeTablePrePostText.Content))
|
||||
};
|
||||
@@ -121,7 +126,7 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
|
||||
// OrderNumber and OrderYear
|
||||
|
||||
var orderNumber = _context.TransportLoadingOrders.Count(x => x.IdCompanyFk == user.IdCompanyFk && x.OrderYear == DateTime.Now.Year) + 1;
|
||||
var orderNumber = _context.TransportLoadingOrders.Where(x => x.IdCompanyFk == user.IdCompanyFk && x.OrderYear == DateTime.Now.Year).Max(x => x.OrderNumber) + 1;
|
||||
|
||||
TransportLoadingOrder.IdCompanyFk = user.IdCompanyFk;
|
||||
TransportLoadingOrder.OrderYear = DateTime.Now.Year;
|
||||
|
||||
Reference in New Issue
Block a user