Authorization, Shipments - Batch/Print views.
This commit is contained in:
Stoyan Zlatev
@@ -0,0 +1,190 @@
|
||||
namespace LaaProductionWeb.Services
|
||||
{
|
||||
using LaaProductionWeb.Data.Interfaces;
|
||||
using LaaProductionWeb.Services.Interfaces;
|
||||
using LaaProductionWeb.Services.Models;
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
public class AccountService : IAccountService
|
||||
{
|
||||
private readonly IDbContext dbContext;
|
||||
|
||||
public AccountService(IDbContext dbContext)
|
||||
=> this.dbContext = dbContext;
|
||||
|
||||
public WindowsUser GetOrCreateWindowsUser(string primarySID, string domainName, string userName)
|
||||
{
|
||||
var user = this.dbContext.FirstOrDefault($@"
|
||||
DECLARE @userId INT;
|
||||
|
||||
SELECT @userId = [Account].[WindowsUsers].[UserId]
|
||||
FROM [Account].[WindowsUsers]
|
||||
WHERE [Account].[WindowsUsers].[PrimarySID] = @{nameof(primarySID)}
|
||||
|
||||
IF @userId IS NULL
|
||||
INSERT INTO [Account].[WindowsUsers] (
|
||||
[PrimarySID]
|
||||
, [DomainName]
|
||||
, [UserName])
|
||||
OUTPUT [Inserted].[UserId]
|
||||
VALUES (@{nameof(primarySID)}
|
||||
, @{nameof(domainName)}
|
||||
, @{nameof(userName)})
|
||||
ELSE SELECT @userId",
|
||||
parameters => parameters
|
||||
.Add(nameof(primarySID), primarySID)
|
||||
.Add(nameof(domainName), domainName)
|
||||
.Add(nameof(userName), userName),
|
||||
reader => new WindowsUser
|
||||
{
|
||||
UserId = reader.GetValue<int>(0)
|
||||
})
|
||||
?? new WindowsUser();
|
||||
|
||||
user.Roles = this
|
||||
.GetUserRoles(user.UserId)
|
||||
.Select(x => x.RoleName);
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
public PermissionsModel GetPermissionModelForUser(int userId, string role)
|
||||
{
|
||||
var roleModel = this.GetRoleForUser(role);
|
||||
|
||||
return new PermissionsModel
|
||||
{
|
||||
UserId = userId,
|
||||
Role = roleModel
|
||||
};
|
||||
}
|
||||
|
||||
public UserRole GetRoleForUser(string role)
|
||||
=> this.dbContext.FirstOrDefault($@"
|
||||
SELECT [Account].[Roles].[RoleId]
|
||||
, [Account].[Roles].[RoleName]
|
||||
, [Account].[Roles].[DisplayName]
|
||||
, [Account].[UsersRoles].[Approved]
|
||||
FROM [Account].[Roles]
|
||||
LEFT JOIN [Account].[UsersRoles]
|
||||
ON [Account].[UsersRoles].[RoleId] = [Account].[Roles].[RoleId]
|
||||
WHERE [Account].[Roles].[RoleName] = @{nameof(role)}",
|
||||
parameters => parameters.Add(nameof(role), role),
|
||||
reader => new UserRole
|
||||
{
|
||||
RoleId = reader.GetValue<int>(0),
|
||||
RoleName = reader.GetString(1),
|
||||
DisplayName = reader.GetString(2),
|
||||
Pending = reader.GetValue<bool?>(3),
|
||||
}) ?? new UserRole();
|
||||
|
||||
public IEnumerable<UserRole> GetUserRoles(int userId)
|
||||
=> this.dbContext.AsEnumerable($@"
|
||||
SELECT [Account].[Roles].[RoleId]
|
||||
, [Account].[Roles].[RoleName]
|
||||
, [Account].[Roles].[DisplayName]
|
||||
FROM [Account].[Roles]
|
||||
JOIN [Account].[UsersRoles]
|
||||
ON [Account].[UsersRoles].[RoleId] = [Account].[Roles].[RoleId]
|
||||
AND [Account].[UsersRoles].[UserId] = @{nameof(userId)}
|
||||
AND [Account].[UsersRoles].[Approved] = 1",
|
||||
parameters => parameters.Add(nameof(userId), userId),
|
||||
reader => new UserRole
|
||||
{
|
||||
RoleId = reader.GetValue<int>(0),
|
||||
RoleName = reader.GetString(1),
|
||||
DisplayName = reader.GetString(2),
|
||||
});
|
||||
|
||||
public List<UserPermissions> GetUsersWithPendingRoles()
|
||||
=> this.dbContext.AsEnumerable($@"
|
||||
SELECT [Account].[Users].[UserId]
|
||||
, [Account].[Users].[FirstName] + ' ' + [Account].[Users].[LastName]
|
||||
, [Account].[Roles].[RoleId]
|
||||
, [Account].[Roles].[RoleName]
|
||||
, [Account].[UsersRoles].[Approved]
|
||||
FROM [Account].[UsersRoles]
|
||||
JOIN [Account].[Roles] ON [Account].[Roles].[RoleId] = [Account].[UsersRoles].[RoleId]
|
||||
JOIN [Account].[Users] ON [Account].[Users].[UserId] = [Account].[UsersRoles].[UserId]
|
||||
WHERE [Account].[UsersRoles].[Approved] = 0",
|
||||
reader => new
|
||||
{
|
||||
UserId = reader.GetValue<int>(0),
|
||||
DisplayName = reader.GetString(1),
|
||||
RoleId = reader.GetValue<int>(2),
|
||||
RoleName = reader.GetString(3),
|
||||
Approved = reader.GetValue<bool>(4)
|
||||
})
|
||||
.GroupBy(x => new UserPermissions
|
||||
{
|
||||
UserId = x.UserId,
|
||||
DisplayName = x.DisplayName
|
||||
}, UserPermissionsComparer.Current)
|
||||
.Select(x => new UserPermissions
|
||||
{
|
||||
UserId = x.Key.UserId,
|
||||
DisplayName = x.Key.DisplayName,
|
||||
Roles = x
|
||||
.AsEnumerable()
|
||||
.Select(r => new RoleModel
|
||||
{
|
||||
RoleId = r.RoleId,
|
||||
RoleName = r.RoleName,
|
||||
Approved = r.Approved
|
||||
})
|
||||
.ToList()
|
||||
})
|
||||
.ToList();
|
||||
|
||||
public void RequestPermissions(PermissionsModel model)
|
||||
{
|
||||
this.dbContext.Transaction($@"
|
||||
INSERT INTO [Auftrag].[Account].[Users] (
|
||||
[UserId]
|
||||
, [FirstName]
|
||||
, [LastName])
|
||||
VALUES (@{nameof(model.UserId)}
|
||||
, @{nameof(model.FirstName)}
|
||||
, @{nameof(model.LastName)})",
|
||||
parameters => parameters
|
||||
.Add(nameof(model.UserId), model.UserId)
|
||||
.Add(nameof(model.FirstName), model.FirstName)
|
||||
.Add(nameof(model.LastName), model.LastName));
|
||||
|
||||
model.Role.Pending = this.dbContext.Transaction($@"
|
||||
INSERT INTO [Auftrag].[Account].[UsersRoles] (
|
||||
[UserId]
|
||||
, [RoleId])
|
||||
VALUES (@{nameof(model.UserId)}
|
||||
, @{nameof(model.Role.RoleId)})",
|
||||
parameters => parameters
|
||||
.Add(nameof(model.UserId), model.UserId)
|
||||
.Add(nameof(model.Role.RoleId), model.Role.RoleId));
|
||||
}
|
||||
|
||||
public void SaveUserPermissions(IEnumerable<UserPermissions> usersPermissions)
|
||||
{
|
||||
foreach (var user in usersPermissions)
|
||||
{
|
||||
foreach (var role in user.Roles)
|
||||
{
|
||||
this.dbContext.Transaction(
|
||||
role.Deleted
|
||||
? $@"DELETE FROM [Account].[UsersRoles]
|
||||
WHERE [Account].[UsersRoles].[UserId] = @{nameof(user.UserId)}
|
||||
AND [Account].[UsersRoles].[RoleId] = @{nameof(role.RoleId)}"
|
||||
: $@"UPDATE [Account].[UsersRoles]
|
||||
SET [Approved] = @{nameof(role.Approved)}
|
||||
WHERE [Account].[UsersRoles].[UserId] = @{nameof(user.UserId)}
|
||||
AND [Account].[UsersRoles].[RoleId] = @{nameof(role.RoleId)}",
|
||||
parameters => parameters
|
||||
.Add(nameof(user.UserId), user.UserId)
|
||||
.Add(nameof(role.RoleId), role.RoleId)
|
||||
.Add(nameof(role.Approved), role.Approved));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
namespace LaaProductionWeb.Services.Interfaces
|
||||
{
|
||||
using LaaProductionWeb.Services.Models;
|
||||
|
||||
using System.Collections.Generic;
|
||||
|
||||
public interface IAccountService : ITransient
|
||||
{
|
||||
WindowsUser GetOrCreateWindowsUser(string primarySID, string domainName, string userName);
|
||||
|
||||
PermissionsModel GetPermissionModelForUser(int userId, string role);
|
||||
|
||||
IEnumerable<UserRole> GetUserRoles(int userId);
|
||||
|
||||
List<UserPermissions> GetUsersWithPendingRoles();
|
||||
|
||||
UserRole GetRoleForUser(string role);
|
||||
|
||||
void RequestPermissions(PermissionsModel model);
|
||||
|
||||
void SaveUserPermissions(IEnumerable<UserPermissions> usersPermissions);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
public interface IProtocolService : ITransient
|
||||
{
|
||||
bool DeleteFile(int fileId);
|
||||
|
||||
string FileContent(int? fileId);
|
||||
|
||||
OrderClientModel FindOrder(int orderId);
|
||||
|
||||
@@ -57,10 +57,17 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AccountService.cs" />
|
||||
<Compile Include="Interfaces\IAccountService.cs" />
|
||||
<Compile Include="Interfaces\IOrdersService.cs" />
|
||||
<Compile Include="Interfaces\IProtocolService.cs" />
|
||||
<Compile Include="Interfaces\IShipmentsService.cs" />
|
||||
<Compile Include="Interfaces\ITransient.cs" />
|
||||
<Compile Include="Models\PalletPosition.cs" />
|
||||
<Compile Include="Models\RoleModel.cs" />
|
||||
<Compile Include="Models\UserRole.cs" />
|
||||
<Compile Include="Models\UserPermissions.cs" />
|
||||
<Compile Include="Models\WindowsUser.cs" />
|
||||
<Compile Include="Models\BatchPrintModel.cs" />
|
||||
<Compile Include="Models\OrderClientModel.cs" />
|
||||
<Compile Include="Models\OrderInfoModel.cs" />
|
||||
@@ -69,6 +76,7 @@
|
||||
<Compile Include="Models\OrderScanModel.cs" />
|
||||
<Compile Include="Models\OrdersFoundModel.cs" />
|
||||
<Compile Include="Models\PalletsBatchModel.cs" />
|
||||
<Compile Include="Models\PermissionsModel.cs" />
|
||||
<Compile Include="Models\Result.cs" />
|
||||
<Compile Include="Models\SerialNr.cs" />
|
||||
<Compile Include="Models\ShipmentModel.cs" />
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
public int ProductionOrderNr
|
||||
=> this.batchModel.ProductionOrderNr;
|
||||
|
||||
public int PositionNr
|
||||
=> this.batchModel.PositionNr;
|
||||
public IEnumerable<PalletPosition> Positions
|
||||
=> this.batchModel.Positions;
|
||||
|
||||
public int TotlalItemsCount
|
||||
=> this.batchModel.TotlalItemsCount;
|
||||
|
||||
public string ItemsType
|
||||
=> this.batchModel.ItemsType;
|
||||
public int ItemsCount
|
||||
=> this.batchModel.ItemsCount;
|
||||
|
||||
public SerialNr[] Items
|
||||
=> this.batchModel
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
namespace LaaProductionWeb.Services.Models
|
||||
{
|
||||
public class PalletPosition
|
||||
{
|
||||
public int PositionNr { get; set; }
|
||||
|
||||
public string Description { get; set; }
|
||||
|
||||
public int ItemsCount { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
{
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
public class PalletsBatchModel
|
||||
{
|
||||
@@ -11,15 +12,17 @@
|
||||
|
||||
public int ProductionOrderNr { get; set; }
|
||||
|
||||
public int PositionNr { get; set; }
|
||||
|
||||
public int TotlalItemsCount { get; set; }
|
||||
|
||||
public string ItemsType { get; set; }
|
||||
|
||||
public string AdditionalText { get; set; }
|
||||
|
||||
public int ItemsCount
|
||||
=> this.Positions.Sum(x => x.ItemsCount);
|
||||
|
||||
public IEnumerable<SerialNr> Items { get; set; }
|
||||
= Array.Empty<SerialNr>();
|
||||
|
||||
public IEnumerable<PalletPosition> Positions { get; set; }
|
||||
= Array.Empty<PalletPosition>();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
namespace LaaProductionWeb.Services.Models
|
||||
{
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
public class PermissionsModel
|
||||
{
|
||||
public int UserId { get; set; }
|
||||
|
||||
[Display(Name = "Vorname")]
|
||||
[Required(ErrorMessage = "Die Vorname ist erforderlich.")]
|
||||
public string FirstName { get; set; }
|
||||
|
||||
[Display(Name = "Name")]
|
||||
[Required(ErrorMessage = "Die Name ist erforderlich.")]
|
||||
public string LastName { get; set; }
|
||||
|
||||
public UserRole Role { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
namespace LaaProductionWeb.Services.Models
|
||||
{
|
||||
public class RoleModel
|
||||
{
|
||||
public int RoleId { get; set; }
|
||||
|
||||
public string RoleName { get; set; }
|
||||
|
||||
public bool Approved { get; set; }
|
||||
|
||||
public bool Deleted { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
public int Nr { get; set; }
|
||||
|
||||
public int PositionNr { get; set; }
|
||||
|
||||
public int? PalletNr { get; set; }
|
||||
|
||||
public string ClientNr { get; set; }
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
public int? PositionNr { get; set; }
|
||||
|
||||
public bool HasOrder
|
||||
=> this.orderModel != null;
|
||||
=> this.orderModel != null && this.orderModel.OrderNr > 0;
|
||||
|
||||
public OrderModel OrderModel
|
||||
=> this.orderModel
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
namespace LaaProductionWeb.Services.Models
|
||||
{
|
||||
using System.Collections.Generic;
|
||||
|
||||
public class UserPermissions
|
||||
{
|
||||
public int UserId { get; set; }
|
||||
|
||||
public string DisplayName { get; set; }
|
||||
|
||||
public List<RoleModel> Roles { get; set; }
|
||||
}
|
||||
|
||||
public class UserPermissionsComparer : IEqualityComparer<UserPermissions>
|
||||
{
|
||||
public bool Equals(UserPermissions x, UserPermissions y)
|
||||
=> x?.UserId == y?.UserId;
|
||||
|
||||
public int GetHashCode(UserPermissions obj)
|
||||
=> obj?.UserId ?? default(int);
|
||||
|
||||
public static UserPermissionsComparer Current
|
||||
= new UserPermissionsComparer();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
namespace LaaProductionWeb.Services.Models
|
||||
{
|
||||
public class UserRole
|
||||
{
|
||||
public int RoleId { get; set; }
|
||||
|
||||
public string RoleName { get; set; }
|
||||
|
||||
public string DisplayName { get; set; }
|
||||
|
||||
public bool? Pending { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
namespace LaaProductionWeb.Services.Models
|
||||
{
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
public class WindowsUser
|
||||
{
|
||||
public int UserId { get; set; } = -1;
|
||||
|
||||
public IEnumerable<string> Roles { get; set; } = Array.Empty<string>();
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,15 @@
|
||||
public ProtocolService(IDbContext dbContext)
|
||||
=> this.dbContext = dbContext;
|
||||
|
||||
public bool DeleteFile(int fileId)
|
||||
=> this.dbContext.ScalarTransaction<int>($@"
|
||||
DELETE FROM [File]
|
||||
WHERE [FileId] = @{nameof(fileId)};
|
||||
DELETE FROM [FilesOrders]
|
||||
OUTPUT [Deleted].[FileId]
|
||||
WHERE [FileId] = @{nameof(fileId)};",
|
||||
parameters: parameters => parameters.Add(nameof(fileId), fileId)) > 0;
|
||||
|
||||
public string FileContent(int? fileId)
|
||||
{
|
||||
var fileContent = this.dbContext.FirstOrDefault(
|
||||
@@ -23,13 +32,14 @@
|
||||
FROM [dbo].[File]
|
||||
WHERE [dbo].[File].[FileId] = @{nameof(fileId)}",
|
||||
parameters: parameters => parameters.Add(nameof(fileId), fileId),
|
||||
reader: reader => reader.GetBytes(0));
|
||||
reader: reader => reader.GetBytes(0)) ?? Array.Empty<byte>();
|
||||
|
||||
return string.Format("data:application/pdf;base64,{0}", Convert.ToBase64String(fileContent));
|
||||
}
|
||||
|
||||
public OrderClientModel FindOrder(int orderId)
|
||||
=> this.dbContext.FirstOrDefault(
|
||||
{
|
||||
var orderClientModel = this.dbContext.FirstOrDefault(
|
||||
query: $@"
|
||||
SELECT DISTINCT
|
||||
[APG].[AuftragNr]
|
||||
@@ -57,7 +67,21 @@
|
||||
ClientId = reader.GetValue<int>(1),
|
||||
ClientName = reader.GetString(2),
|
||||
Positions = reader.GetString(3).Trim().Trim(',')
|
||||
}) ?? new OrderClientModel();
|
||||
});
|
||||
|
||||
if (orderClientModel != null && orderId > 0)
|
||||
{
|
||||
orderClientModel.FileId = this.dbContext.FirstOrDefault($@"
|
||||
SELECT [FileId]
|
||||
FROM [FilesOrders]
|
||||
WHERE [OrderId] = @{nameof(orderId)}
|
||||
AND [Usage] = 'PROTOCOL'",
|
||||
parameters: parameters => parameters.Add(nameof(orderId), orderId),
|
||||
reader: reader => reader.GetValue<int>(0));
|
||||
}
|
||||
|
||||
return orderClientModel ?? new OrderClientModel();
|
||||
}
|
||||
|
||||
public IEnumerable<KeyValuePair<int, string>> FindOrdersById(int orderno)
|
||||
=> this.dbContext.AsEnumerable($@"
|
||||
|
||||
@@ -83,18 +83,17 @@
|
||||
, REPLACE(RTRIM(LTRIM([AuftragPositionSerienNr].[KundeneigeneSerienNr])), ' ', '') -- 2
|
||||
, [PalettenScan].[PalettenNr] -- 3
|
||||
, CAST(CASE WHEN [PalettenScan].[ID] IS NULL THEN 0 ELSE 1 END AS BIT) -- 4
|
||||
, [PalettenScan].[PositionNr] -- 5
|
||||
FROM [AuftragPositionSerienNr]
|
||||
LEFT JOIN [PalettenScan]
|
||||
ON [PalettenScan].[AuftragNr] = [AuftragPositionSerienNr].[AuftragNr]
|
||||
AND [PalettenScan].[PositionNr] = [AuftragPositionSerienNr].[PositionNr]
|
||||
AND [PalettenScan].[SerienNr] = REPLACE(RTRIM(LTRIM([AuftragPositionSerienNr].[KundeneigeneSerienNr])), ' ', '')
|
||||
WHERE [AuftragPositionSerienNr].[AuftragNr] = @{nameof(model.OrderNr)}
|
||||
AND [AuftragPositionSerienNr].[PositionNr] = @{nameof(model.PositionNr)}
|
||||
AND ([PalettenScan].[PalettenNr] = @{nameof(model.PalletNr)}
|
||||
OR [PalettenScan].[PalettenNr] IS NULL)",
|
||||
parameters: parameters => parameters
|
||||
.Add(nameof(model.OrderNr), model.OrderNr)
|
||||
.Add(nameof(model.PositionNr), model.PositionNr)
|
||||
.Add(nameof(model.PalletNr), model.PalletNr),
|
||||
reader: reader => new SerialNr
|
||||
{
|
||||
@@ -102,30 +101,30 @@
|
||||
Nr = reader.GetValue<int>(1),
|
||||
ClientNr = reader.GetString(2),
|
||||
PalletNr = reader.GetValue<short>(3),
|
||||
IsScaned = reader.GetValue<bool>(4)
|
||||
IsScaned = reader.GetValue<bool>(4),
|
||||
PositionNr = reader.GetValue<int>(5),
|
||||
})
|
||||
.OrderByDescending(x => x.IsScaned)
|
||||
.ThenBy(x => x.ClientNr);
|
||||
|
||||
public PalletsBatchModel LoadBatchModel(OrderScanModel model)
|
||||
{
|
||||
const string orderNr = nameof(model.OrderNr);
|
||||
const string posNr = nameof(model.PositionNr);
|
||||
const string palNr = nameof(model.PalletNr);
|
||||
|
||||
var batchModel = this.dbContext.FirstOrDefault(
|
||||
query: $@"
|
||||
SELECT TOP 1
|
||||
[Auftrag].[AuftragNr] -- 0
|
||||
, [Auftrag].[FertigungsauftragNr] -- 1
|
||||
, [Auftrag].[PositionNr] -- 2
|
||||
, [Auftrag].[Menge] -- 3
|
||||
, [Kunde].[Name] -- 4
|
||||
, [IdentNr].[Typ] -- 5
|
||||
, [IdentNr].[Typzusatz] -- 6
|
||||
, [IdentNr].[Nennweite] -- 7
|
||||
, [Auftrag].[ZusatzText] -- 8
|
||||
, [Auftrag].[Menge] -- 2
|
||||
, [Kunde].[Name] -- 3
|
||||
, [Auftrag].[ZusatzText] -- 4
|
||||
FROM [AlleAuftragPositionen] AS [Auftrag]
|
||||
JOIN [Kunde] ON [Kunde].[KundenNr] = [Auftrag].[KundenNr]
|
||||
JOIN [IdentNr] ON [IdentNr].[IdentNr] = [Auftrag].[IdentNr]
|
||||
WHERE [Auftrag].[AuftragNr] = @{nameof(model.OrderNr)}
|
||||
AND [Auftrag].[PositionNr] = @{nameof(model.PositionNr)}
|
||||
WHERE [Auftrag].[AuftragNr] = @{orderNr}
|
||||
AND [Auftrag].[PositionNr] = @{posNr}
|
||||
ORDER BY [Auftrag].[FertigungsauftragNr] DESC",
|
||||
parameters: parameters => parameters
|
||||
.Add(nameof(model.OrderNr), model.OrderNr)
|
||||
@@ -134,26 +133,59 @@
|
||||
{
|
||||
OrderNr = reader.GetValue<int>(0),
|
||||
ProductionOrderNr = reader.GetValue<int>(1),
|
||||
PositionNr = reader.GetValue<short>(2),
|
||||
TotlalItemsCount = reader.GetValue<int>(3),
|
||||
ClientName = reader.GetValue<string>(4),
|
||||
ItemsType = string.Join(" ", new[]
|
||||
{
|
||||
reader.GetString(5),
|
||||
reader.GetString(6),
|
||||
reader.GetString(7),
|
||||
}.Where(x => !string.IsNullOrWhiteSpace(x))),
|
||||
AdditionalText = reader.GetValue<string>(8),
|
||||
}) ?? new PalletsBatchModel();
|
||||
TotlalItemsCount = reader.GetValue<int>(2),
|
||||
ClientName = reader.GetValue<string>(3),
|
||||
AdditionalText = reader.GetValue<string>(4),
|
||||
})
|
||||
?? new PalletsBatchModel();
|
||||
|
||||
if (batchModel.OrderNr > 0)
|
||||
{
|
||||
batchModel.Items = this.LoadBatchItems(model);
|
||||
batchModel.Positions = this.LoadBatchPositions(model, orderNr, palNr);
|
||||
}
|
||||
|
||||
return batchModel;
|
||||
}
|
||||
|
||||
private IEnumerable<PalletPosition> LoadBatchPositions(OrderScanModel model, string orderNr, string palNr)
|
||||
=> this.dbContext.AsEnumerable($@"
|
||||
SELECT DISTINCT
|
||||
[Auftrag].[PositionNr]
|
||||
, COUNT(1)
|
||||
, [Identnr].[Typ]
|
||||
, [Identnr].[Typzusatz]
|
||||
, [Identnr].[Nennweite]
|
||||
FROM [Identnr]
|
||||
JOIN [AlleAuftragPositionen] AS [Auftrag]
|
||||
ON [Auftrag].[IdentNr] = [Identnr].[IdentNr]
|
||||
JOIN [PalettenScan]
|
||||
ON [PalettenScan].[AuftragNr] = [Auftrag].[AuftragNr]
|
||||
AND [PalettenScan].[PositionNr] = [Auftrag].[PositionNr]
|
||||
AND [PalettenScan].[PalettenNr] = @{palNr}
|
||||
WHERE [Auftrag].[AuftragNr] = @{orderNr}
|
||||
GROUP BY [Auftrag].[PositionNr]
|
||||
, [Identnr].[Typ]
|
||||
, [Identnr].[Typzusatz]
|
||||
, [Identnr].[Nennweite]
|
||||
ORDER BY [Auftrag].[PositionNr] ",
|
||||
parameters => parameters
|
||||
.Add(orderNr, model.OrderNr)
|
||||
.Add(palNr, model.PalletNr),
|
||||
positionReader => new PalletPosition
|
||||
{
|
||||
PositionNr = positionReader.GetValue<short>(0),
|
||||
ItemsCount = positionReader.GetValue<int>(1),
|
||||
Description = string
|
||||
.Join(" ", new[]
|
||||
{
|
||||
positionReader.GetString(2),
|
||||
positionReader.GetString(3),
|
||||
positionReader.GetString(4),
|
||||
}
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x)))
|
||||
});
|
||||
|
||||
public Result UpdateBatchModel(OrderScanModel model)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(model.SerialNr))
|
||||
|
||||
Reference in New Issue
Block a user