diff --git a/Factory/FactoryContracts/ViewModels/MachinePeriodReportViewModel.cs b/Factory/FactoryContracts/ViewModels/MachinePeriodReportViewModel.cs new file mode 100644 index 0000000..d33ba2e --- /dev/null +++ b/Factory/FactoryContracts/ViewModels/MachinePeriodReportViewModel.cs @@ -0,0 +1,9 @@ +namespace FactoryContracts.ViewModels +{ + public class MachinePeriodReportViewModel + { + public string MachineName { get; set; } = string.Empty; + public List Products { get; set; } = new(); + public List PlanProductions { get; set; } = new(); + } +} diff --git a/Factory/FactoryContracts/ViewModels/PlanProductionProductReportViewModel.cs b/Factory/FactoryContracts/ViewModels/PlanProductionProductReportViewModel.cs new file mode 100644 index 0000000..7eef215 --- /dev/null +++ b/Factory/FactoryContracts/ViewModels/PlanProductionProductReportViewModel.cs @@ -0,0 +1,8 @@ +namespace FactoryContracts.ViewModels +{ + public class PlanProductionProductReportViewModel + { + public string ProductionName { get; set; } = string.Empty; + public List Products { get; set; } = new(); + } +} diff --git a/Factory/FactoryStorekeeperApp/Program.cs b/Factory/FactoryStorekeeperApp/Program.cs index 3066412..4f4f0a6 100644 --- a/Factory/FactoryStorekeeperApp/Program.cs +++ b/Factory/FactoryStorekeeperApp/Program.cs @@ -1,5 +1,3 @@ -using FactoryStorekeeperApp; - var builder = WebApplication.CreateBuilder(args); // Add services to the container. diff --git a/Factory/FactoryStorekeeperApp/Views/Home/Index.cshtml b/Factory/FactoryStorekeeperApp/Views/Home/Index.cshtml index c0c552d..75ddbf9 100644 --- a/Factory/FactoryStorekeeperApp/Views/Home/Index.cshtml +++ b/Factory/FactoryStorekeeperApp/Views/Home/Index.cshtml @@ -25,7 +25,7 @@ Требования к изделиям

- Привязка станков к планам производства + Привязка станка к планам производства

Отчеты diff --git a/Factory/FactoryStorekeeperApp/Views/Home/MachinePeriodReport.cshtml b/Factory/FactoryStorekeeperApp/Views/Home/MachinePeriodReport.cshtml new file mode 100644 index 0000000..96273e2 --- /dev/null +++ b/Factory/FactoryStorekeeperApp/Views/Home/MachinePeriodReport.cshtml @@ -0,0 +1,50 @@ +@using FactoryContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Очет станков за период"; +} + +

+

Список станков за период

+
+ +
+ +
+ + + + + + + + + + + + @foreach (var machine in Model) + { + + + + + + } + +
СтанокИзделияПланы производства
@machine.MachineName +
    + @foreach (var product in machine.Products) + { +
  • @product
    • + } +
+ 		+
    + @foreach (var planProduction in machine.PlanProductions) + { +
  • @planProduction
    • + } +
+
\ No newline at end of file diff --git a/Factory/FactoryStorekeeperApp/Views/Home/MachinePlanProductions.cshtml b/Factory/FactoryStorekeeperApp/Views/Home/MachinePlanProductions.cshtml index e1dd794..49c6a2e 100644 --- a/Factory/FactoryStorekeeperApp/Views/Home/MachinePlanProductions.cshtml +++ b/Factory/FactoryStorekeeperApp/Views/Home/MachinePlanProductions.cshtml @@ -1,5 +1,49 @@ -@* - For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -*@ +@using FactoryContracts.ViewModels +@model List @{ + ViewData["Title"] = "Привязка станка к планам производства"; } +
+

Привязка станка к планам производства

+
+
+
+
Станок:
+
+ +
+
+

Список планов производства

+
+
Заготовки
+
+ + + + + + + + + + @foreach (var planProduction in Model) + { + + + + + + } + +
Выбор Название Количество
+ + @planProduction.ProductionName + +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/Factory/FactoryStorekeeperApp/Views/Home/PlanProductionByProductReport.cshtml b/Factory/FactoryStorekeeperApp/Views/Home/PlanProductionByProductReport.cshtml new file mode 100644 index 0000000..191d23e --- /dev/null +++ b/Factory/FactoryStorekeeperApp/Views/Home/PlanProductionByProductReport.cshtml @@ -0,0 +1,42 @@ +@using FactoryContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Отчет планов производства по изделиям"; +} +
+

Список планов производств по изделиям

+
+ +
+ +
+
+ +
+ + + + + + + + + + @foreach (var planProduction in Model) + { + + + + + } + +
План производстваИзделие
@planProduction.ProductionName +
    + @foreach (var plan in planProduction.Products) + { +
  • @plan
    • + } +
+
diff --git a/Factory/FactoryStorekeeperApp/Views/Home/Reports.cshtml b/Factory/FactoryStorekeeperApp/Views/Home/Reports.cshtml new file mode 100644 index 0000000..4732ef0 --- /dev/null +++ b/Factory/FactoryStorekeeperApp/Views/Home/Reports.cshtml @@ -0,0 +1,11 @@ +@{ + ViewData["Title"] = "Отчеты"; +} + +
+

Выберите тип отчета

+
+ Отчет планов производства по изделиям + Отчет по станкам за период +
+
\ No newline at end of file diff --git a/Factory/FactoryStorekeeperApp/Views/Shared/_Layout.cshtml b/Factory/FactoryStorekeeperApp/Views/Shared/_Layout.cshtml index 4743787..2dba99b 100644 --- a/Factory/FactoryStorekeeperApp/Views/Shared/_Layout.cshtml +++ b/Factory/FactoryStorekeeperApp/Views/Shared/_Layout.cshtml @@ -19,10 +19,14 @@